diff options
| author | cyberta <cyberta@riseup.net> | 2022-12-02 15:40:37 +0100 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-12-02 20:27:35 +0100 |
| commit | 1709558fd2025a62931248b4c021f379172de70f (patch) | |
| tree | fb515f4546969889ae0a2ba4ad0f337f6c5baa3f /app/src/main | |
| parent | 9ec59148a926a5c8e5fecfbb64b6418d1dbb852d (diff) | |
fix colors
Diffstat (limited to 'app/src/main')
3 files changed, 5 insertions, 4 deletions
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> |