From f4ca3acbf6c67ed451b34e739b88cee7fe46ab2e Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 14 Dec 2022 14:32:40 +0800
Subject: [PATCH] Fix statusbar

---
 app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt        | 3 +++
 app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt  | 2 --
 app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java | 5 -----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
index 2078c14ed..165b9a92b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
@@ -30,6 +30,7 @@ import androidx.annotation.RequiresApi
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -69,6 +70,8 @@ abstract class EhActivity : AppCompatActivity() {
                 WindowInsetsHelper.LISTENER
             )
         super.onCreate(savedInstanceState)
+        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
+            (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
         window.decorView.post {
             val rootWindowInsets = window.decorView.rootWindowInsets
             if (rootWindowInsets != null && rootWindowInsets.systemWindowInsetBottom >= Resources.getSystem().displayMetrics.density * 40) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt
index b05ec9dc7..b232f1f42 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.kt
@@ -41,8 +41,6 @@ class SettingsActivity : EhActivity() {
         mFab = findViewById(R.id.fab)
         mAppbarLayout = findViewById(R.id.appbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
-            (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES) <= 0
         if (savedInstanceState == null) {
             supportFragmentManager
                 .beginTransaction()
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
index 0712283fb..5b2364f4c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
@@ -200,11 +200,6 @@ public abstract class BaseScene extends SceneFragment {
 
         // Hide soft ime
         hideSoftInput();
-
-        insetsController = getInsetsController();
-        if (insetsController != null) {
-            insetsController.setAppearanceLightStatusBars((requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) <= 0);
-        }
     }
 
     @Nullable