diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/res/values/attrs.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/styles.xml | 6 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 16a35eb2b..801b0742b 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -17,6 +17,8 @@ <attr name="text_Color_Main" format="reference|color" /> + <attr name="button_text_color_disabled" format="reference|color" /> + <attr name="color_background_tertiary" format="reference|color" /> <attr name="color_background_secondary" format="reference|color" /> <attr name="color_background_primary" format="reference|color" /> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 0818bbd5b..185699519 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -57,16 +57,16 @@ <style name="Widget.Conversations.Button.Borderless" parent="@style/Widget.MaterialComponents.Button.TextButton"> <item name="android:textSize">?TextSizeBody2</item> - <item name="android:textColor">?attr/colorAccent</item> + <item name="android:textColor">@color/button_state_color</item> </style> <style name="Widget.Conversations.Button.Outline" parent="@style/Widget.MaterialComponents.Button.OutlinedButton"> <item name="android:textSize">?TextSizeBody2</item> <item name="strokeColor">?attr/colorAccent</item> - <item name="android:textColor">?attr/colorAccent</item> + <item name="android:textColor">@color/button_state_color</item> </style> - <style name="Widget.Conversations.Button" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton"> + <style name="Widget.Conversations.Button" parent="@style/Widget.MaterialComponents.Button"> <item name="android:textSize">?TextSizeBody2</item> <item name="android:textColor">@color/realwhite</item> </style> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 54e6a4356..d8e7caf82 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -9,6 +9,7 @@ <item name="colorControlNormal">@color/accent</item> <item name="colorControlActivated">@color/accent</item> <item name="text_Color_Main">@color/realblack</item> + <item name="button_text_color_disabled">@color/grey500</item> <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> @@ -167,6 +168,7 @@ <item name="colorControlNormal">@color/accent</item> <item name="colorControlActivated">@color/accent</item> <item name="text_Color_Main">@color/realwhite</item> + <item name="button_text_color_disabled">@color/grey500</item> <item name="android:navigationBarColor" tools:targetApi="21">@color/black</item> <item name="color_background_primary">@color/grey700</item> |