From b68dc98ae0e7f88a47a4052a2c14185ae5cb111b Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 18:34:54 +0800
Subject: [PATCH] Fix drawer lock states saving

---
 app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt | 2 +-
 app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt | 2 +-
 .../main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
index 249067181..9a1a3fb39 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.kt
@@ -364,8 +364,8 @@ class DownloadsScene :
     }
 
     override fun onSearchViewExpanded() {
+        hideActionFab(true)
         super.onSearchViewExpanded()
-        if (tracker.isInCustomChoice) tracker.clearSelection()
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
index 3e8120a2c..487ea9c73 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.kt
@@ -478,8 +478,8 @@ class FavoritesScene : SearchBarScene() {
     }
 
     override fun onSearchViewExpanded() {
-        super.onSearchViewExpanded()
         hideActionFab(true)
+        super.onSearchViewExpanded()
     }
 
     override fun onSearchViewHidden() {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
index 9a546cc76..c0fe7ab77 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
@@ -687,12 +687,12 @@ class GalleryListScene : SearchBarScene() {
     }
 
     override fun onSearchViewExpanded() {
-        super.onSearchViewExpanded()
         if (mState == State.NORMAL) {
             hideActionFab(true)
         } else {
             hideSearchFab(true)
         }
+        super.onSearchViewExpanded()
     }
 
     override fun onSearchViewHidden() {