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

Fix default category name being shown with empty library

Browse source
This commit is contained in:
arkon 2022-12-01 23:00:34 -05:00
parent 94d1b68598
commit 3a8b5e1b5e
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -747,10 +747,11 @@ class LibraryScreenModel(
val selectionMode = selection.isNotEmpty() val selectionMode = selection.isNotEmpty()
val categories = library.keys.toList() val categories = library.keys.toList()
private val onlyDefaultCategory = categories.size == 1 && categories[0].isSystemCategory
val libraryCount by lazy { val libraryCount by lazy {
library library.values
.flatMap { (_, v) -> v } .flatten()
.fastDistinctBy { it.libraryManga.manga.id } .fastDistinctBy { it.libraryManga.manga.id }
.size .size
} }
@ -764,7 +765,7 @@ class LibraryScreenModel(
} }
fun getMangaCountForCategory(category: Category): Int? { fun getMangaCountForCategory(category: Category): Int? {
return library[category]?.size?.takeIf { showMangaCount } return if (showMangaCount) library[category]?.size else null
} }
fun getToolbarTitle( fun getToolbarTitle(
@ -777,7 +778,11 @@ class LibraryScreenModel(
if (it.isSystemCategory) defaultCategoryTitle else it.name if (it.isSystemCategory) defaultCategoryTitle else it.name
} }
val title = if (showCategoryTabs && categories.size <= 1) categoryName else defaultTitle 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)