From 1709558fd2025a62931248b4c021f379172de70f Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Fri, 2 Dec 2022 15:40:37 +0100
Subject: fix colors

---
 app/src/custom/res/values/custom-theme.xml                           | 5 ++++-
 app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java       | 2 +-
 .../main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java  | 2 +-
 app/src/main/res/values/colors.xml                                   | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/src')

diff --git a/app/src/custom/res/values/custom-theme.xml b/app/src/custom/res/values/custom-theme.xml
index a17b401c..b1a8d0cd 100644
--- a/app/src/custom/res/values/custom-theme.xml
+++ b/app/src/custom/res/values/custom-theme.xml
@@ -9,8 +9,11 @@
     <color name="colorActionBarTitleFont">#ffffff</color>
     <!--Font color of the action bar subtitle-->
     <color name="colorActionBarSubtitleFont">#cccccc</color>
+    <!-- action bar text colors for per state colored action bar -->
+    <color name="actionbar_connectivity_state_text_color_dark">@color/black800_dark</color>
+    <color name="actionbar_connectivity_state_text_color_light">@color/white</color>
     <!-- Font color of labels in EipFragment (main screen)-->
-    <color name="colorEipFragmentFont">#ffffff</color>
+    <color name="colorEipFragmentFont">@color/black800_dark</color>
     <!-- glow effect color of the on / off button -->
     <color name="colorMainBtnHighlight">#58FFA9</color>
     <!-- glow effect color of the on / off button if no network / traffic blocked -->
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java
index 28b981be..f56f2223 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java
@@ -263,7 +263,7 @@ public class MainActivity extends AppCompatActivity implements EipSetupListener,
         }
 
         if (textColor == 0) {
-            actionBarTextColor = isBrightColor(color) ? R.color.actionbar_dark_color : R.color.actionbar_light_color;
+            actionBarTextColor = isBrightColor(color) ? R.color.actionbar_connectivity_state_text_color_dark : R.color.actionbar_connectivity_state_text_color_light;
         } else {
             actionBarTextColor = textColor;
         }
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
index 470470ac..4df568b9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
@@ -446,7 +446,7 @@ public class EipFragment extends Fragment implements Observer {
         if (activity == null) {
             return;
         }
-        ((MainActivity) getActivity()).setActivityBarColor(primaryColor, secondaryColor, R.color.actionbar_dark_color);
+        ((MainActivity) getActivity()).setActivityBarColor(primaryColor, secondaryColor, R.color.actionbar_connectivity_state_text_color_dark);
     }
 
     private void handleNewState() {
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 62f6d163..4bf2cb93 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="black800_dark">#1b1b1b</color>
     <color name="black800">#424242</color>
     <color name="black800_secondary">#3b3b3b</color>
     <color name="black800_transparent">#AA424242</color>
@@ -65,8 +66,8 @@
     <color name="bg_running_top_light_transparent">#ffffea</color>
 
     <!-- action bar text colors for per state colored action bar -->
-    <color name="actionbar_dark_color">@color/black800</color>
-    <color name="actionbar_light_color">@color/white</color>
+    <color name="actionbar_connectivity_state_text_color_dark">@color/black800</color>
+    <color name="actionbar_connectivity_state_text_color_light">@color/white</color>
     <!-- default action bar colors used in other fragments than EipFragment -->
     <color name="colorActionBarTitleFont">@color/white</color>
     <color name="colorActionBarSubtitleFont">@color/black800</color>
-- 
cgit v1.2.3