From aea517515c4447755296679faf498dd19de7f344 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 4 Jun 2020 12:50:42 +0200
Subject: [PATCH 1/2] Fix navigation bar icon contrast on API in [21,27[
 (#1342)

---
 CHANGES.md                                      | 1 +
 vector/src/main/res/values-v21/theme_light.xml  | 3 ++-
 vector/src/main/res/values-v21/theme_status.xml | 3 ++-
 vector/src/main/res/values-v27/theme_light.xml  | 1 +
 vector/src/main/res/values-v27/theme_status.xml | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 638b81e0b4..29be0e2668 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Bugfix 🐛:
  - Switch theme is not fully taken into account without restarting the app
  - Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410)
  - Reply composer overlay stays on screen too long after send (#1169)
+ - Fix navigation bar icon contrast on API in [21,27[ (#1342)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/values-v21/theme_light.xml b/vector/src/main/res/values-v21/theme_light.xml
index d5a31ad36f..6f24c4d432 100644
--- a/vector/src/main/res/values-v21/theme_light.xml
+++ b/vector/src/main/res/values-v21/theme_light.xml
@@ -3,7 +3,8 @@
 
     <style name="AppTheme.Light.v21" parent="AppTheme.Base.Light">
         <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
-        <item name="android:navigationBarColor">@color/riotx_header_panel_background_light</item>
+        <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
 
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
diff --git a/vector/src/main/res/values-v21/theme_status.xml b/vector/src/main/res/values-v21/theme_status.xml
index 90c4e39b6f..0305cfccf8 100644
--- a/vector/src/main/res/values-v21/theme_status.xml
+++ b/vector/src/main/res/values-v21/theme_status.xml
@@ -3,7 +3,8 @@
 
     <style name="AppTheme.Status.v21" parent="AppTheme.Base.Status">
         <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
-        <item name="android:navigationBarColor">@color/riotx_header_panel_background_light</item>
+        <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
 
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
diff --git a/vector/src/main/res/values-v27/theme_light.xml b/vector/src/main/res/values-v27/theme_light.xml
index af005577c7..bfc2646377 100644
--- a/vector/src/main/res/values-v27/theme_light.xml
+++ b/vector/src/main/res/values-v27/theme_light.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <style name="AppTheme.Light.v27" parent="AppTheme.Light.v23">
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_light</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 
diff --git a/vector/src/main/res/values-v27/theme_status.xml b/vector/src/main/res/values-v27/theme_status.xml
index 3c72ede37d..f29383f8a3 100644
--- a/vector/src/main/res/values-v27/theme_status.xml
+++ b/vector/src/main/res/values-v27/theme_status.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <style name="AppTheme.Status.v27" parent="AppTheme.Status.v23">
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_light</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
 

From 3b256a708e79c6cc3341881635519e2e1791f4fb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 4 Jun 2020 12:55:27 +0200
Subject: [PATCH 2/2] Fix status bar icon contrast on API in [21,23[

---
 CHANGES.md                                      | 1 +
 vector/src/main/res/values-v21/theme_light.xml  | 3 ++-
 vector/src/main/res/values-v21/theme_status.xml | 3 ++-
 vector/src/main/res/values-v23/theme_light.xml  | 1 +
 vector/src/main/res/values-v23/theme_status.xml | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 29be0e2668..7a130d10c2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Bugfix 🐛:
  - Temporary fix to show error when user is creating an account on matrix.org with userId containing only digits (#1410)
  - Reply composer overlay stays on screen too long after send (#1169)
  - Fix navigation bar icon contrast on API in [21,27[ (#1342)
+ - Fix status bar icon contrast on API in [21,23[
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/values-v21/theme_light.xml b/vector/src/main/res/values-v21/theme_light.xml
index 6f24c4d432..8f52615316 100644
--- a/vector/src/main/res/values-v21/theme_light.xml
+++ b/vector/src/main/res/values-v21/theme_light.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.Light.v21" parent="AppTheme.Base.Light">
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
+        <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
         <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
         <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
 
diff --git a/vector/src/main/res/values-v21/theme_status.xml b/vector/src/main/res/values-v21/theme_status.xml
index 0305cfccf8..9dcd2e1d41 100644
--- a/vector/src/main/res/values-v21/theme_status.xml
+++ b/vector/src/main/res/values-v21/theme_status.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.Status.v21" parent="AppTheme.Base.Status">
-        <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
+        <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_dark</item>
         <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
         <item name="android:navigationBarColor">@color/riotx_header_panel_background_dark</item>
 
diff --git a/vector/src/main/res/values-v23/theme_light.xml b/vector/src/main/res/values-v23/theme_light.xml
index c96592acc9..7e27b65124 100644
--- a/vector/src/main/res/values-v23/theme_light.xml
+++ b/vector/src/main/res/values-v23/theme_light.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <style name="AppTheme.Light.v23" parent="AppTheme.Light.v21">
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
diff --git a/vector/src/main/res/values-v23/theme_status.xml b/vector/src/main/res/values-v23/theme_status.xml
index 054e9fcbc1..b2e12ab55d 100644
--- a/vector/src/main/res/values-v23/theme_status.xml
+++ b/vector/src/main/res/values-v23/theme_status.xml
@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.Status.v23" parent="AppTheme.Status.v21">
-        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <style name="AppTheme.Status" parent="AppTheme.Status.v23"/>