diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
index 2926f0694a..63bcb171ed 100644
--- a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt
@@ -279,6 +279,18 @@ object ThemeUtils {
return when (theme) {
THEME_LIGHT_VALUE -> resourceId
+ THEME_SC_LIGHT_VALUE -> {
+ return when (resourceId) {
+ R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_light
+ R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_sc_light
+ R.drawable.vector_label_background_light -> R.drawable.vector_label_background_light
+ R.drawable.divider_horizontal_light -> R.drawable.divider_horizontal_light
+ else -> {
+ Timber.w("Warning, missing case for wanted drawable in sc_light theme")
+ resourceId
+ }
+ }
+ }
THEME_DARK_VALUE -> {
return when (resourceId) {
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_dark
diff --git a/vector/src/main/res/drawable/bg_unread_notification_sc.xml b/vector/src/main/res/drawable/bg_unread_notification_sc.xml
index bec8481572..8a37aa5e11 100644
--- a/vector/src/main/res/drawable/bg_unread_notification_sc.xml
+++ b/vector/src/main/res/drawable/bg_unread_notification_sc.xml
@@ -5,5 +5,5 @@
-
+
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_unread_notification_sc_light.xml b/vector/src/main/res/drawable/bg_unread_notification_sc_light.xml
new file mode 100644
index 0000000000..8a37aa5e11
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_unread_notification_sc_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index f74f333d87..9bed481365 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -98,7 +98,7 @@
android:src="@drawable/ic_edit"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
- app:layout_constraintEnd_toStartOf="@+id/roomUnreadCounterBadgeView"
+ app:layout_constraintEnd_toStartOf="@+id/roomLastEventTimeView"
app:layout_constraintStart_toEndOf="@+id/roomNameView"
app:layout_constraintTop_toTopOf="@+id/roomNameView"
tools:visibility="visible" />
@@ -107,20 +107,21 @@
android:id="@+id/roomUnreadCounterBadgeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginRight="8dp"
+ android:layout_marginEnd="0dp"
+ android:layout_marginRight="0dp"
+ android:layout_marginTop="8dp"
android:gravity="center"
- android:minWidth="16dp"
- android:minHeight="16dp"
+ android:minWidth="24dp"
+ android:minHeight="24dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:textColor="@android:color/white"
- android:textSize="10sp"
+ android:textSize="15sp"
android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
- app:layout_constraintEnd_toStartOf="@+id/roomLastEventTimeView"
- app:layout_constraintStart_toEndOf="@+id/roomDraftBadge"
- app:layout_constraintTop_toTopOf="@+id/roomNameView"
+ app:layout_constraintBottom_toBottomOf="@+id/roomLastEventView"
+ app:layout_constraintEnd_toEndOf="@+id/roomLastEventTimeView"
+ app:layout_constraintStart_toEndOf="@+id/roomLastEventView"
+ app:layout_constraintTop_toTopOf="@+id/roomLastEventView"
tools:background="@drawable/bg_unread_highlight"
tools:text="4"
tools:visibility="visible" />
@@ -149,7 +150,7 @@
android:maxLines="2"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/roomUnreadCounterBadgeView"
app:layout_constraintStart_toStartOf="@+id/roomNameView"
app:layout_constraintTop_toBottomOf="@+id/roomNameView"
tools:text="@sample/matrix.json/data/message" />
diff --git a/vector/src/main/res/values/colors_sc.xml b/vector/src/main/res/values/colors_sc.xml
index 51f09b6249..790d13f277 100644
--- a/vector/src/main/res/values/colors_sc.xml
+++ b/vector/src/main/res/values/colors_sc.xml
@@ -4,7 +4,8 @@
#8BC34A
#3F8BC34A
#1E8BC34A
- #689F38
+ #689F38
+ @color/accent_sc_dark
@color/accent_sc
@color/accent_sc