Revert "Reuse collator instance"

This reverts commit 90de026e49. Close #915, Close #907
2024-07-03 22:41:50 +02:00
parent 0a90b5621e
commit 3331ea024b
3 changed files with 6 additions and 21 deletions
@@ -9,9 +9,9 @@ import android.os.Process
 import androidx.core.content.getSystemService
 import de.mm20.launcher2.ktx.romanize
 import de.mm20.launcher2.search.AppProfile
-import de.mm20.launcher2.text.Collator
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import java.text.Collator

 class AppShortcutConfigActivity(
    private val launcherActivityInfo: LauncherActivityInfo,
@@ -32,6 +32,7 @@ class AppShortcutConfigActivity(

        val label1 = label
        val label2 = other.label
-        return Collator.compare(label1.romanize(), label2.romanize())
+        return Collator.getInstance().apply { strength = Collator.SECONDARY }
+            .compare(label1.romanize(), label2.romanize())
    }
 }