From a857e2db56771e3b5509dbd276c77f648290c45f Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Wed, 17 Mar 2021 22:14:52 +0800
Subject: [PATCH] Fix bugs

---
 app/src/main/AndroidManifest.xml              |  6 +++---
 .../com/hippo/ehviewer/ui/EhActivity.java     |  1 -
 .../com/hippo/ehviewer/ui/MainActivity.java   |  6 +++---
 .../ui/fragment/BasePreferenceFragment.java   | 21 -------------------
 .../ehviewer/ui/scene/GalleryListScene.java   |  2 --
 .../java/com/hippo/scene/StageLayout.java     |  6 ------
 app/src/main/res/layout/activity_main.xml     |  2 ++
 .../main/res/layout/activity_preference.xml   |  3 +--
 app/src/main/res/values/themes.xml            | 19 +----------------
 9 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 99eda94f7..9a61f4cba 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,8 +48,8 @@
             android:name="com.hippo.ehviewer.ui.MainActivity"
             android:configChanges="screenSize"
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme.Main"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -145,7 +145,7 @@
             android:name="com.hippo.ehviewer.ui.SettingsActivity"
             android:configChanges="screenSize"
             android:label="@string/settings"
-            android:theme="@style/AppTheme.Toolbar" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
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 805a91a16..80349b7e7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
@@ -122,6 +122,5 @@ public abstract class EhActivity extends MaterialActivity {
                 }
             }
         });
-
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 4c1b9ba90..1cacde983 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -41,7 +41,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.view.WindowCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.google.android.material.navigation.NavigationView;
@@ -574,8 +573,9 @@ public final class MainActivity extends StageActivity
      * If activity is running, show snack bar, otherwise show toast
      */
     public void showTip(CharSequence message, int length) {
-        if (null != mDrawerLayout) {
-            Snackbar.make(mDrawerLayout, message,
+        View view = findViewById(R.id.snackbar);
+        if (null != view) {
+            Snackbar.make(view, message,
                     length == BaseScene.LENGTH_LONG ? Snackbar.LENGTH_LONG : Snackbar.LENGTH_SHORT).show();
         } else {
             Toast.makeText(this, message,
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java
index 9ba1517c0..fc77fc22c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java
@@ -1,17 +1,11 @@
 package com.hippo.ehviewer.ui.fragment;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.preference.Preference;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -60,21 +54,6 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat
         ((SettingsActivity) requireActivity()).showTip(message, length);
     }
 
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            RecyclerView recyclerView = getListView();
-            recyclerView.setClipToPadding(false);
-            recyclerView.setClipChildren(false);
-            ViewCompat.setOnApplyWindowInsetsListener(recyclerView, (v, insets) -> {
-                Insets insets1 = insets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());
-                v.setPadding(0, 0, 0, insets1.bottom);
-                return WindowInsetsCompat.CONSUMED;
-            });
-        }
-    }
-
     @Override
     public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
         RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index d6268530b..398b02d7b 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -125,8 +125,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import rikka.recyclerview.RecyclerViewKt;
-
 @SuppressLint("RtlHardcoded")
 public final class GalleryListScene extends BaseScene
         implements SearchBar.Helper, SearchBar.OnStateChangeListener, FastScroller.OnDragHandlerListener,
diff --git a/app/src/main/java/com/hippo/scene/StageLayout.java b/app/src/main/java/com/hippo/scene/StageLayout.java
index f750ccf19..624cf8535 100644
--- a/app/src/main/java/com/hippo/scene/StageLayout.java
+++ b/app/src/main/java/com/hippo/scene/StageLayout.java
@@ -21,7 +21,6 @@ import android.graphics.Canvas;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowInsets;
 import android.widget.FrameLayout;
 
 import com.hippo.ehviewer.R;
@@ -154,9 +153,4 @@ public class StageLayout extends FrameLayout {
 
         return super.drawChild(canvas, child, drawingTime);
     }
-
-    @Override
-    public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        return insets;
-    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index edc9ad99d..fda36e61b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,8 +16,10 @@
 
 <com.hippo.widget.SafeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/snackbar"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clipChildren="false"
     app:consumeSystemWindowsInsets="start|end"
     app:edgeToEdge="true"
     app:fitSystemWindowsInsets="start|end">
diff --git a/app/src/main/res/layout/activity_preference.xml b/app/src/main/res/layout/activity_preference.xml
index dfc4a9c4c..635c04846 100644
--- a/app/src/main/res/layout/activity_preference.xml
+++ b/app/src/main/res/layout/activity_preference.xml
@@ -28,7 +28,6 @@
         android:id="@+id/fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipChildren="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:clipChildren="false" />
 
 </com.hippo.widget.SafeCoordinatorLayout>
\ 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 37235bb4b..00eab93b0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -112,15 +112,6 @@
 
     <style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
 
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar.Translucent">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
     <!-- =============== -->
     <!-- Base Black Theme -->
     <!-- =============== -->
@@ -132,7 +123,6 @@
 
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
-        <item name="colorBackgroundFloating">@android:color/black</item>
 
         <item name="android:textColorPrimary">@color/primary_text_material_black</item>
 
@@ -159,14 +149,7 @@
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
-    <!-- ========= -->
-    <!-- App Theme -->
-    <!-- ========= -->
-    <style name="AppTheme.Main" parent="AppTheme.NoActionBar.Translucent" />
-
-    <style name="AppTheme.Toolbar" parent="AppTheme.NoActionBar" />
-
-    <style name="AppTheme.Gallery" parent="AppTheme.NoActionBar">
+    <style name="AppTheme.Gallery" parent="AppTheme">
         <item name="gallerySliderBackgroundColor">@color/gallery_slider_background</item>
     </style>