From 77d3d7fb647632955197a678287b34d4281cbd40 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 12 Dec 2022 21:51:27 +0100
Subject: fix and unify button text colors

---
 app/src/custom/res/values/custom-theme.xml                         | 5 +++++
 app/src/main/res/color/button_state_font_color.xml                 | 5 -----
 app/src/main/res/layout/a_add_provider.xml                         | 2 ++
 app/src/main/res/layout/a_add_provider_tablet_scrollview.xml       | 2 ++
 app/src/main/res/layout/a_provider_credentials.xml                 | 1 +
 .../res/layout/a_provider_credentials_tablet_linear_layout.xml     | 1 +
 app/src/main/res/layout/d_obfuscation_proxy.xml                    | 3 +++
 app/src/main/res/layout/donation_reminder_dialog.xml               | 4 ++--
 app/src/main/res/values/colors.xml                                 | 7 +++++--
 app/src/main/res/values/styles.xml                                 | 2 +-
 10 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 app/src/main/res/color/button_state_font_color.xml

(limited to 'app')

diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml
index 48d04322..4326542c 100644
--- a/app/src/custom/res/values/custom-theme.xml
+++ b/app/src/custom/res/values/custom-theme.xml
@@ -21,4 +21,9 @@
     <!-- location button icon tint color -->
     <color name="colorLocationButtonTint">@color/black800</color>
     <color name="colorLocationButtonTintTransparent">@color/black800_transparent</color>
+    <!-- pill style button text colors -->
+    <color name="color_font_btn_primary">@color/white</color>
+    <color name="color_font_btn_secondary">@color/black800</color>
+    <!-- button text colors in Alerts -->
+    <color name="color_font_btn">@color/black800</color>
 </resources>
diff --git a/app/src/main/res/color/button_state_font_color.xml b/app/src/main/res/color/button_state_font_color.xml
deleted file mode 100644
index f7fed335..00000000
--- a/app/src/main/res/color/button_state_font_color.xml
+++ /dev/null
@@ -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/colorFontBtnEnabled" android:state_enabled="true"/>
-    <item android:color="@color/colorFontBtn"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml
index 517c8c19..aad64630 100644
--- a/app/src/main/res/layout/a_add_provider.xml
+++ b/app/src/main/res/layout/a_add_provider.xml
@@ -70,6 +70,7 @@
                     android:id="@+id/button_cancel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/cancel" />
 
                 <Button
@@ -79,6 +80,7 @@
                     android:layout_marginLeft="@dimen/add_button_margin"
                     android:layout_marginStart="@dimen/add_button_margin"
                     android:enabled="false"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/save" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
index d3b8fc58..74904f36 100644
--- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
+++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml
@@ -75,6 +75,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minWidth="80dp"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/cancel" />
 
                 <Button
@@ -84,6 +85,7 @@
                     android:minWidth="80dp"
                     android:layout_marginLeft="@dimen/add_button_margin"
                     android:layout_marginStart="@dimen/add_button_margin"
+                    android:textColor="@color/color_font_btn_primary"
                     android:enabled="false"
                     android:text="@string/save" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml
index c5ff5f99..033aae16 100644
--- a/app/src/main/res/layout/a_provider_credentials.xml
+++ b/app/src/main/res/layout/a_provider_credentials.xml
@@ -44,6 +44,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:enabled="false"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/login_button" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
index 56222813..73557853 100644
--- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
+++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml
@@ -50,6 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:enabled="false"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/login_button" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/d_obfuscation_proxy.xml b/app/src/main/res/layout/d_obfuscation_proxy.xml
index 92d51fec..2ce9d7b3 100644
--- a/app/src/main/res/layout/d_obfuscation_proxy.xml
+++ b/app/src/main/res/layout/d_obfuscation_proxy.xml
@@ -81,6 +81,7 @@
                 android:layout_height="wrap_content"
                 android:text="Use defaults"
                 android:background="@drawable/cust_button_secondary"
+                android:textColor="@color/color_font_btn_secondary"
                 android:layout_marginHorizontal="@dimen/stdpadding"
                 />
             <androidx.appcompat.widget.LinearLayoutCompat
@@ -93,6 +94,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/stdpadding"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/cancel"
                     />
 
@@ -101,6 +103,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="@dimen/stdpadding"
+                    android:textColor="@color/color_font_btn_primary"
                     android:text="@string/save"
                     />
             </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
index 0a93c867..17eaf009 100644
--- a/app/src/main/res/layout/donation_reminder_dialog.xml
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -50,7 +50,7 @@
             android:layout_marginTop="@dimen/add_button_margin"
             android:background="@drawable/cust_button_primary"
             android:text="@string/donate_button_donate"
-            android:textColor="@color/white"
+            android:textColor="@color/color_font_btn_primary"
             android:textStyle="bold" />
 
         <Button
@@ -63,7 +63,7 @@
             android:layout_marginTop="@dimen/standard_margin"
             android:background="@drawable/cust_button_secondary"
             android:text="@string/donate_button_remind_later"
-            android:textColor="@android:color/tab_indicator_text"
+            android:textColor="@color/color_font_btn_secondary"
             android:textStyle="bold" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 35e49370..e33c5ea4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,8 +39,11 @@
     <color name="black_high_transparent">#05000000</color>
 
     <color name="colorEipFragmentFont">@color/black800</color>
-    <color name="colorFontBtn">@color/black800</color>
-    <color name="colorFontBtnEnabled">@color/white</color>
+    <!-- button text colors in Alerts etc. -->
+    <color name="color_font_btn">@color/black800</color>
+    <!-- pill style button text colors -->
+    <color name="color_font_btn_primary">@color/black800</color>
+    <color name="color_font_btn_secondary">@color/black800</color>
     <color name="colorLocationButtonTint">@color/black800</color>
     <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color>
     <color name="colorWarning">#B33A3A</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9b05d3fe..f42be3c1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -65,7 +65,7 @@
         <item name="android:background">@drawable/cust_button_primary</item>
         <item name="android:height">36dp</item>
         <item name="android:minWidth">75dp</item>
-        <item name="android:textColor">@color/colorFontBtn</item>
+        <item name="android:textColor">@color/color_font_btn</item>
     </style>
 
     <style name="BitmaskActivity">
-- 
cgit v1.2.3