From d512800d8eeb98b8b6df17a56711bdbce360088f Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Thu, 13 Nov 2025 18:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=BB=9A=E5=8A=A8=E6=9D=A1=20#300?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bookshelf/books/BookshelfFragment2.kt     | 13 ++++++++++++
 .../main/res/layout/fragment_bookshelf2.xml   | 21 +++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt
index aa67042fa..eaebbd030 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BookshelfFragment2.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.ViewConfiguration
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.SearchView
 import androidx.core.app.ActivityOptionsCompat
@@ -144,6 +145,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
     }
 
     private fun initRecyclerView() {
+        upFastScrollerBar()
         binding.refreshLayout.setOnRefreshListener {
             val books = booksAdapter.getBookItems()
             val refreshList = if (AppConfig.bookshelfRefreshingLimit > 0) {
@@ -188,6 +190,17 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
         }
     }
 
+    private fun upFastScrollerBar() {
+        val showBookshelfFastScroller = AppConfig.showBookshelfFastScroller
+        binding.rvBookshelf.setFastScrollEnabled(showBookshelfFastScroller)
+        if (showBookshelfFastScroller) {
+            binding.rvBookshelf.scrollBarSize = 0
+        } else {
+            binding.rvBookshelf.scrollBarSize =
+                ViewConfiguration.get(requireContext()).scaledScrollBarSize
+        }
+    }
+
     override fun upGroup(data: List<BookGroup>) {
         if (data != bookGroups) {
             bookGroups = data
diff --git a/app/src/main/res/layout/fragment_bookshelf2.xml b/app/src/main/res/layout/fragment_bookshelf2.xml
index 063f22d0f..a1ba64c1c 100644
--- a/app/src/main/res/layout/fragment_bookshelf2.xml
+++ b/app/src/main/res/layout/fragment_bookshelf2.xml
@@ -39,18 +39,27 @@
         android:id="@+id/refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingHorizontal="8dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_bookshelf"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            tools:listitem="@layout/item_bookshelf_list" />
+            android:layout_height="match_parent">
 
+            <io.legado.app.ui.widget.recycler.scroller.FastScrollRecyclerView
+                android:id="@+id/rv_bookshelf"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+            <io.legado.app.ui.widget.recycler.scroller.FastScroller
+                android:id="@+id/fast_scroller"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="end" />
+
+        </FrameLayout>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+
     <TextView
         android:id="@+id/tv_empty_msg"
         android:layout_width="wrap_content"