|
@@ -80,13 +80,12 @@ class AppDrawerAdapter(
|
|
|
return first.startsWith(query, true) and !second.startsWith(query, true);
|
|
return first.startsWith(query, true) and !second.startsWith(query, true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @SuppressLint("NotifyDataSetChanged")
|
|
|
|
|
fun setAppFilter(query: String = "") {
|
|
fun setAppFilter(query: String = "") {
|
|
|
val filterQuery = regex.replace(query, "")
|
|
val filterQuery = regex.replace(query, "")
|
|
|
updateFilteredApps(filterQuery)
|
|
updateFilteredApps(filterQuery)
|
|
|
- notifyDataSetChanged()
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @SuppressLint("NotifyDataSetChanged")
|
|
|
private fun updateFilteredApps(filterQuery: String = "") {
|
|
private fun updateFilteredApps(filterQuery: String = "") {
|
|
|
val showDrawerHeadings = corePreferencesRepo.get().showDrawerHeadings
|
|
val showDrawerHeadings = corePreferencesRepo.get().showDrawerHeadings
|
|
|
val searchAllApps = corePreferencesRepo.get().searchAllAppsInDrawer && filterQuery != ""
|
|
val searchAllApps = corePreferencesRepo.get().searchAllAppsInDrawer && filterQuery != ""
|
|
@@ -97,7 +96,7 @@ class AppDrawerAdapter(
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
val includeHeadings = !showDrawerHeadings || filterQuery != ""
|
|
val includeHeadings = !showDrawerHeadings || filterQuery != ""
|
|
|
- filteredApps = when (includeHeadings) {
|
|
|
|
|
|
|
+ val updatedApps = when (includeHeadings) {
|
|
|
true -> displayableApps
|
|
true -> displayableApps
|
|
|
.sortedWith { a, b ->
|
|
.sortedWith { a, b ->
|
|
|
when {
|
|
when {
|
|
@@ -122,6 +121,10 @@ class AppDrawerAdapter(
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if (updatedApps != filteredApps) {
|
|
|
|
|
+ filteredApps = updatedApps
|
|
|
|
|
+ notifyDataSetChanged()
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
val searchBoxListener: TextWatcher = object : TextWatcher {
|
|
val searchBoxListener: TextWatcher = object : TextWatcher {
|