From 3fcb0cc6e07ae9e5989f8e39c92ea961c93e67f4 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 18 Dec 2022 11:38:51 +0100
Subject: [PATCH] Fix theme bar color

---
 .../android/activities/BaseActivity.java       |  9 ---------
 .../android/activities/BaseBarActivity.java    |  9 ---------
 .../activities/BaseTransparentActivity.java    |  9 ---------
 app/src/main/res/values-night/themes.xml       | 18 +++++++++++++++++-
 app/src/main/res/values/themes.xml             |  8 ++++++++
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
index e7ba4af89..2f2b870f8 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
@@ -19,11 +19,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.Window;
-import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -84,9 +81,6 @@ public class BaseActivity extends AppCompatActivity {
                             break;
                         case "BLACK":
                             setTheme(R.style.BlackAppTheme);
-                            Window window = getWindow();
-                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                            window.setStatusBarColor(Color.BLACK);
                             currentThemeId = R.style.BlackAppTheme;
                             break;
                         case "DRACULA":
@@ -121,9 +115,6 @@ public class BaseActivity extends AppCompatActivity {
                 case "BLACK":
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                     setTheme(R.style.BlackAppTheme);
-                    Window window = getWindow();
-                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                    window.setStatusBarColor(Color.BLACK);
                     currentThemeId = R.style.BlackAppTheme;
                     break;
                 case "DRACULA":
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java
index 2776d2ec2..e8f0111e4 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java
@@ -19,11 +19,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.Window;
-import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -76,9 +73,6 @@ public class BaseBarActivity extends AppCompatActivity {
                             setTheme(R.style.SolarizedAppThemeBar);
                             break;
                         case "BLACK":
-                            Window window = getWindow();
-                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                            window.setStatusBarColor(Color.BLACK);
                             setTheme(R.style.BlackAppThemeBar);
                             break;
                         case "DRACULA":
@@ -108,9 +102,6 @@ public class BaseBarActivity extends AppCompatActivity {
                     break;
                 case "BLACK":
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    Window window = getWindow();
-                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                    window.setStatusBarColor(Color.BLACK);
                     setTheme(R.style.BlackAppThemeBar);
                     break;
                 case "DRACULA":
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java
index 0f2668649..77f2df730 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java
@@ -19,11 +19,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.Window;
-import android.view.WindowManager;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
@@ -76,9 +73,6 @@ public class BaseTransparentActivity extends AppCompatActivity {
                             setTheme(R.style.TransparentSolarized);
                             break;
                         case "BLACK":
-                            Window window = getWindow();
-                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                            window.setStatusBarColor(Color.BLACK);
                             setTheme(R.style.TransparentBlack);
                             break;
                         case "DRACULA":
@@ -108,9 +102,6 @@ public class BaseTransparentActivity extends AppCompatActivity {
                     break;
                 case "BLACK":
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    Window window = getWindow();
-                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-                    window.setStatusBarColor(Color.BLACK);
                     setTheme(R.style.TransparentBlack);
                     break;
                 case "DRACULA":
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 90a50a649..62dd6db22 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -4,7 +4,7 @@
 
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
         <item name="linkColor">@color/md_theme_dark_primary</item>
-
+        <item name="android:statusBarColor">?android:colorBackground</item>
         <item name="colorPrimary">@color/md_theme_dark_primary</item>
         <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
         <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
@@ -23,6 +23,7 @@
         <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
         <item name="colorOutline">@color/md_theme_dark_outline</item>
         <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="statusBar">@color/md_theme_dark_background</item>
         <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
@@ -47,6 +48,7 @@
     </style>
 
     <style name="AppThemeBar" parent="Theme.Material3.Dark">
+        <item name="android:statusBarColor">?android:colorBackground</item>
         <item name="linkColor">@color/md_theme_dark_primary</item>
         <item name="colorPrimary">@color/md_theme_dark_primary</item>
         <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
@@ -66,6 +68,7 @@
         <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
         <item name="colorOutline">@color/md_theme_dark_outline</item>
         <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="statusBar">@color/md_theme_dark_background</item>
         <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
@@ -101,6 +104,7 @@
         <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
         <item name="colorOutline">@color/md_theme_dark_outline</item>
         <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="statusBar">@color/md_theme_dark_background</item>
         <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
@@ -138,6 +142,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/solarized_md_theme_dark_background</item>
+        <item name="statusBar">@color/solarized_md_theme_dark_background</item>
         <item name="colorOnBackground">@color/solarized_md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/solarized_md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/solarized_md_theme_dark_onSurface</item>
@@ -172,6 +177,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/solarized_md_theme_dark_background</item>
+        <item name="statusBar">@color/solarized_md_theme_dark_background</item>
         <item name="colorOnBackground">@color/solarized_md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/solarized_md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/solarized_md_theme_dark_onSurface</item>
@@ -185,6 +191,7 @@
 
     <style name="TransparentSolarized" parent="SolarizedAppThemeBar">
         <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="statusBar">@null</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowIsTranslucent">true</item>
@@ -214,6 +221,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/solarized_md_theme_dark_background</item>
+        <item name="statusBar">@color/solarized_md_theme_dark_background</item>
         <item name="colorOnBackground">@color/solarized_md_theme_dark_onBackground</item>
         <item name="colorSurface">@color/solarized_md_theme_dark_surface</item>
         <item name="colorOnSurface">@color/solarized_md_theme_dark_onSurface</item>
@@ -246,6 +254,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/black</item>
+        <item name="statusBar">@color/black</item>
         <item name="colorOnBackground">@color/white</item>
         <item name="colorSurface">@color/black</item>
         <item name="colorOnSurface">@color/white</item>
@@ -276,6 +285,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/black</item>
+        <item name="statusBar">@color/black</item>
         <item name="colorOnBackground">@color/white</item>
         <item name="colorSurface">@color/black</item>
         <item name="colorOnSurface">@color/white</item>
@@ -289,6 +299,7 @@
 
     <style name="TransparentBlack" parent="BlackAppThemeBar">
         <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="statusBar">@null</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowIsTranslucent">true</item>
@@ -314,6 +325,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/black</item>
+        <item name="statusBar">@color/black</item>
         <item name="colorOnBackground">@color/white</item>
         <item name="colorSurface">@color/black</item>
         <item name="colorOnSurface">@color/white</item>
@@ -347,6 +359,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/dracula_background</item>
+        <item name="statusBar">@color/dracula_background</item>
         <item name="colorOnBackground">@color/dracula_foreground</item>
         <item name="colorSurface">@color/dracula_background</item>
         <item name="colorOnSurface">@color/dracula_foreground</item>
@@ -378,6 +391,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/dracula_background</item>
+        <item name="statusBar">@color/dracula_background</item>
         <item name="colorOnBackground">@color/dracula_foreground</item>
         <item name="colorSurface">@color/dracula_background</item>
         <item name="colorOnSurface">@color/dracula_foreground</item>
@@ -391,6 +405,7 @@
 
     <style name="TransparentDracula" parent="DraculaAppThemeBar">
         <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="statusBar">@null</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowIsTranslucent">true</item>
@@ -416,6 +431,7 @@
         <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>
         <item name="android:colorBackground">@color/dracula_background</item>
+        <item name="statusBar">@color/dracula_background</item>
         <item name="colorOnBackground">@color/dracula_foreground</item>
         <item name="colorSurface">@color/dracula_background</item>
         <item name="colorOnSurface">@color/dracula_foreground</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 17c9d2c23..3235b5499 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <attr name="linkColor" type="color" />
+    <attr name="statusBar" type="color" />
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="linkColor">@color/md_theme_light_primary</item>
@@ -22,6 +23,7 @@
         <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
         <item name="colorOutline">@color/md_theme_light_outline</item>
         <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="statusBar">@color/md_theme_light_background</item>
         <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
         <item name="colorSurface">@color/md_theme_light_surface</item>
         <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
@@ -43,6 +45,7 @@
         </item>
         <item name="android:windowSharedElementExitTransition">@transition/change_image_transform
         </item>
+        <item name="android:statusBarColor">?android:colorBackground</item>
     </style>
 
     <style name="AppThemeBar" parent="Theme.Material3.Light">
@@ -65,6 +68,7 @@
         <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
         <item name="colorOutline">@color/md_theme_light_outline</item>
         <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="statusBar">@color/md_theme_light_background</item>
         <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
         <item name="colorSurface">@color/md_theme_light_surface</item>
         <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
@@ -77,6 +81,7 @@
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
         <item name="android:isLightTheme" tools:targetApi="q">true</item>
+        <item name="android:statusBarColor">?android:colorBackground</item>
     </style>
 
     <style name="Transparent" parent="AppThemeBar">
@@ -107,6 +112,7 @@
         <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
         <item name="colorOutline">@color/md_theme_light_outline</item>
         <item name="android:colorBackground">@color/md_theme_light_background</item>
+        <item name="statusBar">@color/md_theme_light_background</item>
         <item name="colorOnBackground">@color/md_theme_light_onBackground</item>
         <item name="colorSurface">@color/md_theme_light_surface</item>
         <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
@@ -143,6 +149,7 @@
         <item name="colorOnError">@color/solarized_md_theme_light_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_light_onErrorContainer</item>
         <item name="android:colorBackground">@color/solarized_md_theme_light_background</item>
+        <item name="statusBar">@color/solarized_md_theme_light_background</item>
         <item name="colorOnBackground">@color/solarized_md_theme_light_onBackground</item>
         <item name="colorSurface">@color/solarized_md_theme_light_surface</item>
         <item name="colorOnSurface">@color/solarized_md_theme_light_onSurface</item>
@@ -186,6 +193,7 @@
         <item name="colorOnError">@color/solarized_md_theme_light_onError</item>
         <item name="colorOnErrorContainer">@color/solarized_md_theme_light_onErrorContainer</item>
         <item name="android:colorBackground">@color/solarized_md_theme_light_background</item>
+        <item name="statusBar">@color/solarized_md_theme_light_background</item>
         <item name="colorOnBackground">@color/solarized_md_theme_light_onBackground</item>
         <item name="colorSurface">@color/solarized_md_theme_light_surface</item>
         <item name="colorOnSurface">@color/solarized_md_theme_light_onSurface</item>