From d7dfd5324442444862f2b7951ba94bea35dcfe3c Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 2 Jan 2023 10:29:01 +0800
Subject: [PATCH] Handle GalleryListScene SearchMode OnBackPressedCallback

---
 .../ehviewer/ui/scene/GalleryListScene.java   | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

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 764ee44db..d61c29f0c 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
@@ -38,6 +38,7 @@ import android.view.ViewPropertyAnimator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.PickVisualMediaRequest;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -214,6 +215,8 @@ public final class GalleryListScene extends SearchBarScene
     private FavouriteStatusRouter.Listener mFavouriteStatusRouterListener;
     private boolean mIsTopList = false;
 
+    private final SearchStateOnBackPressedCallback mCallback = new SearchStateOnBackPressedCallback();
+
     @Nullable
     private static String getSuitableTitleForUrlBuilder(
             Resources resources, ListUrlBuilder urlBuilder, boolean appName) {
@@ -527,6 +530,7 @@ public final class GalleryListScene extends SearchBarScene
     public View onCreateViewWithToolbar(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                                         @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.scene_gallery_list, container, false);
+        requireActivity().getOnBackPressedDispatcher().addCallback(mCallback);
 
         Context context = getContext();
         AssertUtils.assertNotNull(context);
@@ -618,6 +622,7 @@ public final class GalleryListScene extends SearchBarScene
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        mCallback.remove();
 
         if (null != mHelper) {
             mHelper.destroy();
@@ -782,25 +787,6 @@ public final class GalleryListScene extends SearchBarScene
         return mState == STATE_NORMAL && getStackIndex() == 0;
     }
 
-    @Override
-    public void onBackPressed() {
-        switch (mState) {
-            case STATE_NORMAL:
-                if (getStackIndex() == 0)
-                    requireActivity().moveTaskToBack(false);
-                else
-                    finish();
-                break;
-            case STATE_SIMPLE_SEARCH:
-            case STATE_SEARCH:
-                setState(STATE_NORMAL);
-                break;
-            case STATE_SEARCH_SHOW_LIST:
-                setState(STATE_SEARCH);
-                break;
-        }
-    }
-
     public void onItemClick(int position) {
         if (null == mHelper || null == mRecyclerView) {
             return;
@@ -1234,6 +1220,7 @@ public final class GalleryListScene extends SearchBarScene
     }
 
     public void onStateChange(int newState) {
+        mCallback.setEnabled(newState != STATE_NORMAL);
         if (newState == STATE_NORMAL || newState == STATE_SIMPLE_SEARCH) {
             setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, GravityCompat.START);
             setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, GravityCompat.END);
@@ -1706,4 +1693,19 @@ public final class GalleryListScene extends SearchBarScene
             mAdapter.notifyDataSetChanged();
         }
     }
+
+    class SearchStateOnBackPressedCallback extends OnBackPressedCallback {
+        public SearchStateOnBackPressedCallback() {
+            super(false);
+        }
+
+        @Override
+        public void handleOnBackPressed() {
+            switch (mState) {
+                case STATE_NORMAL -> throw new IllegalStateException("SearchStateOnBackPressedCallback should not be enabled on STATE_NORMAL");
+                case STATE_SIMPLE_SEARCH, STATE_SEARCH -> setState(STATE_NORMAL);
+                case STATE_SEARCH_SHOW_LIST -> setState(STATE_SEARCH);
+            }
+        }
+    }
 }
\ No newline at end of file