From 1709558fd2025a62931248b4c021f379172de70f Mon Sep 17 00:00:00 2001 From: cyberta 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(-) 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 @@ #ffffff #cccccc + + @color/black800_dark + @color/white - #ffffff + @color/black800_dark #58FFA9 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 @@ #03DAC6 #eF2222 + #1b1b1b #424242 #3b3b3b #AA424242 @@ -65,8 +66,8 @@ #ffffea - @color/black800 - @color/white + @color/black800 + @color/white @color/white @color/black800 -- cgit v1.2.3