From 2956ff08bd847aea806ff5725e0ee1097fac1ccc Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 19 May 2022 00:16:01 +0800
Subject: [PATCH] Fix black theme

---
 .../com/hippo/ehviewer/ui/EhActivity.java     | 23 +++++--------------
 app/src/main/res/values/themes.xml            |  3 +++
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
index 2eb4d82cc..f2b1d4fb8 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
@@ -47,10 +47,8 @@ public abstract class EhActivity extends MaterialActivity {
     }
 
     public static String getTheme(Context context) {
-        if (isBlackNightTheme()
-                && isNightMode(context.getResources().getConfiguration()))
+        if (isBlackNightTheme() && isNightMode(context.getResources().getConfiguration()))
             return THEME_BLACK;
-
         return THEME_DEFAULT;
     }
 
@@ -70,26 +68,21 @@ public abstract class EhActivity extends MaterialActivity {
 
     @StyleRes
     public int getThemeStyleRes(Context context) {
-        switch (getTheme(context)) {
-            case THEME_BLACK:
-                return R.style.ThemeOverlay_Black;
-            case THEME_DEFAULT:
-            default:
-                return R.style.ThemeOverlay;
+        if (THEME_BLACK.equals(getTheme(context))) {
+            return R.style.ThemeOverlay_Black;
         }
+        return R.style.ThemeOverlay;
     }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         ((EhApplication) getApplication()).registerActivity(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
         ((EhApplication) getApplication()).unregisterActivity(this);
     }
 
@@ -114,14 +107,10 @@ public abstract class EhActivity extends MaterialActivity {
             WindowInsets rootWindowInsets = window.getDecorView().getRootWindowInsets();
             if (rootWindowInsets != null && rootWindowInsets.getSystemWindowInsetBottom() >= Resources.getSystem().getDisplayMetrics().density * 40) {
                 window.setNavigationBarColor(ResourcesKt.resolveColor(getTheme(), android.R.attr.navigationBarColor) & 0x00ffffff | -0x20000000);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.setNavigationBarContrastEnforced(false);
-                }
+                window.setNavigationBarContrastEnforced(false);
             } else {
                 window.setNavigationBarColor(Color.TRANSPARENT);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.setNavigationBarContrastEnforced(true);
-                }
+                window.setNavigationBarContrastEnforced(true);
             }
         });
     }
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7a00ca64c..ca3a6565c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -41,6 +41,9 @@
     <style name="ThemeOverlay" />
 
     <style name="ThemeOverlay.Black">
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+        <item name="toolbarColor">@android:color/black</item>
         <item name="dividerColor">@color/divider_black</item>
         <item name="colorControlNormal">@color/primary_drawable_black</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_black</item>