修复书架页筛选失效和图标错位问题
This commit is contained in:
1 file changed
+4
-11
@@ -846,9 +846,9 @@ fun BookshelfScreen(
|
|||||||
val group = uiState.groups.getOrNull(pageIndex)
|
val group = uiState.groups.getOrNull(pageIndex)
|
||||||
if (group != null) {
|
if (group != null) {
|
||||||
val isSelectedGroup = group.groupId == uiState.selectedGroupId
|
val isSelectedGroup = group.groupId == uiState.selectedGroupId
|
||||||
val books = uiState.allGroupBooks[group.groupId]
|
val books = if (isSelectedGroup) uiState.items
|
||||||
?: if (isSelectedGroup) uiState.items
|
else uiState.allGroupBooks[group.groupId]
|
||||||
else persistentListOf()
|
?: persistentListOf()
|
||||||
val canReorderBooks = isEditMode &&
|
val canReorderBooks = isEditMode &&
|
||||||
!uiState.isSearch &&
|
!uiState.isSearch &&
|
||||||
(group.bookSort.takeIf { it >= 0 }
|
(group.bookSort.takeIf { it >= 0 }
|
||||||
@@ -1052,17 +1052,10 @@ private fun BookshelfTopBar(
|
|||||||
query = uiState.searchKey,
|
query = uiState.searchKey,
|
||||||
onQueryChange = onSearchQueryChange,
|
onQueryChange = onSearchQueryChange,
|
||||||
onSearch = onSearchSubmit,
|
onSearch = onSearchSubmit,
|
||||||
placeholder = stringResource(R.string.input_search_key),
|
|
||||||
leadingIcon = {
|
|
||||||
AppIcon(
|
|
||||||
imageVector = AppIcons.Search,
|
|
||||||
contentDescription = null
|
|
||||||
)
|
|
||||||
},
|
|
||||||
trailingIcon = {
|
trailingIcon = {
|
||||||
if (uiState.searchKey.isNotEmpty()) {
|
if (uiState.searchKey.isNotEmpty()) {
|
||||||
SmallPlainButton(
|
SmallPlainButton(
|
||||||
modifier = Modifier.padding(start = 12.dp),
|
modifier = Modifier.padding(horizontal = 4.dp),
|
||||||
onClick = onClearSearch,
|
onClick = onClearSearch,
|
||||||
icon = AppIcons.Close,
|
icon = AppIcons.Close,
|
||||||
contentDescription = stringResource(R.string.clear)
|
contentDescription = stringResource(R.string.clear)
|
||||||
|
|||||||
Reference in new issue
Block a user