From a4a18361c9d16f60e4089855b9ccd14c0a8d60ed Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Sun, 22 Sep 2024 21:38:32 +0700 Subject: [PATCH] enable hidden categories by default --- .../eu/kanade/presentation/library/LibrarySettingsDialog.kt | 4 ++-- .../eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt | 6 +++--- .../tachiyomi/domain/library/service/LibraryPreferences.kt | 2 +- i18n-kmk/src/commonMain/moko-resources/base/strings.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt index 2dd78a639..03e6cd155 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt @@ -337,8 +337,8 @@ private fun ColumnScope.DisplayPage( ) // KMK --> CheckboxItem( - label = stringResource(KMR.strings.action_hide_hidden_categories), - pref = screenModel.libraryPreferences.hideHiddenCategories(), + label = stringResource(KMR.strings.action_show_hidden_categories), + pref = screenModel.libraryPreferences.showHiddenCategories(), ) // KMK <-- CheckboxItem( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt index b4c454530..993806d82 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt @@ -594,11 +594,11 @@ class LibraryScreenModel( return combine( // KMK --> - libraryPreferences.hideHiddenCategories().changes(), + libraryPreferences.showHiddenCategories().changes(), // KMK <-- getCategories.subscribe(), libraryMangasFlow, - ) { hideHiddenCategories, categories, libraryManga -> + ) { showHiddenCategories, categories, libraryManga -> val displayCategories = if (libraryManga.isNotEmpty() && !libraryManga.containsKey(0)) { categories.fastFilterNot { it.isSystemCategory } } else { @@ -612,7 +612,7 @@ class LibraryScreenModel( // SY <-- displayCategories // KMK --> - .filterNot { hideHiddenCategories && it.hidden } + .filterNot { !showHiddenCategories && it.hidden } // KMK <-- .associateWith { libraryManga[it.id].orEmpty() } } diff --git a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt index 736eb420c..d8a16c78e 100644 --- a/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt +++ b/domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt @@ -153,7 +153,7 @@ class LibraryPreferences( fun categorizedDisplaySettings() = preferenceStore.getBoolean("categorized_display", false) // KMK --> - fun hideHiddenCategories() = preferenceStore.getBoolean("hide_hidden_categories", false) + fun showHiddenCategories() = preferenceStore.getBoolean("hide_hidden_categories", false) // KMK <-- fun updateCategories() = preferenceStore.getStringSet("library_update_categories", emptySet()) diff --git a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml index adb09ad96..1ed31eae2 100644 --- a/i18n-kmk/src/commonMain/moko-resources/base/strings.xml +++ b/i18n-kmk/src/commonMain/moko-resources/base/strings.xml @@ -12,7 +12,7 @@ Confirm Color Remove merged entries? Hide - Hide hidden categories + Show hidden categories