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 2fb7f7a64..e7b5e25cd 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 @@ -112,7 +112,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : .forEach { val preferenceBlock = { it.value - .sortedWith(compareBy({ !it.isEnabled() }, { it.name })) + .sortedWith(compareBy({ !it.isEnabled() }, { it.name.toLowerCase() })) .forEach { source -> val sourcePrefs = mutableListOf() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt index 3ea5d6f8b..f56493c8c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt @@ -32,7 +32,7 @@ class MigrationSourcesPresenter( return library.map { it.source }.toSet() // SY --> .mapNotNull { if (it != LocalSource.ID && it != MERGED_SOURCE_ID) sourceManager.getOrStub(it) else null } - .sortedBy { it.name.toLowerCase(Locale.ROOT) } + .sortedBy { it.name.toLowerCase() } // SY <-- .map { SourceItem(it, header) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt index 272ceb55d..3599ebf28 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt @@ -217,7 +217,7 @@ class SourceFilterController : SettingsController() { } private fun sortedSources(sources: List?): List { - val sourceAlpha = sources.orEmpty().sortedBy { it.name } + val sourceAlpha = sources.orEmpty().sortedBy { it.name.toLowerCase() } return if (sorting == SourcesSort.Enabled) { val disabledSourceIds = preferences.disabledSources().get() sourceAlpha.filter { it.id.toString() !in disabledSourceIds } + diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt index 1d910b543..80ca24534 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt @@ -183,7 +183,7 @@ class SourcePresenter( return sourceManager.getVisibleCatalogueSources() .filter { it.lang in languages } .filterNot { it.id.toString() in disabledSourceIds } - .sortedBy { "(${it.lang}) ${it.name}" } + + .sortedBy { "(${it.lang}) ${it.name.toLowerCase()}" } + sourceManager.get(LocalSource.ID) as LocalSource } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt index 1c32cea94..0b5853db5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt @@ -109,7 +109,7 @@ open class GlobalSearchPresenter( return sourceManager.getVisibleCatalogueSources() .filter { it.lang in languages } .filterNot { it.id.toString() in disabledSourceIds } - .sortedWith(compareBy({ it.id.toString() !in pinnedSourceIds }, { "${it.name} (${it.lang})" })) + .sortedWith(compareBy({ it.id.toString() !in pinnedSourceIds }, { "${it.name.toLowerCase()} (${it.lang})" })) } private fun getSourcesToQuery(): List { @@ -190,7 +190,7 @@ open class GlobalSearchPresenter( { it.results.isNullOrEmpty() }, // Same as initial sort, i.e. pinned first then alphabetically { it.source.id.toString() !in pinnedSourceIds }, - { "${it.source.name} (${it.source.lang})" } + { "${it.source.name.toLowerCase()} (${it.source.lang})" } ) ) }