Break out NSFW hiding/labeling into separate settings

(cherry picked from commit 5b09461ccf76963fef844d7550383205e8d33010)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -127,7 +127,9 @@ object PreferenceKeys {
 
     const val automaticExtUpdates = "automatic_ext_updates"
 
-    const val allowNsfwSource = "allow_nsfw_source"
+    const val showNsfwSource = "show_nsfw_source"
+    const val showNsfwExtension = "show_nsfw_extension"
+    const val labelNsfwExtension = "label_nsfw_extension"
 
     const val startScreen = "start_screen"
 

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt

@@ -44,12 +44,6 @@ object PreferenceValues {
         BOTH
     }
 
-    enum class NsfwAllowance {
-        ALLOWED,
-        PARTIAL,
-        BLOCKED
-    }
-
     // SY -->
     enum class GroupLibraryMode {
         GLOBAL,

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -10,7 +10,6 @@ import com.tfcporciuncula.flow.Preference
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferenceValues.DisplayMode
-import eu.kanade.tachiyomi.data.preference.PreferenceValues.NsfwAllowance
 import eu.kanade.tachiyomi.data.track.TrackService
 import eu.kanade.tachiyomi.data.track.anilist.Anilist
 import eu.kanade.tachiyomi.widget.ExtendedNavigationView
@@ -231,7 +230,9 @@ class PreferencesHelper(val context: Context) {
 
     fun automaticExtUpdates() = flowPrefs.getBoolean(Keys.automaticExtUpdates, true)
 
-    fun allowNsfwSource() = flowPrefs.getEnum(Keys.allowNsfwSource, NsfwAllowance.ALLOWED)
+    fun showNsfwSource() = flowPrefs.getBoolean(Keys.showNsfwSource, true)
+    fun showNsfwExtension() = flowPrefs.getBoolean(Keys.showNsfwExtension, true)
+    fun labelNsfwExtension() = prefs.getBoolean(Keys.labelNsfwExtension, true)
 
     fun extensionUpdatesCount() = flowPrefs.getInt("ext_updates_count", 0)
 

app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -6,7 +6,6 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import dalvik.system.PathClassLoader
 import eu.kanade.tachiyomi.annotations.Nsfw
-import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.LoadResult
@@ -26,8 +25,8 @@ import uy.kohesive.injekt.injectLazy
 internal object ExtensionLoader {
 
     private val preferences: PreferencesHelper by injectLazy()
-    private val allowNsfwSource by lazy {
+    private val loadNsfwSource by lazy {
-        preferences.allowNsfwSource().get()
+        preferences.showNsfwSource().get()
     }
 
     private const val EXTENSION_FEATURE = "tachiyomi.extension"
@@ -133,7 +132,7 @@ internal object ExtensionLoader {
         }
 
         val isNsfw = appInfo.metaData.getInt(METADATA_NSFW) == 1
-        if (allowNsfwSource == PreferenceValues.NsfwAllowance.BLOCKED && isNsfw) {
+        if (!loadNsfwSource && isNsfw) {
             return LoadResult.Error("NSFW extension $pkgName not allowed")
         }
 
@@ -218,7 +217,7 @@ internal object ExtensionLoader {
      * Checks whether a Source or SourceFactory is annotated with @Nsfw.
      */
     private fun isSourceNsfw(clazz: Any): Boolean {
-        if (allowNsfwSource == PreferenceValues.NsfwAllowance.ALLOWED) {
+        if (loadNsfwSource) {
             return false
         }
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt

@@ -5,11 +5,13 @@ import android.view.View
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.glide.GlideApp
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.ExtensionCardItemBinding
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
 import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.util.system.LocaleHelper
+import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
@@ -17,6 +19,10 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
 
     private val binding = ExtensionCardItemBinding.bind(view)
 
+    private val shouldLabelNsfw by lazy {
+        Injekt.get<PreferencesHelper>().labelNsfwExtension()
+    }
+
     init {
         binding.extButton.setOnClickListener {
             adapter.buttonClickListener.onButtonClick(bindingAdapterPosition)
@@ -36,7 +42,7 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
             // SY -->
             extension is Extension.Installed && extension.isRedundant -> itemView.context.getString(R.string.ext_redundant)
             // SY <--
-            extension.isNsfw -> itemView.context.getString(R.string.ext_nsfw_short)
+            extension.isNsfw && shouldLabelNsfw -> itemView.context.getString(R.string.ext_nsfw_short)
             else -> ""
         }.toUpperCase()
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt

@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.browse.extension
 import android.app.Application
 import android.os.Bundle
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.extension.model.Extension
@@ -56,7 +55,7 @@ open class ExtensionPresenter(
     private fun toItems(tuple: ExtensionTuple): List<ExtensionItem> {
         val context = Injekt.get<Application>()
         val activeLangs = preferences.enabledLanguages().get()
-        val showNsfwExtensions = preferences.allowNsfwSource().get() != PreferenceValues.NsfwAllowance.BLOCKED
+        val showNsfwExtensions = preferences.showNsfwExtension().get()
 
         val (installed, untrusted, available) = tuple
 

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt

@@ -2,14 +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.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryController
 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.onClick
 import eu.kanade.tachiyomi.util.preference.preference
@@ -17,6 +15,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory
 import eu.kanade.tachiyomi.util.preference.summaryRes
 import eu.kanade.tachiyomi.util.preference.switchPreference
 import eu.kanade.tachiyomi.util.preference.titleRes
+import kotlinx.coroutines.flow.launchIn
 import eu.kanade.tachiyomi.data.preference.PreferenceKeys as Keys
 
 class SettingsBrowseController : SettingsController() {
@@ -100,21 +99,22 @@ class SettingsBrowseController : SettingsController() {
         preferenceCategory {
             titleRes = R.string.pref_category_nsfw_content
 
-            listPreference {
+            switchPreference {
-                key = Keys.allowNsfwSource
+                key = Keys.showNsfwSource
-                titleRes = R.string.pref_allow_nsfw_sources
+                titleRes = R.string.pref_show_nsfw_source
-                entriesRes = arrayOf(
+                defaultValue = true
-                    R.string.pref_allow_nsfw_sources_allowed,
+            }
-                    R.string.pref_allow_nsfw_sources_allowed_multisource,
+            switchPreference {
-                    R.string.pref_allow_nsfw_sources_blocked
+                key = Keys.showNsfwExtension
-                )
+                titleRes = R.string.pref_show_nsfw_extension
-                entryValues = arrayOf(
+                defaultValue = true
-                    PreferenceValues.NsfwAllowance.ALLOWED.name,
+            }
-                    PreferenceValues.NsfwAllowance.PARTIAL.name,
+            switchPreference {
-                    PreferenceValues.NsfwAllowance.BLOCKED.name
+                key = Keys.labelNsfwExtension
-                )
+                titleRes = R.string.pref_label_nsfw_extension
-                defaultValue = PreferenceValues.NsfwAllowance.ALLOWED.name
+                defaultValue = true
-                summary = "%s"
+
+                preferences.showNsfwExtension().asImmediateFlow { isVisible = it }.launchIn(scope)
             }
 
             infoPreference(R.string.parental_controls_info)

app/src/main/res/values/strings.xml

@@ -174,10 +174,9 @@
     <string name="hide_notification_content">Hide notification content</string>
 
     <string name="pref_category_nsfw_content">18+ content</string>
-    <string name="pref_allow_nsfw_sources">18+ sources</string>
+    <string name="pref_show_nsfw_source">Show in sources list</string>
-    <string name="pref_allow_nsfw_sources_allowed">Show</string>
+    <string name="pref_show_nsfw_extension">Show in extensions list</string>
-    <string name="pref_allow_nsfw_sources_allowed_multisource">Hide in sources but show in extensions list</string>
+    <string name="pref_label_nsfw_extension">Label in extensions list</string>
-    <string name="pref_allow_nsfw_sources_blocked">Hide</string>
     <string name="parental_controls_info">This does not prevent unofficial or potentially incorrectly flagged extensions from surfacing 18+ content within the app.</string>
 
       <!-- Library section -->