From d699d3899c492ccb8d37a9b213d7e1b940c0fb56 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 30 Oct 2021 12:42:59 -0400 Subject: [PATCH] Move unread chapters badge setting to General section (cherry picked from commit 709de81814c672aaf5042d1ff6c84c8360563681) --- .../eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt | 4 ++-- .../eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 +- .../eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt | 4 ++-- .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 4 ++-- .../kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt | 4 ++-- .../kanade/tachiyomi/ui/setting/SettingsGeneralController.kt | 5 +++++ .../kanade/tachiyomi/ui/setting/SettingsLibraryController.kt | 5 ----- .../widget/preference/ButtonToggleGroupPreference.kt | 4 ++++ app/src/main/res/values/strings.xml | 2 +- 9 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/preference/ButtonToggleGroupPreference.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index 7f6f9427a..938ea985a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -370,7 +370,7 @@ class LibraryUpdateService( val failedUpdates = CopyOnWriteArrayList>() val hasDownloads = AtomicBoolean(false) val loggedServices by lazy { trackManager.services.filter { it.isLogged } } - val currentUnreadUpdatesCount = preferences.libraryUnreadUpdatesCount().get() + val currentUnreadUpdatesCount = preferences.unreadUpdatesCount().get() withIOContext { mangaToUpdate.groupBy { it.source } @@ -436,7 +436,7 @@ class LibraryUpdateService( if (newUpdates.isNotEmpty()) { notifier.showUpdateNotifications(newUpdates) val newChapterCount = newUpdates.sumOf { it.second.size } - preferences.libraryUnreadUpdatesCount().set(currentUnreadUpdatesCount + newChapterCount) + preferences.unreadUpdatesCount().set(currentUnreadUpdatesCount + newChapterCount) if (hasDownloads.get()) { DownloadService.start(this) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 7ae4e3b2f..bfdb36ada 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -135,7 +135,7 @@ object PreferenceKeys { const val libraryUpdateRestriction = "library_update_restriction" - const val libraryUpdateShowTabBadge = "library_update_show_tab_badge" + const val showUpdatesNavBadge = "library_update_show_tab_badge" const val libraryUpdateCategories = "library_update_categories" const val libraryUpdateCategoriesExclude = "library_update_categories_exclude" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index f6e3d76d7..efd1d480e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -242,8 +242,8 @@ class PreferencesHelper(val context: Context) { fun libraryUpdateRestriction() = flowPrefs.getStringSet(Keys.libraryUpdateRestriction, setOf(ONLY_ON_WIFI)) - fun libraryUpdateShowTabBadge() = flowPrefs.getBoolean(Keys.libraryUpdateShowTabBadge, true) - fun libraryUnreadUpdatesCount() = flowPrefs.getInt("library_unread_updates_count", 0) + fun showUpdatesNavBadge() = flowPrefs.getBoolean(Keys.showUpdatesNavBadge, true) + fun unreadUpdatesCount() = flowPrefs.getInt("library_unread_updates_count", 0) fun libraryUpdateCategories() = flowPrefs.getStringSet(Keys.libraryUpdateCategories, emptySet()) fun libraryUpdateCategoriesExclude() = flowPrefs.getStringSet(Keys.libraryUpdateCategoriesExclude, emptySet()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index c92c4bf0c..60fbc0d59 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -278,7 +278,7 @@ class MainActivity : BaseViewBindingActivity() { } // SY --> - merge(preferences.libraryUpdateShowTabBadge().asFlow(), preferences.libraryUnreadUpdatesCount().asFlow()) + merge(preferences.showUpdatesNavBadge().asFlow(), preferences.unreadUpdatesCount().asFlow()) .onEach { setUnreadUpdatesBadge() } .launchIn(lifecycleScope) @@ -411,7 +411,7 @@ class MainActivity : BaseViewBindingActivity() { } private fun setUnreadUpdatesBadge() { - val updates = if (preferences.libraryUpdateShowTabBadge().get()) preferences.libraryUnreadUpdatesCount().get() else 0 + val updates = if (preferences.showUpdatesNavBadge().get()) preferences.unreadUpdatesCount().get() else 0 if (updates > 0) { nav.getOrCreateBadge(R.id.nav_updates).number = updates } else { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt index 96efe3db8..f0c9b5369 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt @@ -106,8 +106,8 @@ class UpdatesPresenter : BasePresenter() { setDownloadedChapters(list) chapters = list - //Set unread chapter count for bottom bar badge - preferences.libraryUnreadUpdatesCount().set(list.count { !it.read }) + // Set unread chapter count for bottom bar badge + preferences.unreadUpdatesCount().set(list.count { !it.read }) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index a5589fd1c..5c49a4764 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -34,6 +34,11 @@ class SettingsGeneralController : SettingsController() { defaultValue = "1" summary = "%s" } + switchPreference { + key = Keys.showUpdatesNavBadge + titleRes = R.string.pref_library_update_show_tab_badge + defaultValue = true + } switchPreference { key = Keys.confirmExit titleRes = R.string.pref_confirm_exit diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index 59387c90b..79f8f81b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -225,11 +225,6 @@ class SettingsLibraryController : SettingsController() { titleRes = R.string.pref_update_only_non_completed defaultValue = false } - switchPreference { - key = Keys.libraryUpdateShowTabBadge - titleRes = R.string.pref_library_update_show_tab_badge - defaultValue = true - } preference { key = Keys.libraryUpdateCategories titleRes = R.string.categories diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ButtonToggleGroupPreference.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ButtonToggleGroupPreference.kt new file mode 100644 index 000000000..08518579d --- /dev/null +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/preference/ButtonToggleGroupPreference.kt @@ -0,0 +1,4 @@ +package eu.kanade.tachiyomi.widget.preference + +class ButtonToggleGroupPreference { +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2775e4112..0bb336a75 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -223,7 +223,7 @@ Charging Restrictions: %s Only update ongoing manga - Show update count on bottom bar + Show unread count on Updates icon Automatically refresh metadata Check for new cover and details when updating library Automatically refresh trackers