Fix message highlight color behind bubbles for SC themes

Change-Id: Ia115cba593c90682bbf4023d9161b1df6001f3c9
This commit is contained in:
SpiritCroc 2021-06-29 16:45:33 +02:00
parent 559016cd32
commit 4e9ab0c6f9
7 changed files with 12 additions and 2 deletions

View File

@ -15,6 +15,8 @@
<attr name="dense_dropdown_text_input" format="reference" /> <attr name="dense_dropdown_text_input" format="reference" />
<attr name="message_highlight_bg_color" format="color" />
</declare-styleable> </declare-styleable>
</resources> </resources>

View File

@ -5,6 +5,7 @@
<color name="accent_sc">#8BC34A</color> <color name="accent_sc">#8BC34A</color>
<color name="accent_sc_alpha25">#3F8BC34A</color> <color name="accent_sc_alpha25">#3F8BC34A</color>
<color name="accent_sc_alpha12">#1E8BC34A</color> <color name="accent_sc_alpha12">#1E8BC34A</color>
<color name="accent_sc_noalpha12">#edf4e6</color> <!-- same as accent_sc_alpha12 when displayed on #fafafa -->
<color name="accent_sc_dark">#689F38</color> <color name="accent_sc_dark">#689F38</color>
<color name="accent_sc_50">#F1F8E9</color> <color name="accent_sc_50">#F1F8E9</color>
<color name="accent_sc_100">#DCEDC8</color> <color name="accent_sc_100">#DCEDC8</color>
@ -29,6 +30,7 @@
<color name="background_dark_sc">#ff212121</color> <color name="background_dark_sc">#ff212121</color>
<color name="background_black_sc">#ff000000</color> <color name="background_black_sc">#ff000000</color>
<color name="background_floating_sc">#ff424242</color> <color name="background_floating_sc">#ff424242</color>
<color name="background_sc_bright">#ff616161</color>
<color name="background_touch_guard_sc">#bf000000</color> <color name="background_touch_guard_sc">#bf000000</color>
<!-- Light theme text/foreground colors --> <!-- Light theme text/foreground colors -->

View File

@ -124,6 +124,7 @@
<item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item> <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
<item name="colorAccentPale">@color/element_accent_pale</item> <item name="colorAccentPale">@color/element_accent_pale</item>
<item name="dense_dropdown_text_input">@style/Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC</item> <item name="dense_dropdown_text_input">@style/Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC</item>
<item name="message_highlight_bg_color">?vctr_header_background</item>
<item name="android:statusBarColor">@color/android_status_bar_background_dark</item> <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
<item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item> <item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>

View File

@ -124,6 +124,7 @@
<item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item> <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
<item name="colorAccentPale">@color/element_accent_pale</item> <item name="colorAccentPale">@color/element_accent_pale</item>
<item name="dense_dropdown_text_input">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu</item> <item name="dense_dropdown_text_input">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu</item>
<item name="message_highlight_bg_color">?vctr_header_background</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ --> <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
<item name="android:statusBarColor">@color/android_status_bar_background_dark</item> <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>

View File

@ -86,6 +86,7 @@
<item name="sc_message_bg_outgoing">@color/background_sc</item> <item name="sc_message_bg_outgoing">@color/background_sc</item>
<item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item> <item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item>
<item name="colorAccentPale">@color/accent_sc_pale</item> <item name="colorAccentPale">@color/accent_sc_pale</item>
<item name="message_highlight_bg_color">@color/accent_sc_alpha25</item>
<item name="android:statusBarColor">@color/background_black_sc</item> <item name="android:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item> <item name="android:navigationBarColor">@color/background_black_sc</item>
@ -107,11 +108,13 @@
<style name="AppTheme.Base.SC.Colored"> <style name="AppTheme.Base.SC.Colored">
<item name="sc_message_bg_incoming">@color/background_floating_sc</item> <item name="sc_message_bg_incoming">@color/background_floating_sc</item>
<item name="sc_message_bg_outgoing">@color/accent_sc_alpha25</item> <item name="sc_message_bg_outgoing">@color/accent_sc_alpha25</item>
<item name="message_highlight_bg_color">@color/background_sc_bright</item>
</style> </style>
<style name="AppTheme.Base.SC.Dark.Colored"> <style name="AppTheme.Base.SC.Dark.Colored">
<item name="sc_message_bg_incoming">@color/background_floating_sc</item> <item name="sc_message_bg_incoming">@color/background_floating_sc</item>
<item name="sc_message_bg_outgoing">@color/accent_sc_alpha25</item> <item name="sc_message_bg_outgoing">@color/accent_sc_alpha25</item>
<item name="message_highlight_bg_color">@color/background_sc_bright</item>
</style> </style>

View File

@ -83,9 +83,10 @@
<item name="colorAccent">@color/accent_sc</item> <item name="colorAccent">@color/accent_sc</item>
<item name="android:colorAccent">@color/accent_sc</item> <item name="android:colorAccent">@color/accent_sc</item>
<item name="sc_message_bg_incoming">@color/background_sc_light_secondary</item> <item name="sc_message_bg_incoming">@color/background_sc_light_secondary</item>
<item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item> <item name="sc_message_bg_outgoing">@color/accent_sc_noalpha12</item>
<item name="riotx_unread_unimportant_room_badge">#737373</item><!-- like text_color_secondary_sc_light, but without transparency --> <item name="riotx_unread_unimportant_room_badge">#737373</item><!-- like text_color_secondary_sc_light, but without transparency -->
<item name="colorAccentPale">@color/accent_sc_pale</item> <item name="colorAccentPale">@color/accent_sc_pale</item>
<item name="message_highlight_bg_color">#ffe0e0e0</item>
<item name="android:statusBarColor">@color/background_black_sc</item> <item name="android:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item> <item name="android:navigationBarColor">@color/background_black_sc</item>

View File

@ -9,7 +9,7 @@
<item android:left="6dp" android:right="2dp"> <item android:left="6dp" android:right="2dp">
<shape> <shape>
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" /> <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
<solid android:color="?vctr_header_background" /> <solid android:color="?message_highlight_bg_color" />
</shape> </shape>
</item> </item>