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

optimize/rename function

Browse Source
This commit is contained in:
MM20 2025-07-19 18:35:33 +02:00
parent c0f69160b9
commit 154a81cafa
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -308,5 +308,6 @@ fabric.properties
.idea/deploymentTargetSelector.xml
.idea/copilot
.idea/other.xml
.idea/studiobot.xml
.kotlin

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

@ -250,10 +250,10 @@ class SearchVM : ViewModel(), KoinComponent {
previousResults = SearchResults(apps = apps)
searchActionResults.clear()
appResults.mergeWith(apps)
workAppResults.mergeWith(workApps)
privateSpaceAppResults.mergeWith(privateApps)
hiddenResults.mergeWith(hiddenItems)
appResults.updateItems(apps)
workAppResults.updateItems(workApps)
privateSpaceAppResults.updateItems(privateApps)
hiddenResults.updateItems(hiddenItems)
}
} else {
@ -273,19 +273,31 @@ class SearchVM : ViewModel(), KoinComponent {
workAppResults.clear()
privateSpaceAppResults.clear()
appResults.mergeWith(results.apps, hiddenKeys, query)
appShortcutResults.mergeWith(results.shortcuts, hiddenKeys, query)
fileResults.mergeWith(results.files, hiddenKeys, query)
appResults.updateItems(
results.apps
?.filterNot { hiddenKeys.contains(it.key) }
?.applyRanking(query)
)
appShortcutResults.updateItems(
results.shortcuts
?.filterNot { hiddenKeys.contains(it.key) }
?.applyRanking(query)
)
fileResults.updateItems(
results.files
?.filterNot { hiddenKeys.contains(it.key) }
?.applyRanking(query)
)
contactResults.mergeWith(
contactResults.updateItems(
results.contacts?.filterNot { hiddenKeys.contains(it.key) }
?.applyRanking(query)
)
calendarResults.mergeWith(
calendarResults.updateItems(
results.calendars?.filterNot { hiddenKeys.contains(it.key) }
?.applyRanking(query)
)
locationResults.mergeWith(
locationResults.updateItems(
results.locations?.filterNot { hiddenKeys.contains(it.key) }
?.let { locations ->
devicePoseProvider.lastCachedLocation?.let {
@ -298,17 +310,17 @@ class SearchVM : ViewModel(), KoinComponent {
} ?: locations.applyRanking(query)
}
)
articleResults.mergeWith(
articleResults.updateItems(
results.wikipedia?.applyRanking(query)
)
websiteResults.mergeWith(
websiteResults.updateItems(
results.websites?.applyRanking(query)
)
calculatorResults.mergeWith(results.calculators)
unitConverterResults.mergeWith(results.unitConverters)
calculatorResults.updateItems(results.calculators)
unitConverterResults.updateItems(results.unitConverters)
if (results.searchActions != null) {
searchActionResults.mergeWith(results.searchActions!!)
searchActionResults.updateItems(results.searchActions!!)
}
if (launchOnEnter.value) {
@ -429,24 +441,18 @@ class SearchVM : ViewModel(), KoinComponent {
return sorted.distinctBy { it.key }.toList()
}
private fun <T> SnapshotStateList<T>.mergeWith(newItems: List<T>?) {
val items = newItems ?: emptyList()
val diff = toSet() subtract items.toSet()
removeAll(diff)
for ((i, item) in items.withIndex()) {
if (i < size)
set(i, item)
else
add(item)
}
/**
* Merges a list of new items into the current SnapshotStateList.
* It removes items that are in the current list but not in the new list.
* Then, it updates existing items or adds new items from the new list.
*
* @param T The type of items in the list.
* @param newItems The list of new items to merge with. If null, an empty list is used.
*/
private fun <T> SnapshotStateList<T>.updateItems(newItems: List<T>?) {
clear()
addAll(newItems ?: emptyList())
}
private suspend fun <T : SavableSearchable> SnapshotStateList<T>.mergeWith(
newItems: List<T>?,
hiddenKeys: List<String>,
query: String
) = this.mergeWith((newItems ?: emptyList()).filterNot { hiddenKeys.contains(it.key) }
.applyRanking(query))
}