jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-06-28 03:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add subsequent & fuzzy search

Browse source
This commit is contained in:
Jan Koll 2025-06-25 16:13:15 +02:00
parent b9792e9942
commit 59885133f8
1 changed files with 59 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

61
app/src/main/java/de/jrpie/android/launcher/apps/AppFilter.kt
View file

@ -10,6 +10,7 @@ import de.jrpie.android.launcher.actions.ShortcutAction
import de.jrpie.android.launcher.preferences.LauncherPreferences
import java.util.Locale
import kotlin.text.Regex.Companion.escape
import kotlin.text.iterator
class AppFilter(
var context: Context,
@ -70,9 +71,31 @@ class AppFilter(
val itemLabel: String = normalize(item.getCustomLabel(context))
if (itemLabel.startsWith(normalizedQuery)) {
r.add(item)
} else if (itemLabel.contains(normalizedQuery)) {
appsSecondary.add(item);
}
// todo: maybe re-enable this with preferences? I think it's a bit clunky with the "fuzzy"-search though
/*else if (itemLabel.contains(normalizedQuery)) {
appsSecondary.add(item)
}*/
}
if (appsSecondary.size != 1) {
val subsequentResult: MutableList<AbstractDetailedAppInfo> = mutableListOf();
val occurrences: MutableMap<AbstractDetailedAppInfo, Int> = mutableMapOf();
for (item in apps) {
if (appsSecondary.contains(item)) continue;
val itemLabel: String = normalize(item.getCustomLabel(context))
if (isSubsequent(itemLabel, normalizedQuery)) {
subsequentResult.add(item)
}
occurrences[item] = countOccurrences(itemLabel, normalizedQuery)
}
if (subsequentResult.isNotEmpty()) {
appsSecondary.addAll(subsequentResult)
} else {
val maxOccurrences = occurrences.values.maxOrNull()
if (maxOccurrences == 0) return apps
val result = occurrences.filter { it.value == maxOccurrences }
appsSecondary.addAll(result.keys)
}
}
r.addAll(appsSecondary)
@ -81,6 +104,40 @@ class AppFilter(
}
}
/**
* Returns true if `search` is a subsequence of `text`.
* A subsequence means all characters in `search` appear in `text`
* in the same order, but not necessarily contiguously.
*/
fun isSubsequent(text: String, search: String): Boolean {
var i = 0
for (char in text) {
if (char != search[i]) continue
i++;
if (i == search.length) {
return true
}
}
return false
}
/**
* Returns the amount of characters from `search` that occur inside `text`.
* If `text` contains the same character multiple times, it is only counted
* as often as it occurs in `search`.
*/
fun countOccurrences(text: String, search: String): Int {
val foundCharacters = mutableListOf<Char>()
var mutText = text
for (char in search) {
if (mutText.contains(char)) {
foundCharacters.add(char)
mutText = mutText.replaceFirst(char.toString(), "")
}
}
return foundCharacters.size
}
companion object {
enum class AppSetVisibility(
val predicate: (set: Set<AbstractAppInfo>, AbstractDetailedAppInfo) -> Boolean