From d73579d25a66eb3ad8c63d68bf324aff235d3538 Mon Sep 17 00:00:00 2001 From: Jay Date: Sun, 17 May 2020 03:55:51 -0400 Subject: [PATCH] Fixes for showing single category --- .../eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 55f5168349..c64cf10016 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -431,6 +431,7 @@ class LibraryPresenter( val categories = db.getCategories().executeAsBlocking().toMutableList() val showCategories = !preferences.hideCategories().getOrDefault() var libraryManga = db.getLibraryMangas().executeAsBlocking() + val showAll = showAllCategories if (groupType <= BY_DEFAULT || !showCategories) { libraryManga = libraryManga.distinctBy { it.id } } @@ -465,12 +466,12 @@ class LibraryPresenter( categories.forEach { category -> val catId = category.id ?: return@forEach if (catId > 0 && !categorySet.contains(catId) && (catId !in categoriesHidden || - !showCategories)) { + !showAll)) { val headerItem = headerItems[catId] if (headerItem != null) items.add( LibraryItem(LibraryManga.createBlank(catId), headerItem) ) - } else if (catId in categoriesHidden && showCategories && categories.size > 1) { + } else if (catId in categoriesHidden && showAll && categories.size > 1) { val mangaToRemove = items.filter { it.manga.category == catId } val mergedTitle = mangaToRemove.joinToString("-") { it.manga.title + "-" + it.manga.author @@ -486,7 +487,7 @@ class LibraryPresenter( } categories.forEach { - it.isHidden = it.id in categoriesHidden && showCategories + it.isHidden = it.id in categoriesHidden && showAll && categories.size > 1 } this.categories = if (!showCategories) { arrayListOf(categoryAll)