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/main/res/values/colors.xml | 7 +++++--
 app/src/main/res/values/styles.xml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/src/main/res/values')

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


From 4c7632a6f5278801837850d2bdba38a64e9fd906 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 14 Dec 2022 18:06:15 +0100
Subject: tint location button colors as dark as possible

---
 app/src/main/res/values/colors.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e33c5ea4..ead4785e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
     <color name="colorMainBtnHighlight">#03DAC6</color>
     <color name="colorMainBtnError">#eF2222</color>
 
+    <color name="black">#000000</color>
     <color name="black800_dark">#1b1b1b</color>
     <color name="black800">#424242</color>
     <color name="black800_secondary">#3b3b3b</color>
@@ -44,7 +45,7 @@
     <!-- 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="colorLocationButtonTint">@color/black</color>
     <color name="colorLocationButtonTintTransparent">@color/black800_high_transparent</color>
     <color name="colorWarning">#B33A3A</color>
 
-- 
cgit v1.2.3