filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SC theme reaction background colors after last uptsream merge 

Change-Id: Ib86accac0a189eabd79f1159452c28d3dfe42e87
This commit is contained in:
SpiritCroc 2020-11-08 17:36:09 +01:00
parent 164848e0aa
commit e1cb8c520a
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
View File

@ -4,7 +4,7 @@
<solid android:color="?riotx_reaction_background_on" /> <solid android:color="?riotx_reaction_background_on" />
<stroke android:width="1dp" android:color="@color/accent_color_light" /> <stroke android:width="1dp" android:color="?colorAccent" />
<corners android:radius="20dp" /> <corners android:radius="20dp" />

6
vector/src/main/res/values/colors_sc.xml
View File

@ -5,6 +5,9 @@
<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_dark">#689F38</color> <color name="accent_sc_dark">#689F38</color>
<color name="accent_sc_50">#F1F8E9</color>
<color name="accent_sc_100">#DCEDC8</color>
<color name="accent_sc_900">#33691E</color>
<color name="direct_chat_ring_color_sc">@color/accent_sc_dark</color> <color name="direct_chat_ring_color_sc">@color/accent_sc_dark</color>
<color name="avatar_fill_sc_1">@color/accent_sc</color> <color name="avatar_fill_sc_1">@color/accent_sc</color>
@ -24,4 +27,7 @@
<color name="timestamp_overlay_fg">#ffffff</color> <color name="timestamp_overlay_fg">#ffffff</color>
<color name="timestamp_overlay_bg">#80000000</color> <color name="timestamp_overlay_bg">#80000000</color>
<color name="sc_reaction_background_on_light">@color/accent_sc_50</color>
<color name="sc_reaction_background_on_dark">@color/accent_sc_900</color>
</resources> </resources>

3
vector/src/main/res/values/theme_sc.xml
View File

@ -181,6 +181,9 @@
<!-- specify shared element enter and exit transitions --> <!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="riotx_reaction_background_off">@color/background_sc</item>
<item name="riotx_reaction_background_on">@color/sc_reaction_background_on_dark</item>
</style> </style>
<style name="AppTheme.Base.SC.Dark"> <style name="AppTheme.Base.SC.Dark">

3
vector/src/main/res/values/theme_sc_light.xml
View File

@ -48,6 +48,9 @@
<!-- specify shared element enter and exit transitions --> <!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="riotx_reaction_background_off">@color/riotx_reaction_background_off_light</item>
<item name="riotx_reaction_background_on">@color/sc_reaction_background_on_light</item>
</style> </style>
<!-- Default AppTheme for usage where settings don't apply --> <!-- Default AppTheme for usage where settings don't apply -->