From 498f69869a8c415091858deffd5ec41ccb353cd9 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 28 May 2020 15:19:13 -0400 Subject: [PATCH] Add watched list default state to E/ExHentai --- .../eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 ++ .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 2 ++ .../java/eu/kanade/tachiyomi/source/online/all/EHentai.kt | 8 ++++++-- .../kanade/tachiyomi/ui/setting/SettingsEhController.kt | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) 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 ec45c5473..8352cf80c 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 @@ -242,4 +242,6 @@ object PreferenceKeys { const val eh_use_new_manga_interface = "eh_use_new_manga_interface" const val eh_use_auto_webtoon = "eh_use_auto_webtoon" + + const val eh_watched_list_default_state = "eh_watched_list_default_state" } 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 8929521ce..b8f97e14b 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 @@ -348,4 +348,6 @@ class PreferencesHelper(val context: Context) { fun eh_useNewMangaInterface() = flowPrefs.getBoolean(Keys.eh_use_new_manga_interface, true) fun eh_useAutoWebtoon() = flowPrefs.getBoolean(Keys.eh_use_auto_webtoon, true) + + fun eh_watchedListDefaultState() = flowPrefs.getBoolean(Keys.eh_watched_list_default_state, false) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 3869838d3..c5963c82b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -622,13 +622,17 @@ class EHentai( // Filters override fun getFilterList() = FilterList( - Watched(), + if (prefs.eh_watchedListDefaultState().get()) { + Watched(isEnabled = true) + } else { + Watched(isEnabled = false) + }, GenreGroup(), AdvancedGroup(), ReverseFilter() ) - class Watched : Filter.CheckBox("Watched List"), UriFilter { + class Watched(val isEnabled: Boolean) : Filter.CheckBox("Watched List", isEnabled), UriFilter { override fun addToUri(builder: Uri.Builder) { if (state) { builder.appendPath("watched") diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt index ffe4e2895..743ff1ab6 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt @@ -229,6 +229,13 @@ class SettingsEhController : SettingsController() { } }.dependency = PreferenceKeys.eh_enableExHentai + switchPreference { + defaultValue = false + key = PreferenceKeys.eh_watched_list_default_state + title = "Watched List Filter Default State" + summary = "When browsing ExHentai/E-Hentai should the watched list filter be enabled by default" + } + switchPreference { defaultValue = true key = "secure_exh"