diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt
index 1f69a6a7cf..381fd0ec36 100755
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt
@@ -20,6 +20,7 @@ import android.util.AttributeSet
import android.view.View
import androidx.appcompat.widget.AppCompatTextView
import im.vector.riotredesign.R
+import im.vector.riotredesign.features.themes.ThemeUtils
class UnreadCounterBadgeView : AppCompatTextView {
@@ -37,7 +38,7 @@ class UnreadCounterBadgeView : AppCompatTextView {
val bgRes = if (state.highlighted) {
R.drawable.bg_unread_highlight
} else {
- R.drawable.bg_unread_notification
+ ThemeUtils.getResourceId(context, R.drawable.bg_unread_notification_light)
}
setBackgroundResource(bgRes)
text = RoomSummaryFormatter.formatUnreadMessagesCounter(state.count)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
index 0821aff8c6..ecb918ed10 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
@@ -184,8 +184,9 @@ object ThemeUtils {
THEME_LIGHT_VALUE -> resourceId
THEME_DARK_VALUE -> {
return when (resourceId) {
- R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_dark
- else -> {
+ R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_dark
+ R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_dark
+ else -> {
Timber.w("Warning, missing case for wanted drawable in dark theme")
resourceId
}
@@ -193,8 +194,9 @@ object ThemeUtils {
}
THEME_BLACK_VALUE -> {
return when (resourceId) {
- R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_black
- else -> {
+ R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_black
+ R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_black
+ else -> {
Timber.w("Warning, missing case for wanted drawable in black theme")
resourceId
}
diff --git a/vector/src/main/res/drawable/bg_unread_notification.xml b/vector/src/main/res/drawable/bg_unread_notification_black.xml
similarity index 56%
rename from vector/src/main/res/drawable/bg_unread_notification.xml
rename to vector/src/main/res/drawable/bg_unread_notification_black.xml
index f53f2f5704..7059985f47 100644
--- a/vector/src/main/res/drawable/bg_unread_notification.xml
+++ b/vector/src/main/res/drawable/bg_unread_notification_black.xml
@@ -5,6 +5,5 @@
-
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_dark.xml b/vector/src/main/res/drawable/bg_unread_notification_dark.xml
new file mode 100644
index 0000000000..7f3669c55f
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_unread_notification_dark.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_light.xml b/vector/src/main/res/drawable/bg_unread_notification_light.xml
new file mode 100644
index 0000000000..944af91a10
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_unread_notification_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/colors_riotx.xml b/vector/src/main/res/values/colors_riotx.xml
index eecbf3f823..523f967d94 100644
--- a/vector/src/main/res/values/colors_riotx.xml
+++ b/vector/src/main/res/values/colors_riotx.xml
@@ -116,4 +116,11 @@
#FF61708B
#FF22262E
+
+
+ #FF61708B
+ #FF181B21
+ #FF61708B
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 6777db37bf..95d13175d9 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -24,6 +24,7 @@
- @color/riotx_unread_room_indent_black
- @color/riotx_android_status_bar_black
- @color/riotx_line_break_mobile_black
+ - @color/riotx_unread_room_badge_black
- @color/riotx_accent
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 9d1d23d65c..d542d8abae 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -22,6 +22,7 @@
- @color/riotx_unread_room_indent_dark
- @color/riotx_android_status_bar_dark
- @color/riotx_line_break_mobile_dark
+ - @color/riotx_unread_room_badge_dark
- @color/riotx_accent
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 1cba608dab..c724f09727 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -22,6 +22,7 @@
- @color/riotx_unread_room_indent_light
- @color/riotx_android_status_bar_light
- @color/riotx_line_break_mobile_light
+ - @color/riotx_unread_room_badge_light
- @color/riotx_accent