diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt index e82f3cdf16..bd857f1187 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt @@ -1174,7 +1174,7 @@ class TimelineFragment @Inject constructor( badgeFrameLayout.isVisible = true badgeTextView.text = unreadThreadMessages.toString() val badgeDrawable = DrawableCompat.wrap(badgeFrameLayout.background) - val color = ContextCompat.getColor(requireContext(), if (userIsMentioned) R.color.palette_vermilion else R.color.palette_gray_200) + val color = ThemeUtils.getColor(requireContext(), if (userIsMentioned) R.attr.colorError else R.attr.colorAccent) DrawableCompat.setTint(badgeDrawable, color) badgeFrameLayout.background = badgeDrawable } else { diff --git a/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt b/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt index 2364e86166..9f4f30bc10 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/threads/list/model/ThreadListItem.kt @@ -33,6 +33,7 @@ import im.vector.app.core.extensions.setLeftDrawable import im.vector.app.core.utils.DimensionConverter import im.vector.app.features.displayname.getBestName import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.themes.ThemeUtils import org.matrix.android.sdk.api.session.threads.ThreadNotificationState import org.matrix.android.sdk.api.util.MatrixItem @@ -80,11 +81,11 @@ abstract class ThreadListItem : VectorEpoxyModel() { when (threadNotificationState) { ThreadNotificationState.NEW_MESSAGE -> { holder.unreadImageView.isVisible = true - holder.unreadImageView.setColorFilter(ContextCompat.getColor(holder.view.context, R.color.palette_gray_200)) + holder.unreadImageView.setColorFilter(ThemeUtils.getColor(holder.view.context, R.attr.colorAccent)) } ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE -> { holder.unreadImageView.isVisible = true - holder.unreadImageView.setColorFilter(ContextCompat.getColor(holder.view.context, R.color.palette_vermilion)) + holder.unreadImageView.setColorFilter(ThemeUtils.getColor(holder.view.context, R.attr.colorError)) } else -> { holder.unreadImageView.isVisible = false diff --git a/vector/src/main/res/drawable-v24/ic_thread_summary.xml b/vector/src/main/res/drawable-v24/ic_thread_summary.xml new file mode 100644 index 0000000000..53987e025c --- /dev/null +++ b/vector/src/main/res/drawable-v24/ic_thread_summary.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/vector/src/main/res/drawable/ic_thread_summary.xml b/vector/src/main/res/drawable/ic_thread_summary.xml index 5e27ad0a0a..9d1acfd403 100644 --- a/vector/src/main/res/drawable/ic_thread_summary.xml +++ b/vector/src/main/res/drawable/ic_thread_summary.xml @@ -1,11 +1,11 @@ - - + + + android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="1.5"/> + android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="1.5"/> diff --git a/vector/src/main/res/layout/item_thread.xml b/vector/src/main/res/layout/item_thread.xml index 37186f031c..496805ad6e 100644 --- a/vector/src/main/res/layout/item_thread.xml +++ b/vector/src/main/res/layout/item_thread.xml @@ -64,7 +64,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/threadSummaryDateTextView" app:layout_constraintTop_toTopOf="@id/threadSummaryDateTextView" - app:tint="@color/palette_gray_200" + app:tint="?riotx_unread_unimportant_room_badge" tools:ignore="ContentDescription" tools:visibility="visible" /> diff --git a/vector/src/main/res/layout/view_thread_notification_badge.xml b/vector/src/main/res/layout/view_thread_notification_badge.xml index 81b3f7138e..6a5f33ac1a 100644 --- a/vector/src/main/res/layout/view_thread_notification_badge.xml +++ b/vector/src/main/res/layout/view_thread_notification_badge.xml @@ -31,7 +31,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:layout_gravity="top|end" - android:backgroundTint="@color/palette_gray_200" + android:backgroundTint="?riotx_unread_unimportant_room_badge" android:background="@drawable/notification_badge" android:visibility="visible" tools:visibility="visible"> @@ -55,4 +55,4 @@ - \ No newline at end of file +