Rework text selector

This commit is contained in:
Benoit Marty 2020-08-05 19:34:19 +02:00
parent 06d927a911
commit b833198a3a
9 changed files with 19 additions and 16 deletions

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?riot_primary_text_color" android:state_enabled="true" />
<item android:color="?riot_primary_text_color_disabled" android:state_enabled="false" />
</selector>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/riot_primary_text_color_dark" android:state_enabled="true" />
<item android:color="@color/riot_primary_text_color_disabled_dark" android:state_enabled="false" />
</selector>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/riot_primary_text_color_light" android:state_enabled="true" />
<item android:color="@color/riot_secondary_text_color_light" android:state_enabled="false" />
</selector>

View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/riot_primary_text_color_status" android:state_enabled="true" />
<item android:color="@color/riot_primary_text_color_disabled_status" android:state_enabled="false" />
</selector>

View File

@ -71,6 +71,9 @@
<color name="default_text_hint_color_dark">#CCDDDDDD</color>
<!-- Text Colors -->
<attr name="riot_primary_text_color" format="color" />
<attr name="riot_primary_text_color_disabled" format="color" />
<!--Default/Text Primary-->
<color name="riot_primary_text_color_light">#FF2E2F32</color>
<color name="riot_primary_text_color_disabled_light">#FF9E9E9E</color>

View File

@ -80,6 +80,7 @@
<item name="android:windowBackground">@color/riot_primary_background_color_black</item>
<item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>
<item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_black</item>
</style>
<style name="AppTheme.Black" parent="AppTheme.Base.Black" />

View File

@ -94,6 +94,9 @@
<item name="vctr_markdown_block_background_color">@android:color/black</item>
<item name="vctr_spoiler_background_color">#FFFFFFFF</item>
<item name="riot_primary_text_color">@color/riot_primary_text_color_dark</item>
<item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_dark</item>
<!-- tab bar colors -->
<item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>

View File

@ -94,6 +94,9 @@
<item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
<item name="vctr_spoiler_background_color">#FF000000</item>
<item name="riot_primary_text_color">@color/riot_primary_text_color_light</item>
<item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_light</item>
<!-- tab bar colors -->
<item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>

View File

@ -9,7 +9,7 @@
<item name="colorPrimary">@color/primary_color_status</item>
<item name="colorAccent">@color/accent_color_status</item>
<item name="android:textColorPrimary">@color/primary_text_color_selector_status</item>
<item name="android:textColorPrimary">@color/primary_text_color_selector</item>
<item name="android:textColorSecondary">@color/riot_secondary_text_color_status</item>
<!-- Default color for text View -->
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_status</item>
@ -42,6 +42,9 @@
<item name="vctr_sending_message_text_color">#b3e8d2</item>
<item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
<item name="riot_primary_text_color">@color/riot_primary_text_color_status</item>
<item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_status</item>
<!-- tab bar colors -->
<item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>