Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential issue with link colors

Browse Source
This commit is contained in:
Benoit Marty 2021-02-15 18:18:31 +01:00 committed by Benoit Marty
parent e401252c03
commit acbb796649
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/res/values/colors.xml
View File

@ -131,7 +131,6 @@
<color name="riotx_notice">#FFFF4B55</color> <color name="riotx_notice">#FFFF4B55</color>
<color name="riotx_notice_secondary">#FF61708B</color> <color name="riotx_notice_secondary">#FF61708B</color>
<color name="riotx_notice_secondary_alpha12">#1E61708B</color> <color name="riotx_notice_secondary_alpha12">#1E61708B</color>
<color name="riotx_links">#FF368BD6</color>
<color name="riotx_avatar_fill_1">#FF03B381</color> <color name="riotx_avatar_fill_1">#FF03B381</color>
<color name="riotx_avatar_fill_2">#FF368bd6</color> <color name="riotx_avatar_fill_2">#FF368bd6</color>

4
vector/src/main/res/values/styles_riot.xml
View File

@ -271,7 +271,7 @@
<item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item> <item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item>
<!-- Default color for text View --> <!-- Default color for text View -->
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item> <item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item>
<item name="android:textColorLink">@color/riotx_links</item> <item name="android:textColorLink">@color/link_color_dark</item>
</style> </style>
<style name="Vector.BottomSheet.Light" parent="Theme.Design.Light.BottomSheetDialog"> <style name="Vector.BottomSheet.Light" parent="Theme.Design.Light.BottomSheetDialog">
@ -279,7 +279,7 @@
<item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item> <item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
<!-- Default color for text View --> <!-- Default color for text View -->
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item> <item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item>
<item name="android:textColorLink">@color/riotx_links</item> <item name="android:textColorLink">@color/link_color_light</item>
</style> </style>

2
vector/src/main/res/values/theme_black.xml
View File

@ -66,8 +66,6 @@
<item name="materialButtonStyle">@style/VectorButtonStyle</item> <item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbarStyle</item> <item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="android:textColorLink">@color/riotx_links</item>
<!-- Menu text color --> <!-- Menu text color -->
<item name="android:actionMenuTextColor">?colorAccent</item> <item name="android:actionMenuTextColor">?colorAccent</item>

2
vector/src/main/res/values/theme_dark.xml
View File

@ -66,7 +66,7 @@
<item name="toolbarStyle">@style/VectorToolbarStyle</item> <item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item> <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
<item name="android:textColorLink">@color/riotx_links</item> <item name="android:textColorLink">@color/link_color_dark</item>
<!-- Menu text color --> <!-- Menu text color -->
<item name="android:actionMenuTextColor">?colorAccent</item> <item name="android:actionMenuTextColor">?colorAccent</item>

4
vector/src/main/res/values/theme_light.xml
View File

@ -65,7 +65,7 @@
<item name="toolbarStyle">@style/VectorToolbarStyle</item> <item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleLight</item> <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight</item>
<item name="android:textColorLink">@color/riotx_links</item> <item name="android:textColorLink">@color/link_color_light</item>
<!-- Menu text color --> <!-- Menu text color -->
<item name="android:actionMenuTextColor">?colorAccent</item> <item name="android:actionMenuTextColor">?colorAccent</item>
@ -82,7 +82,7 @@
<item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item> <item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item>
<!-- Base Text Secondary--> <!-- Base Text Secondary-->
<item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item> <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
<item name="vctr_toolbar_link_text_color">@color/riotx_links</item> <item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
<!-- default text colors --> <!-- default text colors -->
<item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item> <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>