From f49f29a771da9510e9b21a645bbc89693b54f4d9 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Wed, 9 Feb 2022 14:11:28 -0300 Subject: [PATCH] Status bar in light theme is now white --- .../src/main/res/values-night/themes.xml | 4 ++-- mailbox-android/src/main/res/values/colors.xml | 15 ++++++--------- mailbox-android/src/main/res/values/themes.xml | 5 +++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/mailbox-android/src/main/res/values-night/themes.xml b/mailbox-android/src/main/res/values-night/themes.xml index 0a74b49e..c26ed264 100644 --- a/mailbox-android/src/main/res/values-night/themes.xml +++ b/mailbox-android/src/main/res/values-night/themes.xml @@ -5,9 +5,9 @@ <item name="colorPrimary">@color/briar_night</item> <item name="colorPrimaryDark">#1F78D1</item> <item name="colorSecondary">@color/briar_green</item> + <item name="colorOnPrimary">@color/white</item> <!-- Customize your theme here. --> <item name="android:background">@color/black</item> - <item name="android:statusBarColor" tools:targetApi="l">?attr/background</item> - <item name="colorOnPrimary">@color/white</item> + <item name="android:statusBarColor" tools:targetApi="21">?attr/background</item> </style> </resources> diff --git a/mailbox-android/src/main/res/values/colors.xml b/mailbox-android/src/main/res/values/colors.xml index ff2144f4..a0aca040 100644 --- a/mailbox-android/src/main/res/values/colors.xml +++ b/mailbox-android/src/main/res/values/colors.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="purple_200">#FFBB86FC</color> - <color name="purple_500">#FF6200EE</color> - <color name="purple_700">#FF3700B3</color> - <color name="teal_200">#FF03DAC5</color> - <color name="teal_700">#FF018786</color> - <color name="black">#FF000000</color> - <color name="white">#FFFFFFFF</color> - <color name="briar_green">#74B816</color> <color name="briar_night">#435B77</color> -</resources> \ No newline at end of file + <color name="briar_blue">#1F78D1</color> + <color name="briar_blue_dark">#1A222D</color> + + <color name="black">#FF000000</color> + <color name="white">#FFFFFFFF</color> +</resources> diff --git a/mailbox-android/src/main/res/values/themes.xml b/mailbox-android/src/main/res/values/themes.xml index ce3da263..50018ee4 100644 --- a/mailbox-android/src/main/res/values/themes.xml +++ b/mailbox-android/src/main/res/values/themes.xml @@ -3,9 +3,10 @@ <style name="Theme.BriarMailbox" parent="Theme.Material3.DayNight.NoActionBar"> <!-- Primary brand color. --> <item name="colorPrimary">@color/briar_night</item> - <item name="colorPrimaryDark">#1F78D1</item> + <item name="colorPrimaryDark">@color/briar_blue</item> <item name="colorSecondary">@color/briar_green</item> <!-- Customize your theme here. --> - <item name="android:statusBarColor" tools:targetApi="l">@color/black</item> + <item name="android:statusBarColor" tools:targetApi="21">@color/white</item> + <item name="android:windowLightStatusBar" tools:targetApi="23">true</item> </style> </resources> -- GitLab