From d78cbd4e180aaf944eaed088d84cba976599623c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 18 Jul 2024 12:42:15 +0200
Subject: [PATCH] Use Theme.MaterialComponents.DayNight to avoid code
 duplication.

Extract colors to own files and create booleans
---
 .../themes.xml => values-night/colors.xml}    | 15 ++++--
 app/src/gplay/res/values-night/themes.xml     | 49 -------------------
 app/src/gplay/res/values-v27/themes.xml       |  4 +-
 app/src/gplay/res/values/colors.xml           | 32 ++++++++++++
 app/src/gplay/res/values/themes.xml           | 16 ++----
 5 files changed, 48 insertions(+), 68 deletions(-)
 rename app/src/gplay/res/{values-night-v27/themes.xml => values-night/colors.xml} (56%)
 delete mode 100644 app/src/gplay/res/values-night/themes.xml
 create mode 100644 app/src/gplay/res/values/colors.xml

diff --git a/app/src/gplay/res/values-night-v27/themes.xml b/app/src/gplay/res/values-night/colors.xml
similarity index 56%
rename from app/src/gplay/res/values-night-v27/themes.xml
rename to app/src/gplay/res/values-night/colors.xml
index b1b00d7205..e830bc1cb1 100644
--- a/app/src/gplay/res/values-night-v27/themes.xml
+++ b/app/src/gplay/res/values-night/colors.xml
@@ -16,10 +16,17 @@
 
 <resources>
 
-    <style name="Theme.OssLicenses.v27" parent="Base.Theme.OssLicenses">
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
+    <!-- Use a few colors from compoundColorsDark -->
+    <!-- DarkColorTokens.colorThemeBg -->
+    <color name="colorThemeBg">#FF101317</color>
+    <!-- DarkColorTokens.colorGray1400 -->
+    <color name="textPrimary">#FFEBEEF2</color>
+    <!-- DarkColorTokens.colorGray900 -->
+    <color name="textSecondary">#ff808994</color>
+    <!-- DarkColorTokens.colorBlue900 -->
+    <color name="textLinkExternal">#FF4187EB</color>
 
-    <style name="Theme.OssLicenses" parent="Theme.OssLicenses.v27"/>
+    <bool name="windowLightStatusBar">false</bool>
+    <bool name="windowLightNavigationBar">false</bool>
 
 </resources>
diff --git a/app/src/gplay/res/values-night/themes.xml b/app/src/gplay/res/values-night/themes.xml
deleted file mode 100644
index 2328a85a41..0000000000
--- a/app/src/gplay/res/values-night/themes.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2024 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <!-- Use a few colors from compoundColorsLight -->
-    <!-- DarkColorTokens.colorThemeBg -->
-    <color name="colorThemeBg">#FF101317</color>
-    <!-- DarkColorTokens.colorGray1400 -->
-    <color name="textPrimary">#FFEBEEF2</color>
-    <!-- DarkColorTokens.colorGray900 -->
-    <color name="textSecondary">#ff808994</color>
-    <!-- DarkColorTokens.colorBlue900 -->
-    <color name="textLinkExternal">#FF4187EB</color>
-
-    <style name="Base.Theme.OssLicenses" parent="Theme.MaterialComponents">
-        <!-- Background of title bar -->
-        <item name="colorPrimary">@color/colorThemeBg</item>
-        <!-- Background of the screen -->
-        <item name="android:colorBackground">@color/colorThemeBg</item>
-        <!-- Text of the licenses -->
-        <item name="android:textColor">@color/textSecondary</item>
-        <!-- Link text color -->
-        <item name="android:textColorLink">@color/textLinkExternal</item>
-        <!-- Title, back button and license item text color -->
-        <item name="android:textColorPrimary">@color/textPrimary</item>
-        <!-- Background of status bar -->
-        <item name="android:statusBarColor">@color/colorThemeBg</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <!-- Background of navigation bar -->
-        <item name="android:navigationBarColor">@color/colorThemeBg</item>
-    </style>
-
-    <style name="Theme.OssLicenses" parent="Base.Theme.OssLicenses" />
-
-</resources>
diff --git a/app/src/gplay/res/values-v27/themes.xml b/app/src/gplay/res/values-v27/themes.xml
index 6ee828f6d2..99fe605d0a 100644
--- a/app/src/gplay/res/values-v27/themes.xml
+++ b/app/src/gplay/res/values-v27/themes.xml
@@ -16,8 +16,8 @@
 
 <resources>
 
