浏览代码

Fix unusable categories when content is filtered out

Fixes #8675
Effectively reverts #8633, which introduces weird edge cases
arkon 2 年之前
父节点
当前提交
4f5270cb7d

+ 1 - 1
app/src/main/java/eu/kanade/presentation/library/components/LibraryContent.kt

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

+ 1 - 6
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt

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

+ 1 - 1
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt

@@ -149,7 +149,7 @@ object LibraryTab : Tab {
         ) { contentPadding ->
             when {
                 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
                     EmptyScreen(
                         textResource = R.string.information_empty_library,