Move algorithms to separate file

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

@@ -8,9 +8,10 @@ import de.jrpie.android.launcher.actions.AppAction
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.ShortcutAction
 import de.jrpie.android.launcher.preferences.LauncherPreferences
+import de.jrpie.android.launcher.util.countOccurrences
+import de.jrpie.android.launcher.util.isSubsequent
 import java.util.Locale
 import kotlin.text.Regex.Companion.escape
-import kotlin.text.iterator
 
 class AppFilter(
     var context: Context,
@@ -63,7 +64,7 @@ class AppFilter(
 
         if (query.isEmpty()) {
             return apps
-        } else {
+        }
         val r: MutableSet<AbstractDetailedAppInfo> = hashSetOf()
         val normalizedQuery: String = normalize(query)
         val subsequentResult: MutableList<AbstractDetailedAppInfo> = mutableListOf()
@@ -95,41 +96,7 @@ class AppFilter(
         }
         return r.toList()
     }
-    }
 
-    /**
-     * 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(

app/src/main/java/de/jrpie/android/launcher/util/Algorithms.kt

@@ -0,0 +1,35 @@
+package de.jrpie.android.launcher.util
+
+/**
+ * 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
+}