-    <style name="Theme.OssLicenses.Light.v27" parent="Base.Theme.OssLicenses.Light">
-        <item name="android:windowLightNavigationBar">true</item>
+    <style name="Theme.OssLicenses.Light.v27" parent="Base.Theme.OssLicenses">
+        <item name="android:windowLightNavigationBar">@bool/windowLightNavigationBar</item>
     </style>
 
     <style name="Theme.OssLicenses" parent="Theme.OssLicenses.Light.v27"/>
diff --git a/app/src/gplay/res/values/colors.xml b/app/src/gplay/res/values/colors.xml
new file mode 100644
index 0000000000..04f5f153d1
--- /dev/null
+++ b/app/src/gplay/res/values/colors.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2024 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+
+    <!-- Use a few colors from compoundColorsLight -->
+    <!-- LightColorTokens.colorThemeBg -->
+    <color name="colorThemeBg">#FFFFFFFF</color>
+    <!-- LightColorTokens.colorGray1400 -->
+    <color name="textPrimary">#FF1B1D22</color>
+    <!-- LightColorTokens.colorGray900 -->
+    <color name="textSecondary">#FF656D77</color>
+    <!-- LightColorTokens.colorBlue900 -->
+    <color name="textLinkExternal">#FF0467DD</color>
+
+    <bool name="windowLightStatusBar">true</bool>
+    <bool name="windowLightNavigationBar">true</bool>
+
+</resources>
diff --git a/app/src/gplay/res/values/themes.xml b/app/src/gplay/res/values/themes.xml
index 08d675c44a..95f0429e0d 100644
--- a/app/src/gplay/res/values/themes.xml
+++ b/app/src/gplay/res/values/themes.xml
@@ -16,17 +16,7 @@
 
 <resources>
 
-    <!-- Use a few colors from compoundColorsLight -->
-    <!-- LightColorTokens.colorThemeBg -->
-    <color name="colorThemeBg">#FFFFFFFF</color>
-    <!-- LightColorTokens.colorGray1400 -->
-    <color name="textPrimary">#FF1B1D22</color>
-    <!-- LightColorTokens.colorGray900 -->
-    <color name="textSecondary">#FF656D77</color>
-    <!-- LightColorTokens.colorBlue900 -->
-    <color name="textLinkExternal">#FF0467DD</color>
-
-    <style name="Base.Theme.OssLicenses.Light" parent="Theme.MaterialComponents.Light">
+    <style name="Base.Theme.OssLicenses" parent="Theme.MaterialComponents.DayNight">
         <!-- Background of title bar -->
         <item name="colorPrimary">@color/colorThemeBg</item>
         <!-- Background of the screen -->
@@ -39,13 +29,13 @@
         <item name="android:textColorPrimary">@color/textPrimary</item>
         <!-- Background of status bar -->
         <item name="android:statusBarColor">@color/colorThemeBg</item>
-        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightStatusBar">@bool/windowLightStatusBar</item>
         <!-- Background of navigation bar -->
         <item name="android:navigationBarColor">@color/colorThemeBg</item>
         <!-- Try to remove Toolbar elevation, but it does not work :/ -->
         <item name="toolbarStyle">@style/NoElevationToolbar</item>
     </style>
 
-    <style name="Theme.OssLicenses" parent="Base.Theme.OssLicenses.Light" />
+    <style name="Theme.OssLicenses" parent="Base.Theme.OssLicenses" />
 
 </resources>