yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 17:59:51 +02:00
Code Issues Projects Releases Wiki Activity

Fix sorting Apps by title in the child app list

Browse source
This commit is contained in:
Jonas Lochmann 2021-03-22 01:00:00 +01:00
parent 7050ba4780
commit 605d61bb3d
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/io/timelimit/android/ui/manage/child/apps/ChildAppsModel.kt
View file

@ -26,6 +26,7 @@ import io.timelimit.android.livedata.map
import io.timelimit.android.livedata.switchMap
import io.timelimit.android.logic.DefaultAppLogic
import io.timelimit.android.ui.view.AppFilterView
import java.util.*
class ChildAppsModel(application: Application): AndroidViewModel(application) {
private val logic = DefaultAppLogic.with(application)
@ -86,7 +87,7 @@ class ChildAppsModel(application: Application): AndroidViewModel(application) {
} else {
val sortedApps = apps
.distinctBy { it.packageName }
.sortedBy { it.title.toLowerCase() }
.sortedBy { it.title.toLowerCase(Locale.getDefault()) }
result.addAll(
sortedApps.map { app ->
@ -120,6 +121,7 @@ class ChildAppsModel(application: Application): AndroidViewModel(application) {
filteredChildApps
.distinctBy { it.packageName }
.sortedBy { it.title.toLowerCase(Locale.getDefault()) }
.map { app ->
val categoryId = categoryAppByPackageName[app.packageName]?.categoryId
val category = categoryById[categoryId]