feat(search): Prioritize apps starting with query (#165)

jkuester · Dec 21, 2023 · ad30277 · ad30277
1 parent 381ac23
commit ad30277
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/app/src/main/java/com/sduduzog/slimlauncher/adapters/AppDrawerAdapter.kt b/app/src/main/java/com/sduduzog/slimlauncher/adapters/AppDrawerAdapter.kt
@@ -59,11 +59,27 @@ class AppDrawerAdapter(
         this.updateDisplayedApps()
     }
 
+    private fun onlyFirstStringStartsWith(first: String, second: String, query: String) : Boolean {
+        return first.startsWith(query, true) and !second.startsWith(query, true);
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private fun updateDisplayedApps() {
         filteredApps = apps.filter { app ->
             regex.replace(app.displayName, "").contains(filterQuery, ignoreCase = true)
-        }.toList()
+        }.toList().sortedWith(
+            Comparator<UnlauncherApp>{
+                a, b -> when {
+                    // if an app's name starts with the query prefer it
+                    onlyFirstStringStartsWith(a.displayName, b.displayName, filterQuery) -> -1
+                    onlyFirstStringStartsWith(b.displayName, a.displayName, filterQuery) -> 1
+                    // if both or none start with the query sort in normal oder
+                    a.displayName > b.displayName -> 1
+                    a.displayName < b.displayName -> -1
+                    else -> 0
+                }
+            }
+        )
         notifyDataSetChanged()
     }