Fix themes

app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java

@@ -19,7 +19,10 @@ package com.hippo.ehviewer.ui;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
+import android.view.Window;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
@@ -30,6 +33,7 @@ import com.hippo.ehviewer.EhApplication;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
 
+import rikka.core.res.ResourcesKt;
 import rikka.material.app.MaterialActivity;
 
 public abstract class EhActivity extends MaterialActivity {
@@ -98,4 +102,26 @@ public abstract class EhActivity extends MaterialActivity {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
         }
     }
+
+    @Override
+    public void onApplyTranslucentSystemBars() {
+        super.onApplyTranslucentSystemBars();
+        Window window = getWindow();
+        window.setStatusBarColor(Color.TRANSPARENT);
+
+        window.getDecorView().post(() -> {
+            if (window.getDecorView().getRootWindowInsets().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);
+                }
+            } else {
+                window.setNavigationBarColor(Color.TRANSPARENT);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    window.setNavigationBarContrastEnforced(true);
+                }
+            }
+        });
+
+    }
 }

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java

@@ -325,10 +325,6 @@ public final class MainActivity extends StageActivity
                 Settings.putTheme(theme);
             }
         });
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
-            findViewById(R.id.fragment_container).setFitsSystemWindows(true);
-        }
 
         updateProfile();
 

app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java

@@ -16,16 +16,11 @@
 
 package com.hippo.ehviewer.ui;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowCompat;
-import androidx.core.view.WindowInsetsCompat;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.hippo.ehviewer.R;
@@ -49,14 +44,6 @@ public final class SettingsActivity extends EhActivity {
                     .replace(R.id.fragment, new SettingsFragment())
                     .commitAllowingStateLoss();
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
-            ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.snackbar), (v, insets) -> {
-                Insets insets1 = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());
-                v.setPadding(insets1.left, insets1.top, insets1.right, 0);
-                return insets;
-            });
-        }
     }
 
     public void showTip(@StringRes int id, int length) {