Fixes for categories index
This commit is contained in:
parent
b26749d61c
commit
af3a036e80
@ -142,7 +142,7 @@ object LibraryTab : Tab {
|
|||||||
onClickSelectAll = { screenModel.selectAll(screenModel.activeCategoryIndex) },
|
onClickSelectAll = { screenModel.selectAll(screenModel.activeCategoryIndex) },
|
||||||
onClickInvertSelection = { screenModel.invertSelection(screenModel.activeCategoryIndex) },
|
onClickInvertSelection = { screenModel.invertSelection(screenModel.activeCategoryIndex) },
|
||||||
onClickFilter = screenModel::showSettingsDialog,
|
onClickFilter = screenModel::showSettingsDialog,
|
||||||
onClickRefresh = { onClickRefresh(state.categories[screenModel.activeCategoryIndex]) },
|
onClickRefresh = { onClickRefresh(state.categories[screenModel.activeCategoryIndex.coerceAtMost(state.categories.lastIndex)]) },
|
||||||
onClickGlobalUpdate = { onClickRefresh(null) },
|
onClickGlobalUpdate = { onClickRefresh(null) },
|
||||||
onClickOpenRandomManga = {
|
onClickOpenRandomManga = {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
@ -242,7 +242,7 @@ object LibraryTab : Tab {
|
|||||||
navigator.push(GlobalSearchScreen(screenModel.state.value.searchQuery ?: ""))
|
navigator.push(GlobalSearchScreen(screenModel.state.value.searchQuery ?: ""))
|
||||||
},
|
},
|
||||||
getNumberOfMangaForCategory = { state.getMangaCountForCategory(it) },
|
getNumberOfMangaForCategory = { state.getMangaCountForCategory(it) },
|
||||||
getDisplayModeForPage = { state.categories[it].display },
|
getDisplayModeForPage = { state.categories[it.coerceAtMost(state.categories.lastIndex)].display },
|
||||||
getColumnsForOrientation = { screenModel.getColumnsPreferenceForCurrentOrientation(it) },
|
getColumnsForOrientation = { screenModel.getColumnsPreferenceForCurrentOrientation(it) },
|
||||||
) { state.getLibraryItemsByPage(it) }
|
) { state.getLibraryItemsByPage(it) }
|
||||||
}
|
}
|
||||||
@ -254,7 +254,7 @@ object LibraryTab : Tab {
|
|||||||
is LibraryScreenModel.Dialog.SettingsSheet -> LibrarySettingsDialog(
|
is LibraryScreenModel.Dialog.SettingsSheet -> LibrarySettingsDialog(
|
||||||
onDismissRequest = onDismissRequest,
|
onDismissRequest = onDismissRequest,
|
||||||
screenModel = settingsScreenModel,
|
screenModel = settingsScreenModel,
|
||||||
category = state.categories[screenModel.activeCategoryIndex],
|
category = state.categories[screenModel.activeCategoryIndex.coerceAtMost(state.categories.lastIndex)],
|
||||||
// SY -->
|
// SY -->
|
||||||
hasCategories = state.categories.fastAny { !it.isSystemCategory },
|
hasCategories = state.categories.fastAny { !it.isSystemCategory },
|
||||||
// SY <--
|
// SY <--
|
||||||
|
Loading…
x
Reference in New Issue
Block a user