github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix unusable categories when content is filtered out

Browse source 
Fixes #8675
Effectively reverts #8633, which introduces weird edge cases
This commit is contained in:
arkon 2022-12-04 13:39:53 -05:00
parent 719d427956
commit 4f5270cb7d
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt
View file

@ -61,7 +61,7 @@ fun LibraryContent(
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
var isRefreshing by remember(pagerState.currentPage) { mutableStateOf(false) } var isRefreshing by remember(pagerState.currentPage) { mutableStateOf(false) }
if (!isLibraryEmpty && showPageTabs && categories.size > 1) { if (showPageTabs && categories.size > 1) {
LibraryTabs( LibraryTabs(
categories = categories, categories = categories,
currentPageIndex = pagerState.currentPage, currentPageIndex = pagerState.currentPage,

7
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
View file

@ -777,12 +777,7 @@ class LibraryScreenModel(
val categoryName = category.let { val categoryName = category.let {
if (it.isSystemCategory) defaultCategoryTitle else it.name if (it.isSystemCategory) defaultCategoryTitle else it.name
} }
val title = if (showCategoryTabs) defaultTitle else categoryName
val title = when {
showCategoryTabs && categories.size != 1 -> defaultTitle
libraryCount > 0 && !onlyDefaultCategory -> categoryName
else -> defaultTitle
}
val count = when { val count = when {
!showMangaCount -> null !showMangaCount -> null
!showCategoryTabs -> getMangaCountForCategory(category) !showCategoryTabs -> getMangaCountForCategory(category)

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
View file

@ -149,7 +149,7 @@ object LibraryTab : Tab {
) { contentPadding -> ) { contentPadding ->
when { when {
state.isLoading -> LoadingScreen(modifier = Modifier.padding(contentPadding)) state.isLoading -> LoadingScreen(modifier = Modifier.padding(contentPadding))
state.searchQuery.isNullOrEmpty() && state.libraryCount == 0 -> { state.searchQuery.isNullOrEmpty() && !state.hasActiveFilters && state.libraryCount == 0 -> {
val handler = LocalUriHandler.current val handler = LocalUriHandler.current
EmptyScreen( EmptyScreen(
textResource = R.string.information_empty_library, textResource = R.string.information_empty_library,