From bd2cc750c09443160939be03d2bdb03b83155edf Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 10 Oct 2022 23:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=B7=BB=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E8=8C=83=E5=9B=B4=E5=8F=AF=E9=80=89=E6=8B=A9=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E4=B9=A6=E6=BA=90=E5=92=8C=E5=88=86=E7=BB=84,?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/search/SearchActivity.kt      | 18 ++++++-------
 .../main/res/layout/activity_book_search.xml  | 27 ++++++++++++++++++-
 app/src/main/res/values-es-rES/strings.xml    |  2 ++
 app/src/main/res/values-ja-rJP/strings.xml    |  2 ++
 app/src/main/res/values-pt-rBR/strings.xml    |  2 ++
 app/src/main/res/values-zh-rHK/strings.xml    |  2 ++
 app/src/main/res/values-zh-rTW/strings.xml    |  2 ++
 app/src/main/res/values-zh/strings.xml        |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 9 files changed, 49 insertions(+), 10 deletions(-)

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 36dbbc162..23c0e68cf 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
@@ -92,7 +92,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
-        binding.llHistory.setBackgroundColor(backgroundColor)
+        binding.llInputHelp.setBackgroundColor(backgroundColor)
         viewModel.searchFinishCallback = searchFinishCallback
         initRecyclerView()
         initSearchView()
@@ -158,7 +158,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                     viewModel.searchKey = ""
                     viewModel.search(it)
                 }
-                openOrCloseHistory(false)
+                visibleInputHelp(false)
                 return true
             }
 
@@ -172,10 +172,10 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
             if (!hasFocus && searchView.query.toString().trim().isEmpty()) {
                 finish()
             } else {
-                openOrCloseHistory(hasFocus)
+                visibleInputHelp(hasFocus)
             }
         }
-        openOrCloseHistory(true)
+        visibleInputHelp(true)
     }
 
     private fun initRecyclerView() {
@@ -275,14 +275,14 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     }
 
     /**
-     * 打开关闭历史界面
+     * 打开关闭输入帮助
      */
-    private fun openOrCloseHistory(open: Boolean) {
-        if (open) {
+    private fun visibleInputHelp(visible: Boolean) {
+        if (visible) {
             upHistory(searchView.query.toString())
-            binding.llHistory.visibility = VISIBLE
+            binding.llInputHelp.visibility = VISIBLE
         } else {
-            binding.llHistory.visibility = GONE
+            binding.llInputHelp.visibility = GONE
         }
     }
 
diff --git a/app/src/main/res/layout/activity_book_search.xml b/app/src/main/res/layout/activity_book_search.xml
index 4996fd3ff..78782048c 100644
--- a/app/src/main/res/layout/activity_book_search.xml
+++ b/app/src/main/res/layout/activity_book_search.xml
@@ -36,7 +36,7 @@
     </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
 
     <LinearLayout
-        android:id="@+id/ll_history"
+        android:id="@+id/ll_input_help"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:background="@color/background"
@@ -47,6 +47,31 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title_bar">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:padding="6dp"
+                android:text="@string/search_scope" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="6dp"
+                android:text="@string/toggle_search_scope" />
+
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_search_scope"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
         <TextView
             android:id="@+id/tv_book_show"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 0734a0c1b..07acc2489 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1040,4 +1040,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 469df7678..015cdda0a 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1043,4 +1043,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ac354405a..f53863ab0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1043,4 +1043,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index f4bd21a45..fc24d8dbc 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1040,4 +1040,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c06f9cdbb..c09d69e87 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1042,4 +1042,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index e40f77f8b..5ee9d0425 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1042,4 +1042,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1682f1312..56cfb2b9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1043,4 +1043,6 @@
     <string name="source_edit_text_max_line">源编辑框最大行数</string>
     <string name="source_edit_max_line_summary">%s,设置行数小于屏幕可显示的最大行数可以更方便的滑动到其他的字段进行编辑</string>
     <string name="restore_last_book_process">是否恢复到跳转前的阅读进度？</string>
+    <string name="search_scope">搜索范围</string>
+    <string name="toggle_search_scope">切换</string>
 </resources>