jonas/EasyLauncher
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 6 Wiki Activity

Fix: Fixed App Searching.

Browse Source 
also fixed the app list from being empty if the search is empty.
This commit is contained in:
HeCodes2Much
2024-11-24 16:24:40 +00:00
parent d18310da6f
commit 1f0d4c8301
1 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt
View File

@@ -143,7 +143,7 @@ class DrawFragment : Fragment(),
val searchQuery = trimmedQuery.substringAfter("!") val searchQuery = trimmedQuery.substringAfter("!")
requireContext().searchCustomSearchEngine(preferenceHelper, searchQuery) requireContext().searchCustomSearchEngine(preferenceHelper, searchQuery)
} else { } else {
checkAppThenRun(trimmedQuery) searchApp(trimmedQuery, false)
return true // Exit the function return true // Exit the function
} }
} }
@@ -152,7 +152,7 @@ class DrawFragment : Fragment(),
} }
override fun onQueryTextChange(newText: String?): Boolean { override fun onQueryTextChange(newText: String?): Boolean {
searchApp(newText.toString()) searchApp(newText.toString(), true)
return true return true
} }
}) })
@@ -188,31 +188,7 @@ class DrawFragment : Fragment(),
} }
} }
private fun checkAppThenRun(query: String) { private fun searchApp(query: String, isSearching: Boolean) {
val searchQuery = "%$query%"
// Launch a coroutine tied to the lifecycle of the view
viewLifecycleOwner.lifecycleScope.launch {
// Use repeatOnLifecycle to manage the lifecycle state
repeatOnLifecycle(Lifecycle.State.CREATED) {
val trimmedQuery = searchQuery.trim()
viewModel.searchAppInfo().collect { searchResults ->
val numberOfItemsLeft = searchResults.size
val appResults = searchResults.firstOrNull()
if (numberOfItemsLeft == 0 && !requireContext().searchOnPlayStore(trimmedQuery)) {
requireContext().openSearch(trimmedQuery)
} else {
appResults?.let { appInfo ->
observeBioAuthCheck(appInfo)
}
drawAdapter.submitList(searchResults)
}
}
}
}
}
private fun searchApp(query: String) {
// Launch a coroutine tied to the lifecycle of the view // Launch a coroutine tied to the lifecycle of the view
viewLifecycleOwner.lifecycleScope.launch { viewLifecycleOwner.lifecycleScope.launch {
// Repeat the block when the lifecycle is at least CREATED // Repeat the block when the lifecycle is at least CREATED
@@ -260,16 +236,30 @@ class DrawFragment : Fragment(),
val numberOfItemsLeft = finalResults.size val numberOfItemsLeft = finalResults.size
val appResults = finalResults.firstOrNull() val appResults = finalResults.firstOrNull()
when (numberOfItemsLeft) { if (isSearching) {
1 -> { when (numberOfItemsLeft) {
appResults?.let { appInfo -> 1 -> {
if (preferenceHelper.automaticOpenApp) observeBioAuthCheck(appInfo) appResults?.let { appInfo ->
if (preferenceHelper.automaticOpenApp) observeBioAuthCheck(appInfo)
}
drawAdapter.submitList(finalResults)
} }
drawAdapter.submitList(finalResults)
}
else -> { else -> {
drawAdapter.submitList(finalResults) drawAdapter.submitList(finalResults)
}
}
if (trimmedQuery.isEmpty()) {
drawAdapter.submitList(searchResults)
}
} else {
if (numberOfItemsLeft == 0 && !requireContext().searchOnPlayStore(trimmedQuery)) {
requireContext().openSearch(trimmedQuery)
} else {
appResults?.let { appInfo ->
observeBioAuthCheck(appInfo)
}
drawAdapter.submitList(searchResults)
} }
} }
} }