lets ignore accents at sorting apps for now
This commit is contained in:
parent
ed81323af6
commit
9f20afef1c
|
@ -92,7 +92,7 @@ class AllAppsFragment(context: Context, attributeSet: AttributeSet) : MyFragment
|
|||
}
|
||||
|
||||
val launchers = allApps.distinctBy { it.packageName } as ArrayList<AppLauncher>
|
||||
launchers.sortBy { it.title.toLowerCase() }
|
||||
launchers.sortBy { it.title.normalizeString().lowercase() }
|
||||
|
||||
val layoutManager = all_apps_grid.layoutManager as MyGridLayoutManager
|
||||
layoutManager.spanCount = context.getColumnCount()
|
||||
|
|
|
@ -2,8 +2,10 @@ package com.simplemobiletools.launcher.models
|
|||
|
||||
import android.graphics.drawable.Drawable
|
||||
import androidx.room.*
|
||||
import com.simplemobiletools.commons.extensions.normalizeString
|
||||
import com.simplemobiletools.commons.helpers.SORT_BY_TITLE
|
||||
import com.simplemobiletools.commons.helpers.SORT_DESCENDING
|
||||
import java.util.*
|
||||
|
||||
@Entity(tableName = "apps", indices = [(Index(value = ["package_name"], unique = true))])
|
||||
data class AppLauncher(
|
||||
|
@ -30,7 +32,7 @@ data class AppLauncher(
|
|||
|
||||
override fun compareTo(other: AppLauncher): Int {
|
||||
var result = when {
|
||||
sorting and SORT_BY_TITLE != 0 -> title.toLowerCase().compareTo(other.title.toLowerCase())
|
||||
sorting and SORT_BY_TITLE != 0 -> title.normalizeString().lowercase().compareTo(other.title.normalizeString().lowercase())
|
||||
else -> {
|
||||
if (order > 0 && other.order == 0) {
|
||||
-1
|
||||
|
@ -39,7 +41,7 @@ data class AppLauncher(
|
|||
} else if (order > 0 && other.order > 0) {
|
||||
order.compareTo(other.order)
|
||||
} else {
|
||||
title.toLowerCase().compareTo(other.title.toLowerCase())
|
||||
title.lowercase().compareTo(other.title.lowercase())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue