From 72ab8da066b4ef4b11c7758b1aac691956d1f160 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 19 Nov 2021 15:27:41 +0100
Subject: fix font coloring for buttons, ensure the location selection button
 font color is white

---
 app/src/main/res/color/button_color.xml            | 5 -----
 app/src/main/res/color/button_state_font_color.xml | 5 +++++
 app/src/main/res/layout/f_gateway_selection.xml    | 1 +
 app/src/main/res/values/styles.xml                 | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 app/src/main/res/color/button_color.xml
 create mode 100644 app/src/main/res/color/button_state_font_color.xml

(limited to 'app/src/main')

diff --git a/app/src/main/res/color/button_color.xml b/app/src/main/res/color/button_color.xml
deleted file mode 100644
index f7fed335..00000000
--- a/app/src/main/res/color/button_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/color/button_state_font_color.xml b/app/src/main/res/color/button_state_font_color.xml
new file mode 100644
index 00000000..f7fed335
--- /dev/null
+++ b/app/src/main/res/color/button_state_font_color.xml
@@ -0,0 +1,5 @@
+<?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/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml
index 91354104..a5034182 100644
--- a/app/src/main/res/layout/f_gateway_selection.xml
+++ b/app/src/main/res/layout/f_gateway_selection.xml
@@ -77,6 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/gateway_selection_recommended_location"
+            android:textColor="@color/button_state_font_color"
             />
     </LinearLayout>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index df08916b..9b05d3fe 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/button_color</item>
+        <item name="android:textColor">@color/colorFontBtn</item>
     </style>
 
     <style name="BitmaskActivity">
-- 
cgit v1.2.3