From 0b5dec9bab1a1ffdf61d72cace4c43784fff924f Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 12 Dec 2020 11:32:55 -0500 Subject: [PATCH] Revert "Hide incomplete NSFW source labelling settings" This reverts commit a3b1690d38bc66767cc71c23b961d488795957fe. --- .../ui/setting/SettingsBrowseController.kt | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt index 1e747bf08..9a1524558 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt @@ -2,8 +2,12 @@ package eu.kanade.tachiyomi.ui.setting import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.R +import eu.kanade.tachiyomi.data.preference.PreferenceValues import eu.kanade.tachiyomi.extension.ExtensionUpdateJob import eu.kanade.tachiyomi.util.preference.defaultValue +import eu.kanade.tachiyomi.util.preference.entriesRes +import eu.kanade.tachiyomi.util.preference.infoPreference +import eu.kanade.tachiyomi.util.preference.listPreference import eu.kanade.tachiyomi.util.preference.onChange import eu.kanade.tachiyomi.util.preference.preferenceCategory import eu.kanade.tachiyomi.util.preference.switchPreference @@ -41,27 +45,27 @@ class SettingsBrowseController : SettingsController() { } } - // preferenceCategory { - // titleRes = R.string.pref_category_nsfw_content - // - // listPreference { - // key = Keys.allowNsfwSource - // titleRes = R.string.pref_allow_nsfw_sources - // entriesRes = arrayOf( - // R.string.pref_allow_nsfw_sources_allowed, - // R.string.pref_allow_nsfw_sources_allowed_multisource, - // R.string.pref_allow_nsfw_sources_blocked - // ) - // entryValues = arrayOf( - // PreferenceValues.NsfwAllowance.ALLOWED.name, - // PreferenceValues.NsfwAllowance.PARTIAL.name, - // PreferenceValues.NsfwAllowance.BLOCKED.name - // ) - // defaultValue = PreferenceValues.NsfwAllowance.ALLOWED.name - // summary = "%s" - // } - // - // infoPreference(R.string.parental_controls_info) - // } + preferenceCategory { + titleRes = R.string.pref_category_nsfw_content + + listPreference { + key = Keys.allowNsfwSource + titleRes = R.string.pref_allow_nsfw_sources + entriesRes = arrayOf( + R.string.pref_allow_nsfw_sources_allowed, + R.string.pref_allow_nsfw_sources_allowed_multisource, + R.string.pref_allow_nsfw_sources_blocked + ) + entryValues = arrayOf( + PreferenceValues.NsfwAllowance.ALLOWED.name, + PreferenceValues.NsfwAllowance.PARTIAL.name, + PreferenceValues.NsfwAllowance.BLOCKED.name + ) + defaultValue = PreferenceValues.NsfwAllowance.ALLOWED.name + summary = "%s" + } + + infoPreference(R.string.parental_controls_info) + } } }