From e7df61815c26c85f2ce9e5ff31fb88f8464a4e5f Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Fri, 15 Sep 2023 15:17:49 +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

---
 .../main/java/io/legado/app/constant/PreferKey.kt   |  1 +
 .../java/io/legado/app/help/config/AppConfig.kt     |  6 ++++++
 .../app/ui/main/bookshelf/BaseBookshelfFragment.kt  |  4 ++++
 .../ui/main/bookshelf/style1/books/BooksFragment.kt |  4 +++-
 app/src/main/res/layout/dialog_bookshelf_config.xml | 13 +++++++++++--
 app/src/main/res/layout/fragment_books.xml          |  1 -
 app/src/main/res/values-es-rES/strings.xml          |  1 +
 app/src/main/res/values-ja-rJP/strings.xml          |  1 +
 app/src/main/res/values-pt-rBR/strings.xml          |  1 +
 app/src/main/res/values-vi/strings.xml              |  1 +
 app/src/main/res/values-zh-rHK/strings.xml          |  1 +
 app/src/main/res/values-zh-rTW/strings.xml          |  1 +
 app/src/main/res/values-zh/strings.xml              |  1 +
 app/src/main/res/values/strings.xml                 |  1 +
 14 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt
index a94d433e9..e16ac6879 100644
--- a/app/src/main/java/io/legado/app/constant/PreferKey.kt
+++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt
@@ -137,6 +137,7 @@ object PreferKey {
     const val batchChangeSourceDelay = "batchChangeSourceDelay"
     const val openBookInfoByClickTitle = "openBookInfoByClickTitle"
     const val defaultHomePage = "defaultHomePage"
+    const val showBookshelfFastScroller = "showBookshelfFastScroller"
 
     const val cPrimary = "colorPrimary"
     const val cAccent = "colorAccent"
diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
index 804d53794..10c98ef02 100644
--- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt
+++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
@@ -403,6 +403,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
             appCtx.putPrefBoolean(PreferKey.openBookInfoByClickTitle, value)
         }
 
+    var showBookshelfFastScroller: Boolean
+        get() = appCtx.getPrefBoolean(PreferKey.showBookshelfFastScroller, false)
+        set(value) {
+            appCtx.putPrefBoolean(PreferKey.showBookshelfFastScroller, value)
+        }
+
     var contentSelectSpeakMod: Int
         get() = appCtx.getPrefInt(PreferKey.contentSelectSpeakMod)
         set(value) {
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 9fe85cf18..d29230bae 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -168,6 +168,10 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
                         AppConfig.showWaitUpCount = swShowWaitUpBooks.isChecked
                         activityViewModel.postUpBooksLiveData(true)
                     }
