prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use collator for tags sorting

Browse Source
This commit is contained in:
Koitharu
2022-05-18 11:27:07 +03:00
parent 473135bfc5
commit 21f7b7120a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt
View File

@@ -1,7 +1,6 @@
package org.koitharu.kotatsu.list.ui.filter package org.koitharu.kotatsu.list.ui.filter
import androidx.annotation.WorkerThread import androidx.annotation.WorkerThread
import java.util.*
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@@ -13,6 +12,8 @@ import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
import org.koitharu.kotatsu.parsers.model.MangaTag import org.koitharu.kotatsu.parsers.model.MangaTag
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
import org.koitharu.kotatsu.utils.ext.printStackTraceDebug import org.koitharu.kotatsu.utils.ext.printStackTraceDebug
import java.text.Collator
import java.util.*
class FilterCoordinator( class FilterCoordinator(
private val repository: RemoteMangaRepository, private val repository: RemoteMangaRepository,
@@ -158,7 +159,7 @@ class FilterCoordinator(
} }
private fun mergeTags(primary: Set<MangaTag>, secondary: Set<MangaTag>): Set<MangaTag> { private fun mergeTags(primary: Set<MangaTag>, secondary: Set<MangaTag>): Set<MangaTag> {
val result = TreeSet(TagTitleComparator()) val result = TreeSet(TagTitleComparator(repository.source.locale))
result.addAll(secondary) result.addAll(secondary)
result.addAll(primary) result.addAll(primary)
return result return result
@@ -191,11 +192,14 @@ class FilterCoordinator(
} }
} }
private class TagTitleComparator : Comparator<MangaTag> { private class TagTitleComparator(lc: String?) : Comparator<MangaTag> {
override fun compare(o1: MangaTag, o2: MangaTag) = compareValues( private val collator = lc?.let { Collator.getInstance(Locale(it)) }
o1.title.lowercase(),
o2.title.lowercase(), override fun compare(o1: MangaTag, o2: MangaTag): Int {
) val t1 = o1.title.lowercase()
val t2 = o2.title.lowercase()
return collator?.compare(t1, t2) ?: compareValues(t1, t2)
}
} }
} }