修复书籍刷新限制不生效的问题
This commit is contained in:
1 file changed
+8
-22
@@ -76,9 +76,7 @@ import androidx.compose.material3.SnackbarHost
|
|||||||
import androidx.compose.material3.SnackbarHostState
|
import androidx.compose.material3.SnackbarHostState
|
||||||
import androidx.compose.material3.SnackbarResult
|
import androidx.compose.material3.SnackbarResult
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
|
import io.legado.app.ui.widget.components.AppPullToRefresh
|
||||||
import androidx.compose.material3.pulltorefresh.pullToRefresh
|
|
||||||
import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.derivedStateOf
|
import androidx.compose.runtime.derivedStateOf
|
||||||
@@ -724,7 +722,6 @@ fun BookshelfScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
) { paddingValues ->
|
) { paddingValues ->
|
||||||
val pullToRefreshState = rememberPullToRefreshState()
|
|
||||||
val currentGroup by remember {
|
val currentGroup by remember {
|
||||||
derivedStateOf {
|
derivedStateOf {
|
||||||
if (uiState.isSearch) {
|
if (uiState.isSearch) {
|
||||||
@@ -738,16 +735,12 @@ fun BookshelfScreen(
|
|||||||
derivedStateOf { (currentGroup?.enableRefresh ?: true) && !isEditMode }
|
derivedStateOf { (currentGroup?.enableRefresh ?: true) && !isEditMode }
|
||||||
}
|
}
|
||||||
|
|
||||||
Box(
|
Box(Modifier.fillMaxSize()) {
|
||||||
modifier = Modifier
|
AppPullToRefresh(
|
||||||
.fillMaxSize()
|
isRefreshing = uiState.isRefreshing,
|
||||||
.pullToRefresh(
|
onRefresh = { viewModel.refreshBooks(uiState.items) },
|
||||||
state = pullToRefreshState,
|
enabled = pullToRefreshEnabled,
|
||||||
isRefreshing = uiState.isRefreshing,
|
) {
|
||||||
onRefresh = { viewModel.refreshBooks(uiState.items) },
|
|
||||||
enabled = pullToRefreshEnabled
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
val transition = rememberTransition(
|
val transition = rememberTransition(
|
||||||
transitionState,
|
transitionState,
|
||||||
label = "FolderTransition"
|
label = "FolderTransition"
|
||||||
@@ -934,6 +927,7 @@ fun BookshelfScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
TopFloatingStickyItem(
|
TopFloatingStickyItem(
|
||||||
item = editStickySummary,
|
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(
|
AnimatedVisibility(
|
||||||
visible = isEditMode && selectedBookUrls.isNotEmpty(),
|
visible = isEditMode && selectedBookUrls.isNotEmpty(),
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|||||||
Reference in new issue
Block a user