From 0f2fae886e09c00d516ddceb238f90947940f355 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Mon, 2 Jan 2023 12:28:01 +0800
Subject: [PATCH] fixup! Set toolbar text when exiting search view

---
 .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.java     | 3 +--
 .../main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt    | 2 +-
 2 files changed, 2 insertions(+), 3 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 2ce14ae73..a56413dfe 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
@@ -94,7 +94,6 @@ import com.hippo.ehviewer.widget.GalleryInfoContentHelper;
 import com.hippo.ehviewer.widget.SearchLayout;
 import com.hippo.scene.Announcer;
 import com.hippo.scene.SceneFragment;
-import com.hippo.scene.StageActivity;
 import com.hippo.util.ExceptionUtils;
 import com.hippo.view.BringOutTransition;
 import com.hippo.view.ViewTransition;
@@ -495,7 +494,7 @@ public final class GalleryListScene extends SearchBarScene
                 : R.id.search_normal_search);
 
         // Update search edit text
-        if (!TextUtils.isEmpty(keyword) && !mIsTopList) {
+        if (!mIsTopList) {
             if (mode == ListUrlBuilder.MODE_TAG) {
                 keyword = wrapTagKeyword(keyword);
             }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
index f83b03fa1..67d4fdd8c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt
@@ -117,6 +117,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
 
     @CallSuper
     open fun onSearchViewHidden() {
+        binding.toolbar.text = binding.searchview.text
         privLockModeStart?.let { setDrawerLockMode(it, GravityCompat.START) }
         privLockModeStart = null
         privLockModeEnd?.let { setDrawerLockMode(it, GravityCompat.END) }
@@ -367,7 +368,6 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     private val mSearchViewOnBackPressedCallback =
         object : OnBackPressedCallback(false), TransitionListener {
             override fun handleOnBackPressed() {
-                binding.searchview.let { binding.toolbar.text = it.text }
                 binding.searchview.hide()
             }