mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-15 13:37:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Option to hide NSFW extensions (closes #1312)

Browse Source
This commit is contained in:
arkon
2020-08-08 16:27:55 -04:00
parent 8bab1d9798
commit abaca6e676
8 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,20 +55,22 @@ open class ExtensionPresenter(
private fun toItems(tuple: ExtensionTuple): List<ExtensionItem> {
val context = Injekt.get<Application>()
val activeLangs = preferences.enabledLanguages().get()
val allowNsfw = preferences.allowNsfwSources()
val (installed, untrusted, available) = tuple
val items = mutableListOf<ExtensionItem>()
val updatesSorted = installed.filter { it.hasUpdate }.sortedBy { it.pkgName }
val installedSorted = installed.filter { !it.hasUpdate }.sortedWith(compareBy({ !it.isObsolete }, { it.pkgName }))
val updatesSorted = installed.filter { it.hasUpdate && (allowNsfw || !it.isNsfw) }.sortedBy { it.pkgName }
val installedSorted = installed.filter { !it.hasUpdate && (allowNsfw || !it.isNsfw) }.sortedWith(compareBy({ !it.isObsolete }, { it.pkgName }))
val untrustedSorted = untrusted.sortedBy { it.pkgName }
val availableSorted = available
// Filter out already installed extensions and disabled languages
.filter { avail ->
installed.none { it.pkgName == avail.pkgName } &&
untrusted.none { it.pkgName == avail.pkgName } &&
(avail.lang in activeLangs || avail.lang == "all")
(avail.lang in activeLangs || avail.lang == "all") &&
(allowNsfw || !avail.isNsfw)
}
.sortedBy { it.pkgName }

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

@@ -29,6 +29,11 @@ class SettingsBrowseController : SettingsController() {
true
}
}
switchPreference {
key = Keys.allowNsfwSources
titleRes = R.string.pref_allow_nsfw_sources
defaultValue = true
}
}
preferenceCategory {