From aa40f08d1b74fb265a469d966c8b4c268fc67fe7 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 15 Jun 2020 22:45:28 -0400
Subject: [PATCH] Remove categories for multi language "single" sources
(cherry picked from commit ff5f13eafedcb48558ced648bcf5506e4a1c2e46)
---
.../details/ExtensionDetailsController.kt | 24 ++++++++++++-------
app/src/main/res/values/strings.xml | 1 -
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
index 58c5633af..285137a48 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
@@ -119,17 +119,14 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
preferenceScreen = screen
val isMultiSource = extension.sources.size > 1
+ val isMultiLangSingleSource = isMultiSource && extension.sources.map { it.name }.distinct().size == 1
with(screen) {
extension.sources
.groupBy { (it as CatalogueSource).lang }
.toSortedMap(compareBy { LocaleHelper.getSourceDisplayName(it, context) })
.forEach {
- preferenceCategory {
- if (isMultiSource) {
- title = LocaleHelper.getSourceDisplayName(it.key, context)
- }
-
+ val preferenceBlock = {
it.value
.sortedWith(compareBy({ !it.isEnabled() }, { it.name }))
.forEach { source ->
@@ -137,10 +134,9 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
val block: (@DSL SwitchPreferenceCompat).() -> Unit = {
key = getSourceKey(source.id)
- title = if (isMultiSource) {
- source.toString()
- } else {
- context.getString(R.string.enabled)
+ title = when {
+ isMultiSource && !isMultiLangSingleSource -> source.toString()
+ else -> LocaleHelper.getSourceDisplayName(it.key, context)
}
isPersistent = false
isChecked = source.isEnabled()
@@ -176,6 +172,16 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
}
}
}
+
+ if (isMultiSource && !isMultiLangSingleSource) {
+ preferenceCategory {
+ title = LocaleHelper.getSourceDisplayName(it.key, context)
+
+ preferenceBlock()
+ }
+ } else {
+ preferenceBlock()
+ }
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7156b180b..3e0c48a69 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -224,7 +224,6 @@
<string name="unofficial_extension_message">This extension is not from the official Tachiyomi extensions list.</string>
<string name="ext_version_info">Version: %1$s</string>
<string name="ext_language_info">Language: %1$s</string>
- <string name="enabled">Enabled</string>
<!-- Reader section -->
<string name="pref_fullscreen">Fullscreen</string>