Resolve #703

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt

@@ -401,12 +401,7 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
         val colorID = theme.resolveColor(com.google.android.material.R.attr.colorOnSurface)
         mActionFabDrawable = AddDeleteDrawable(context, colorID)
         binding.fabLayout.primaryFab!!.setImageDrawable(mActionFabDrawable)
-        mSearchFab!!.setOnClickListener {
-            if (STATE_NORMAL != mState) {
-                onApplySearch()
-                hideSoftInput()
-            }
-        }
+        mSearchFab!!.setOnClickListener { onApplySearch() }
 
         // Update list url builder
         onUpdateUrlBuilder()
@@ -701,7 +696,7 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
 
     override fun onSearchViewExpanded() {
         super.onSearchViewExpanded()
-        selectSearchFab(true)
+        if (mState == STATE_NORMAL) selectSearchFab(true)
     }
 
     override fun onSearchViewHidden() {
@@ -1279,11 +1274,11 @@ class GalleryListScene : SearchBarScene(), OnDragHandlerListener, SearchLayout.H
             return if (null != mHelper) mHelper!!.size() else 0
         }
 
-        public override fun onItemClick(view: View, position: Int) {
+        override fun onItemClick(view: View, position: Int) {
             this@GalleryListScene.onItemClick(position)
         }
 
-        public override fun onItemLongClick(view: View, position: Int): Boolean {
+        override fun onItemLongClick(view: View, position: Int): Boolean {
             return this@GalleryListScene.onItemLongClick(position)
         }
 

app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt

@@ -53,8 +53,6 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
             updateSuggestions()
         }
         binding.searchview.editText.setOnEditorActionListener { _, _, _ ->
-            binding.toolbar.text = binding.searchview.text
-            binding.searchview.hide()
             onApplySearch()
             true
         }
@@ -157,6 +155,8 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     }
 
     fun onApplySearch() {
+        binding.toolbar.text = binding.searchview.text
+        binding.searchview.hide()
         val query = binding.toolbar.text.toString().trim()
         if (!mAllowEmptySearch && query.isEmpty()) {
             return