From 2d99fc0cbc2891d8916e5fc9cab828fcf99cdc65 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 17 Oct 2022 11:05:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/ui/book/search/SearchActivity.kt    | 7 +++++++
 app/src/main/res/menu/book_search.xml                      | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index fc94136ff..e8e20e379 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
@@ -10,6 +10,7 @@ import android.view.View.VISIBLE
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -126,6 +127,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                     searchView.setQuery(it, true)
                 }
             }
+            R.id.menu_search_scope -> alertSearchScope()
             R.id.menu_source_manage -> startActivity<BookSourceActivity>()
             R.id.menu_log -> showDialogFragment(AppLogDialog())
         }
@@ -387,6 +389,11 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         searchScope.save()
         viewModel.searchScope.update(searchScope.toString())
         searchScopeAdapter.setItems(searchScope.displayNames)
+        if (!binding.llInputHelp.isVisible) {
+            searchView.query?.toString()?.trim()?.let {
+                searchView.setQuery(it, true)
+            }
+        }
     }
 
     private fun alertSearchScope() {
diff --git a/app/src/main/res/menu/book_search.xml b/app/src/main/res/menu/book_search.xml
index b042b51db..a310be071 100644
--- a/app/src/main/res/menu/book_search.xml
+++ b/app/src/main/res/menu/book_search.xml
@@ -3,6 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="AlwaysShowAction">
 
+    <item
+        android:id="@+id/menu_search_scope"
+        android:title="@string/search_scope"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_precision_search"
         android:checkable="true"