Merge pull request #5456 from vector-im/feature/bma/fix_color

Iterate on badge / unread indicator color (#5332)
element-hq · Mar 8, 2022 · f628b24 · f628b24
2 parents 48cf2ad + b867e5f
commit f628b24
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/changelog.d/5456.misc b/changelog.d/5456.misc
@@ -0,0 +1 @@
+Iterate on badge / unread indicator color
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
@@ -56,6 +56,12 @@
     <!-- Used for item separators in list, on surface -->
     <attr name="vctr_list_separator_on_surface" format="color" />
 
+    <!-- Background color used for:
+          - unread badge background for a room item in the room list
+          - start unread indicator for a room item in the room list
+          - Background for unread badge background in the bottom navigation -->
+    <attr name="vctr_unread_background" format="color" />
+
     <!-- Other colors, which are not in the palette -->
     <attr name="vctr_fab_label_bg" format="color" />
     <color name="vctr_fab_label_bg_light">@android:color/white</color>

diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -46,11 +46,12 @@
         <!-- Presence Indicator colors -->
         <item name="vctr_presence_indicator_offline">@color/vctr_presence_indicator_offline_dark</item>
 
-        <!-- Some alias -->
+        <!-- Some aliases -->
         <item name="vctr_header_background">?vctr_system</item>
         <item name="vctr_list_separator">?vctr_content_quinary</item>
         <item name="vctr_list_separator_system">?vctr_system</item>
         <item name="vctr_list_separator_on_surface">?vctr_system</item>
+        <item name="vctr_unread_background">?vctr_content_tertiary</item>
 
         <!-- Material color -->
         <item name="colorPrimary">@color/element_accent_dark</item>

diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -46,11 +46,12 @@
         <!-- Presence Indicator colors -->
         <item name="vctr_presence_indicator_offline">@color/vctr_presence_indicator_offline_light</item>
 
-        <!-- Some alias -->
+        <!-- Some aliases -->
         <item name="vctr_header_background">?vctr_system</item>
         <item name="vctr_list_separator">?vctr_content_quinary</item>
         <item name="vctr_list_separator_system">?vctr_system</item>
         <item name="vctr_list_separator_on_surface">?vctr_system</item>
+        <item name="vctr_unread_background">?vctr_content_tertiary</item>
 
         <!-- Material color -->
         <item name="colorPrimary">@color/element_accent_light</item>

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -457,7 +457,7 @@ class HomeDetailFragment @Inject constructor(
         backgroundColor = if (highlight) {
             ThemeUtils.getColor(requireContext(), R.attr.colorError)
         } else {
-            ThemeUtils.getColor(requireContext(), R.attr.vctr_content_secondary)
+            ThemeUtils.getColor(requireContext(), R.attr.vctr_unread_background)
         }
     }
 

diff --git a/vector/src/main/res/drawable/bg_unread_notification.xml b/vector/src/main/res/drawable/bg_unread_notification.xml
@@ -4,5 +4,5 @@
 
     <corners android:radius="40dp" />
 
-    <solid android:color="?vctr_content_secondary" />
+    <solid android:color="?vctr_unread_background" />
 </shape>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
@@ -15,7 +15,7 @@
         android:id="@+id/roomUnreadIndicator"
         android:layout_width="4dp"
         android:layout_height="0dp"
-        android:background="?vctr_content_secondary"
+        android:background="?vctr_unread_background"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"