lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix favorites sorting

Browse Source
This commit is contained in:
MM20 2022-09-11 18:44:55 +02:00
parent 7b86677fc2
commit aae9762a8e
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt
View File

@ -118,6 +118,7 @@ class SearchVM : ViewModel(), KoinComponent {
appRepository appRepository
.search(query) .search(query)
.withCustomLabels() .withCustomLabels()
.sorted()
.collectLatest { apps -> .collectLatest { apps ->
hiddenItemKeys.collectLatest { hiddenKeys -> hiddenItemKeys.collectLatest { hiddenKeys ->
val results = apps.partition { !hiddenKeys.contains(it.key) } val results = apps.partition { !hiddenKeys.contains(it.key) }
@ -132,6 +133,7 @@ class SearchVM : ViewModel(), KoinComponent {
contactRepository contactRepository
.search(query) .search(query)
.withCustomLabels() .withCustomLabels()
.sorted()
.collectLatest { contacts -> .collectLatest { contacts ->
hiddenItemKeys.collectLatest { hiddenKeys -> hiddenItemKeys.collectLatest { hiddenKeys ->
val results = contacts.partition { !hiddenKeys.contains(it.key) } val results = contacts.partition { !hiddenKeys.contains(it.key) }
@ -146,6 +148,7 @@ class SearchVM : ViewModel(), KoinComponent {
calendarRepository calendarRepository
.search(query) .search(query)
.withCustomLabels() .withCustomLabels()
.sorted()
.collectLatest { events -> .collectLatest { events ->
hiddenItemKeys.collectLatest { hiddenKeys -> hiddenItemKeys.collectLatest { hiddenKeys ->
val results = events.partition { !hiddenKeys.contains(it.key) } val results = events.partition { !hiddenKeys.contains(it.key) }
@ -180,6 +183,7 @@ class SearchVM : ViewModel(), KoinComponent {
fileRepository fileRepository
.search(query) .search(query)
.withCustomLabels() .withCustomLabels()
.sorted()
.collectLatest { files -> .collectLatest { files ->
hiddenItemKeys.collectLatest { hiddenKeys -> hiddenItemKeys.collectLatest { hiddenKeys ->
val results = files.partition { !hiddenKeys.contains(it.key) } val results = files.partition { !hiddenKeys.contains(it.key) }
@ -199,6 +203,7 @@ class SearchVM : ViewModel(), KoinComponent {
appShortcutRepository appShortcutRepository
.search(query) .search(query)
.withCustomLabels() .withCustomLabels()
.sorted()
.collectLatest { shortcuts -> .collectLatest { shortcuts ->
hiddenItemKeys.collectLatest { hidden -> hiddenItemKeys.collectLatest { hidden ->
appShortcutResults.postValue(shortcuts.filter { !hidden.contains(it.key) }) appShortcutResults.postValue(shortcuts.filter { !hidden.contains(it.key) })
@ -303,11 +308,13 @@ class SearchVM : ViewModel(), KoinComponent {
val customLabel = labels.find { it.key == item.key } val customLabel = labels.find { it.key == item.key }
item.labelOverride = customLabel?.label item.labelOverride = customLabel?.label
} }
send(items.sorted()) send(items)
} }
} }
} }
private fun <T: Searchable> Flow<List<T>>.sorted(): Flow<List<T>> = this.map { it.sorted() }
} }
private data class HiddenItemResults( private data class HiddenItemResults(