yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove categories for multi language "single" sources

Browse Source
This commit is contained in:
arkon 2020-06-15 22:45:28 -04:00
parent 749b240897
commit ff5f13eafe
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
View File

@ -114,17 +114,14 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
preferenceScreen = screen preferenceScreen = screen
val isMultiSource = extension.sources.size > 1 val isMultiSource = extension.sources.size > 1
val isMultiLangSingleSource = isMultiSource && extension.sources.map { it.name }.distinct().size == 1
with(screen) { with(screen) {
extension.sources extension.sources
.groupBy { (it as CatalogueSource).lang } .groupBy { (it as CatalogueSource).lang }
.toSortedMap(compareBy { LocaleHelper.getSourceDisplayName(it, context) }) .toSortedMap(compareBy { LocaleHelper.getSourceDisplayName(it, context) })
.forEach { .forEach {
preferenceCategory { val preferenceBlock = {
if (isMultiSource) {
title = LocaleHelper.getSourceDisplayName(it.key, context)
}
it.value it.value
.sortedWith(compareBy({ !it.isEnabled() }, { it.name })) .sortedWith(compareBy({ !it.isEnabled() }, { it.name }))
.forEach { source -> .forEach { source ->
@ -132,10 +129,9 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
val block: (@DSL SwitchPreferenceCompat).() -> Unit = { val block: (@DSL SwitchPreferenceCompat).() -> Unit = {
key = getSourceKey(source.id) key = getSourceKey(source.id)
title = if (isMultiSource) { title = when {
source.toString() isMultiSource && !isMultiLangSingleSource -> source.toString()
} else { else -> LocaleHelper.getSourceDisplayName(it.key, context)
context.getString(R.string.enabled)
} }
isPersistent = false isPersistent = false
isChecked = source.isEnabled() isChecked = source.isEnabled()
@ -171,6 +167,16 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
} }
} }
} }
if (isMultiSource && !isMultiLangSingleSource) {
preferenceCategory {
title = LocaleHelper.getSourceDisplayName(it.key, context)
preferenceBlock()
}
} else {
preferenceBlock()
}
} }
} }

1
app/src/main/res/values/strings.xml
View File

@ -224,7 +224,6 @@
<string name="unofficial_extension_message">This extension is not from the official Tachiyomi extensions list.</string> <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_version_info">Version: %1$s</string>
<string name="ext_language_info">Language: %1$s</string> <string name="ext_language_info">Language: %1$s</string>
<string name="enabled">Enabled</string>
<!-- Reader section --> <!-- Reader section -->
<string name="pref_fullscreen">Fullscreen</string> <string name="pref_fullscreen">Fullscreen</string>