From 128b532b511442881fe607daffee0240ce29a86d Mon Sep 17 00:00:00 2001 From: SpiritCroc <dev@spiritcroc.de> Date: Thu, 31 Mar 2022 08:09:21 +0200 Subject: [PATCH] [merge] Fix presence indicator color for SC default accent Change-Id: I484051c41f59f4d613849ae45592b6201b151f38 --- library/ui-styles/src/main/res/values/theme_dark.xml | 1 - library/ui-styles/src/main/res/values/theme_light.xml | 1 - library/ui-styles/src/main/res/values/theme_sc.xml | 1 + library/ui-styles/src/main/res/values/theme_sc_light.xml | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml index 87a96c62fc..7c01486207 100644 --- a/library/ui-styles/src/main/res/values/theme_dark.xml +++ b/library/ui-styles/src/main/res/values/theme_dark.xml @@ -153,7 +153,6 @@ <item name="room_color_hash_01">@color/element_room_01</item> <item name="room_color_hash_02">@color/element_room_02</item> <item name="room_color_hash_03">@color/element_room_03</item> - <item name="vctr_presence_indicator_online">?colorAccent</item> <item name="unread_line_unimportant">?vctr_content_tertiary</item> <item name="android:statusBarColor">@color/android_status_bar_background_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 index b2f63a7f2f..0a0d9a1f10 100644 --- a/library/ui-styles/src/main/res/values/theme_light.xml +++ b/library/ui-styles/src/main/res/values/theme_light.xml @@ -153,7 +153,6 @@ <item name="room_color_hash_01">@color/element_room_01</item> <item name="room_color_hash_02">@color/element_room_02</item> <item name="room_color_hash_03">@color/element_room_03</item> - <item name="vctr_presence_indicator_online">?colorAccent</item> <item name="unread_line_unimportant">?vctr_content_secondary</item> <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ --> diff --git a/library/ui-styles/src/main/res/values/theme_sc.xml b/library/ui-styles/src/main/res/values/theme_sc.xml index 7374ced81e..8e656cc294 100644 --- a/library/ui-styles/src/main/res/values/theme_sc.xml +++ b/library/ui-styles/src/main/res/values/theme_sc.xml @@ -40,6 +40,7 @@ <!-- Presence Indicator colors --> <item name="vctr_presence_indicator_offline">#ffdddddd</item> + <item name="vctr_presence_indicator_online">?colorAccent</item> <!-- Some alias --> <item name="vctr_header_background">?android:colorBackground</item> diff --git a/library/ui-styles/src/main/res/values/theme_sc_light.xml b/library/ui-styles/src/main/res/values/theme_sc_light.xml index 74da50a37e..d7517c328a 100644 --- a/library/ui-styles/src/main/res/values/theme_sc_light.xml +++ b/library/ui-styles/src/main/res/values/theme_sc_light.xml @@ -40,6 +40,7 @@ <!-- Presence Indicator colors --> <item name="vctr_presence_indicator_offline">@color/background_sc_bright</item> + <item name="vctr_presence_indicator_online">?colorAccent</item> <!-- Some alias --> <item name="vctr_header_background">@color/background_sc_light_secondary</item>