From fc9b70e157504d40d695d489ef69ccf83f1451bf Mon Sep 17 00:00:00 2001
From: Mohamed <mohamed.metwalli@sap.com>
Date: Fri, 7 May 2021 10:14:54 +0200
Subject: [PATCH] Adapt System UI colour in light and dark themes
(EXPOSUREAPP-6991) (#3078)
* Light navigation bar flag
* Adapt status bar
---
Corona-Warn-App/src/main/res/values-night/bools.xml | 4 ++++
Corona-Warn-App/src/main/res/values-night/colors.xml | 1 +
Corona-Warn-App/src/main/res/values/bools.xml | 4 ++++
Corona-Warn-App/src/main/res/values/colors.xml | 1 +
Corona-Warn-App/src/main/res/values/styles.xml | 9 ++++++++-
5 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 Corona-Warn-App/src/main/res/values-night/bools.xml
create mode 100644 Corona-Warn-App/src/main/res/values/bools.xml
diff --git a/Corona-Warn-App/src/main/res/values-night/bools.xml b/Corona-Warn-App/src/main/res/values-night/bools.xml
new file mode 100644
index 000000000..2f4026b34
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/values-night/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <bool name="lightSystemUI">false</bool>
+</resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-night/colors.xml b/Corona-Warn-App/src/main/res/values-night/colors.xml
index 5048bc35d..98ab8628d 100644
--- a/Corona-Warn-App/src/main/res/values-night/colors.xml
+++ b/Corona-Warn-App/src/main/res/values-night/colors.xml
@@ -13,6 +13,7 @@
<color name="colorSurface2">#434445</color>
<color name="colorSurface2Pressed">#565757</color>
<color name="colorHairline">#4DFFFFFF</color>
+ <color name="colorSystemUI">#000000</color>
<!-- Text -->
<color name="colorTextPrimary1">#FFFFFF</color>
diff --git a/Corona-Warn-App/src/main/res/values/bools.xml b/Corona-Warn-App/src/main/res/values/bools.xml
new file mode 100644
index 000000000..8ca6391dd
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <bool name="lightSystemUI">true</bool>
+</resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml
index b7063323a..0c537ee78 100644
--- a/Corona-Warn-App/src/main/res/values/colors.xml
+++ b/Corona-Warn-App/src/main/res/values/colors.xml
@@ -15,6 +15,7 @@
<color name="colorHairline">#3317191A</color>
<color name="cwaGrayHighlight">#5D6F80</color>
+ <color name="colorSystemUI">#F5F5F5</color>
<!--Cards-->
<color name="colorCardBackgroundHighlightGray">@color/cwaGrayHighlight</color>
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index dbdaf8ec6..5d15c3486 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -1,4 +1,4 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.Bridge">
<item name="colorPrimary">@color/colorBrandSecondary</item>
@@ -11,6 +11,13 @@
<item name="materialTimePickerTheme">@style/ThemeOverlay.App.TimePicker</item>
<item name="buttonStyle">@style/Widget.AppCompat.Button.Borderless.Colored</item>
+
+ <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/lightSystemUI
+ </item>
+ <item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
+
+ <item name="android:navigationBarColor">@color/colorSystemUI</item>
+ <item name="android:statusBarColor">@color/colorSystemUI</item>
</style>
<style name="ThemeOverlay.App.DatePicker" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
--
GitLab