From 177045885c88cfd52a6ef949728345061b4f752f Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Fri, 15 May 2026 01:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=A6=E7=B1=8D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=99=90=E5=88=B6=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/main/bookshelf/BookshelfScreen.kt  | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
index 4d7bb130b..dc7972e02 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfScreen.kt
@@ -76,9 +76,7 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.Surface
-import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
-import androidx.compose.material3.pulltorefresh.pullToRefresh
-import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
+import io.legado.app.ui.widget.components.AppPullToRefresh
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -724,7 +722,6 @@ fun BookshelfScreen(
             )
         }
     ) { paddingValues ->
-        val pullToRefreshState = rememberPullToRefreshState()
         val currentGroup by remember {
             derivedStateOf {
                 if (uiState.isSearch) {
@@ -738,16 +735,12 @@ fun BookshelfScreen(
             derivedStateOf { (currentGroup?.enableRefresh ?: true) && !isEditMode }
         }
 
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .pullToRefresh(
-                    state = pullToRefreshState,
-                    isRefreshing = uiState.isRefreshing,
-                    onRefresh = { viewModel.refreshBooks(uiState.items) },
-                    enabled = pullToRefreshEnabled
-                )
-        ) {
+        Box(Modifier.fillMaxSize()) {
+            AppPullToRefresh(
+                isRefreshing = uiState.isRefreshing,
+                onRefresh = { viewModel.refreshBooks(uiState.items) },
+                enabled = pullToRefreshEnabled,
+            ) {
             val transition = rememberTransition(
                 transitionState, 
                 label = "FolderTransition"
@@ -934,6 +927,7 @@ fun BookshelfScreen(
                     }
                 }
             }
+            }
 
             TopFloatingStickyItem(
                 item = editStickySummary,
@@ -1036,14 +1030,6 @@ fun BookshelfScreen(
                 }
             }
 
-            PullToRefreshDefaults.LoadingIndicator(
-                state = pullToRefreshState,
-                isRefreshing = uiState.isRefreshing,
-                modifier = Modifier
-                    .align(Alignment.TopCenter)
-                    .padding(top = paddingValues.calculateTopPadding())
-            )
-
             AnimatedVisibility(
                 visible = isEditMode && selectedBookUrls.isNotEmpty(),
                 modifier = Modifier