+                    if (AppConfig.showBookshelfFastScroller != swShowBookshelfFastScroller.isChecked) {
+                        AppConfig.showBookshelfFastScroller = swShowBookshelfFastScroller.isChecked
+                        postEvent(EventBus.BOOKSHELF_REFRESH, "")
+                    }
                     if (bookshelfSort != rgSort.getCheckedIndex()) {
                         AppConfig.bookshelfSort = rgSort.getCheckedIndex()
                         upSort()
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
index dbdc9c8ab..81d65ef17 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksFragment.kt
@@ -86,6 +86,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
 
     private fun initRecyclerView() {
         binding.rvBookshelf.setEdgeEffectColor(primaryColor)
+        binding.rvBookshelf.setFastScrollEnabled(AppConfig.showBookshelfFastScroller)
         binding.refreshLayout.setColorSchemeColors(accentColor)
         binding.refreshLayout.setOnRefreshListener {
             binding.refreshLayout.isRefreshing = false
@@ -275,6 +276,7 @@ class BooksFragment() : BaseFragment(R.layout.fragment_books),
         observeEvent<String>(EventBus.BOOKSHELF_REFRESH) {
             booksAdapter.notifyDataSetChanged()
             startLastUpdateTimeJob()
+            binding.rvBookshelf.setFastScrollEnabled(AppConfig.showBookshelfFastScroller)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/dialog_bookshelf_config.xml b/app/src/main/res/layout/dialog_bookshelf_config.xml
index 53d3ced61..a417e1290 100644
--- a/app/src/main/res/layout/dialog_bookshelf_config.xml
+++ b/app/src/main/res/layout/dialog_bookshelf_config.xml
@@ -58,13 +58,22 @@
         app:layout_constraintTop_toBottomOf="@+id/sw_show_last_update_time"
         tools:ignore="TouchTargetSizeCheck" />
 
+    <io.legado.app.lib.theme.view.ThemeSwitch
+        android:id="@+id/sw_show_bookshelf_fast_scroller"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="6dp"
+        android:text="@string/show_bookshelf_fast_scroller"
+        app:layout_constraintTop_toBottomOf="@+id/sw_show_wait_up_books"
+        tools:ignore="TouchTargetSizeCheck" />
+
     <LinearLayout
         android:id="@+id/ll_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintRight_toLeftOf="@+id/ll_sort"
-        app:layout_constraintTop_toBottomOf="@+id/sw_show_wait_up_books"
+        app:layout_constraintTop_toBottomOf="@+id/sw_show_bookshelf_fast_scroller"
         app:layout_constraintLeft_toLeftOf="parent">
 
         <io.legado.app.ui.widget.text.AccentTextView
@@ -119,7 +128,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         app:layout_constraintLeft_toRightOf="@+id/ll_layout"
-        app:layout_constraintTop_toBottomOf="@id/sw_show_wait_up_books"
+        app:layout_constraintTop_toBottomOf="@id/sw_show_bookshelf_fast_scroller"
         app:layout_constraintRight_toRightOf="parent">
 
         <io.legado.app.ui.widget.text.AccentTextView
diff --git a/app/src/main/res/layout/fragment_books.xml b/app/src/main/res/layout/fragment_books.xml
index 573c82c70..e17632442 100644
--- a/app/src/main/res/layout/fragment_books.xml
+++ b/app/src/main/res/layout/fragment_books.xml
@@ -13,7 +13,6 @@
             android:id="@+id/rv_bookshelf"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scrollbars="none"
             tools:listitem="@layout/item_bookshelf_list" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index d525779a1..4dc5ffab7 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1131,4 +1131,5 @@
     <string name="default_home_page">默认主页</string>
     <string name="use_lib_archive">Use LibArchive</string>
     <string name="pref_use_lib_archive_summary">Using libarchive to extract files, it supports extracting RAR5.</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</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 081095035..52712cf10 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1134,4 +1134,5 @@
     <string name="default_home_page">默认主页</string>
     <string name="use_lib_archive">Use LibArchive</string>
     <string name="pref_use_lib_archive_summary">Using libarchive to extract files, it supports extracting RAR5.</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</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 1d70d5cd9..70c79d84a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1134,4 +1134,5 @@
     <string name="default_home_page">默认主页</string>
     <string name="use_lib_archive">Use LibArchive</string>
     <string name="pref_use_lib_archive_summary">Using libarchive to extract files, it supports extracting RAR5.</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2454a780d..d713759b5 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1129,4 +1129,5 @@ Còn </string>
     <string name="export_wait">等待导出</string>
     <string name="use_lib_archive">Use LibArchive</string>
     <string name="pref_use_lib_archive_summary">Using libarchive to extract files, it supports extracting RAR5.</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 2fab1ce4b..b0c5a3b01 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1130,4 +1130,5 @@
     <string name="export_wait">等待导出</string>
     <string name="use_lib_archive">使用LibArchive</string>
     <string name="pref_use_lib_archive_summary">使用libarchive解壓檔案，支持解壓RAR5。</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</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 638162291..bd3c7c431 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1132,4 +1132,5 @@
     <string name="export_wait">等待导出</string>
     <string name="use_lib_archive">使用LibArchive</string>
     <string name="pref_use_lib_archive_summary">使用libarchive解壓檔案，支持解壓RAR5。</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 879bf5f66..f74d00a26 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1132,4 +1132,5 @@
     <string name="export_wait">等待导出</string>
     <string name="use_lib_archive">使用LibArchive</string>
     <string name="pref_use_lib_archive_summary">使用libarchive解压文件，支持解压RAR5。</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d4b2a000b..3b65dd984 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1134,4 +1134,5 @@
     <string name="default_home_page">默认主页</string>
     <string name="use_lib_archive">Use LibArchive</string>
     <string name="pref_use_lib_archive_summary">Using libarchive to extract files, it supports extracting RAR5.</string>
+    <string name="show_bookshelf_fast_scroller">显示快速滚动条</string>
 </resources>