From f8bb8af96cd311805ef584f2cc34e98b6dbb1844 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sun, 8 Jan 2023 21:26:05 -0600
Subject: Dark theme now tints navbar and status bar equally

---
 app/src/main/res/values-v21/themes.xml | 7 +++++--
 app/src/main/res/values/colors.xml     | 3 +++
 app/src/main/res/values/themes.xml     | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index 6461130a..a6088f3f 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -16,7 +16,9 @@
 
 	<style name="Theme.DSub.Light.No_Color" parent="Theme.DSub.Light.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
-		<item name="android:statusBarColor">@android:color/black</item>
+		<item name="android:statusBarColor">@color/lightBackground</item>
+		<item name="android:windowLightStatusBar">true</item>
+		<item name="android:navigationBarColor">@color/lightBackground</item>
 	</style>
 	<style name="Theme.DSub.Black.No_Color" parent="Theme.DSub.Black.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
@@ -24,7 +26,8 @@
 	</style>
 	<style name="Theme.DSub.Dark.No_Color" parent="Theme.DSub.Dark.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
-		<item name="android:statusBarColor">@android:color/black</item>
+		<item name="android:statusBarColor">@color/darkBackground</item>
+		<item name="android:navigationBarColor">@color/darkBackground</item>
 	</style>
 	<style name="Theme.DSub.Holo.No_Color" parent="Theme.DSub.Holo.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 772d0abf..e12e8bd8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,4 +15,7 @@
 	<color name="holoPrimary">#009688</color>
 	<color name="holoPrimaryDark">#00897b</color>
 	<color name="holoAccent">#64ffda</color>
+
+	<color name="lightBackground">#FFFBFE</color>
+	<color name="darkBackground">#1C1B1F</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5f8a00cc..39a5f815 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -183,10 +183,10 @@
 	</style>
 
 	<style name="Theme.DSub.Light.No_Color.Base" parent="Theme.DSub.Light.No_Actionbar">
-		<item name="actionbarThemeStyle">@style/ThemeOverlay.AppCompat.ActionBar</item>
+		<item name="actionbarThemeStyle">@style/Widget.Material3.ActionBar.Solid</item>
 		<item name="actionbarBackgroundColor">@android:color/transparent</item>
-		<item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
-		<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item>
+		<item name="actionbarTitleStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
+		<item name="actionbarSubtitleStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
 		<item name="android:spinnerItemStyle">@style/LightSpinnerItem</item>
 		<item name="drawerTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item>
 		<item name="drawerSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item>
-- 
cgit v1.2.3