From 90900142f8a1fbc11bc34f6e17c76534bca01fd9 Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Thu, 24 Jul 2025 18:55:48 +0800
Subject: [PATCH] feat(search): migrate files to algorithms directory

---
 .../preferences2/PreferenceManager2.kt        |  7 +++---
 .../search/adapter/SearchTargetFactory.kt     |  2 +-
 .../LawnchairNewLocalSearchAlgorithm.kt}      | 25 ++++++++++---------
 .../algorithms/LawnchairSearchAlgorithm.kt    |  5 ++--
 .../{ => algorithms}/engine/SearchProvider.kt |  2 +-
 .../{ => algorithms}/engine/SearchResult.kt   |  2 +-
 .../engine/provider/AppSearchProvider.kt      |  4 +--
 .../provider/CalculatorSearchProvider.kt      |  6 ++---
 .../engine/provider/ContactsSearchProvider.kt |  6 ++---
 .../engine/provider/FileSearchProvider.kt     |  6 ++---
 .../engine/provider/HistorySearchProvider.kt  |  4 +--
 .../engine/provider/SettingsSearchProvider.kt |  6 ++---
 .../engine/provider/ShortcutSearchProvider.kt |  4 +--
 .../provider/web/BuiltInWebSearchProviders.kt |  2 +-
 .../provider/web/CustomWebSearchProvider.kt   |  8 +++---
 .../engine/provider/web/WebSearchProvider.kt  |  2 +-
 .../provider/web/WebSuggestionProvider.kt     |  6 ++---
 .../components/search/WebSearchProvider.kt    |  2 +-
 18 files changed, 50 insertions(+), 49 deletions(-)
 rename lawnchair/src/app/lawnchair/search/{engine/NewSearchAlgorithmAdapter.kt => algorithms/LawnchairNewLocalSearchAlgorithm.kt} (90%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/SearchProvider.kt (94%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/SearchResult.kt (97%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/AppSearchProvider.kt (96%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/CalculatorSearchProvider.kt (91%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/ContactsSearchProvider.kt (97%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/FileSearchProvider.kt (97%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/HistorySearchProvider.kt (95%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/SettingsSearchProvider.kt (94%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/ShortcutSearchProvider.kt (90%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/web/BuiltInWebSearchProviders.kt (99%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/web/CustomWebSearchProvider.kt (92%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/web/WebSearchProvider.kt (96%)
 rename lawnchair/src/app/lawnchair/search/{ => algorithms}/engine/provider/web/WebSuggestionProvider.kt (86%)

diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
index fe2d458660..4863d577f0 100644
--- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
+++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
@@ -39,7 +39,8 @@ import app.lawnchair.icons.shape.IconShapeManager
 import app.lawnchair.preferences.PreferenceManager as LawnchairPreferenceManager
 import app.lawnchair.qsb.providers.QsbSearchProvider
 import app.lawnchair.search.algorithms.LawnchairSearchAlgorithm
-import app.lawnchair.search.engine.provider.web.WebSearchProvider.WebSearchProviderCompanion
+import app.lawnchair.search.algorithms.engine.provider.web.WebSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.web.WebSearchProvider.WebSearchProviderCompanion
 import app.lawnchair.smartspace.model.SmartspaceCalendar
 import app.lawnchair.smartspace.model.SmartspaceMode
 import app.lawnchair.smartspace.model.SmartspaceTimeFormat
@@ -494,11 +495,11 @@ class PreferenceManager2 private constructor(private val context: Context) :
 
     val webSuggestionProvider = preference(
         key = stringPreferencesKey(name = "web_suggestion_provider"),
-        defaultValue = app.lawnchair.search.engine.provider.web.WebSearchProvider.fromString(
+        defaultValue = WebSearchProvider.fromString(
             getRemoteDefault("web_suggestion_provider")
                 ?: context.resources.getString(R.string.config_default_web_suggestion_provider),
         ),
-        parse = { app.lawnchair.search.engine.provider.web.WebSearchProvider.fromString(it) },
+        parse = { WebSearchProvider.fromString(it) },
         save = { it.toString() },
         onSet = { reloadHelper.recreate() },
     )
diff --git a/lawnchair/src/app/lawnchair/search/adapter/SearchTargetFactory.kt b/lawnchair/src/app/lawnchair/search/adapter/SearchTargetFactory.kt
index 349c2988e6..3118930cd1 100644
--- a/lawnchair/src/app/lawnchair/search/adapter/SearchTargetFactory.kt
+++ b/lawnchair/src/app/lawnchair/search/adapter/SearchTargetFactory.kt
@@ -24,7 +24,7 @@ import app.lawnchair.search.algorithms.data.FolderInfo
 import app.lawnchair.search.algorithms.data.IFileInfo
 import app.lawnchair.search.algorithms.data.RecentKeyword
 import app.lawnchair.search.algorithms.data.SettingInfo
-import app.lawnchair.search.engine.provider.web.WebSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.web.WebSearchProvider
 import app.lawnchair.theme.color.tokens.ColorTokens
 import app.lawnchair.util.createTextBitmap
 import app.lawnchair.util.file2Uri
diff --git a/lawnchair/src/app/lawnchair/search/engine/NewSearchAlgorithmAdapter.kt b/lawnchair/src/app/lawnchair/search/algorithms/LawnchairNewLocalSearchAlgorithm.kt
similarity index 90%
rename from lawnchair/src/app/lawnchair/search/engine/NewSearchAlgorithmAdapter.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/LawnchairNewLocalSearchAlgorithm.kt
index 7b44d8f424..f9029cbb69 100644
--- a/lawnchair/src/app/lawnchair/search/engine/NewSearchAlgorithmAdapter.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/LawnchairNewLocalSearchAlgorithm.kt
@@ -1,11 +1,11 @@
-package app.lawnchair.search.engine
+package app.lawnchair.search.algorithms
 
-import app.lawnchair.search.engine.provider.AppSearchProvider
-import app.lawnchair.search.engine.provider.ContactsSearchProvider
-import app.lawnchair.search.engine.provider.FileSearchProvider
-import app.lawnchair.search.engine.provider.HistorySearchProvider
-import app.lawnchair.search.engine.provider.SettingsSearchProvider
-import app.lawnchair.search.engine.provider.web.WebSuggestionProvider
+import app.lawnchair.search.algorithms.engine.provider.AppSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.ContactsSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.FileSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.HistorySearchProvider
+import app.lawnchair.search.algorithms.engine.provider.SettingsSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.web.WebSuggestionProvider
 import android.content.Context
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences2.PreferenceManager2
@@ -13,11 +13,12 @@ import app.lawnchair.search.adapter.SPACE
 import app.lawnchair.search.adapter.SearchLinksTarget
 import app.lawnchair.search.adapter.SearchTargetCompat
 import app.lawnchair.search.adapter.SearchTargetFactory
-import app.lawnchair.search.algorithms.LawnchairSearchAlgorithm
 import app.lawnchair.search.algorithms.data.Calculation
-import app.lawnchair.search.engine.provider.CalculatorSearchProvider
-import app.lawnchair.search.engine.provider.ShortcutSearchProvider
-import app.lawnchair.search.engine.provider.web.CustomWebSearchProvider
+import app.lawnchair.search.algorithms.engine.SearchProvider
+import app.lawnchair.search.algorithms.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.provider.CalculatorSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.ShortcutSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.web.CustomWebSearchProvider
 import com.android.launcher3.LauncherAppState
 import com.android.launcher3.R
 import com.android.launcher3.allapps.BaseAllAppsAdapter
@@ -27,7 +28,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.firstOrNull
 
-class NewSearchAlgorithmAdapter(context: Context) : LawnchairSearchAlgorithm(context) {
+class LawnchairNewLocalSearchAlgorithm(context: Context) : LawnchairSearchAlgorithm(context) {
 
     private val appState = LauncherAppState.getInstance(context)
 
diff --git a/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt b/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt
index b2ee36c035..ced4184fd2 100644
--- a/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/LawnchairSearchAlgorithm.kt
@@ -10,7 +10,6 @@ import app.lawnchair.search.adapter.SearchAdapterItem
 import app.lawnchair.search.adapter.SearchTargetCompat
 import app.lawnchair.search.adapter.SearchTargetCompat.Companion.RESULT_TYPE_APPLICATION
 import app.lawnchair.search.adapter.SearchTargetCompat.Companion.RESULT_TYPE_SHORTCUT
-import app.lawnchair.search.engine.NewSearchAlgorithmAdapter
 import com.android.app.search.LayoutType.CALCULATOR
 import com.android.app.search.LayoutType.EMPTY_DIVIDER
 import com.android.app.search.LayoutType.HORIZONTAL_MEDIUM_TEXT
@@ -29,7 +28,7 @@ import com.android.launcher3.search.SearchAlgorithm
 import com.android.launcher3.search.SearchCallback
 import com.patrykmichalik.opto.core.firstBlocking
 
-abstract class LawnchairSearchAlgorithm(
+sealed class LawnchairSearchAlgorithm(
     protected val context: Context,
 ) : SearchAlgorithm<BaseAllAppsAdapter.AdapterItem> {
 
@@ -216,7 +215,7 @@ abstract class LawnchairSearchAlgorithm(
                     context,
                 )
 
-                searchAlgorithm == LOCAL_SEARCH -> NewSearchAlgorithmAdapter(context)
+                searchAlgorithm == LOCAL_SEARCH -> LawnchairNewLocalSearchAlgorithm(context)
                 else -> LawnchairAppSearchAlgorithm(context)
             }
         }
diff --git a/lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/SearchProvider.kt
similarity index 94%
rename from lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/SearchProvider.kt
index dbc59f519f..236c3aa709 100644
--- a/lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/SearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine
+package app.lawnchair.search.algorithms.engine
 
 import android.content.Context
 import kotlinx.coroutines.flow.Flow
diff --git a/lawnchair/src/app/lawnchair/search/engine/SearchResult.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/SearchResult.kt
similarity index 97%
rename from lawnchair/src/app/lawnchair/search/engine/SearchResult.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/SearchResult.kt
index ef8eeee10a..56d2a663dc 100644
--- a/lawnchair/src/app/lawnchair/search/engine/SearchResult.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/SearchResult.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine
+package app.lawnchair.search.algorithms.engine
 
 import android.annotation.DrawableRes
 import android.content.pm.ShortcutInfo
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/AppSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/AppSearchProvider.kt
similarity index 96%
rename from lawnchair/src/app/lawnchair/search/engine/provider/AppSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/AppSearchProvider.kt
index fd4135f0ca..de241b2267 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/AppSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/AppSearchProvider.kt
@@ -1,11 +1,11 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import app.lawnchair.launcher
 import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.search.algorithms.filterHiddenApps
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchResult
 import com.android.launcher3.model.AllAppsList
 import com.android.launcher3.model.data.AppInfo
 import com.android.launcher3.popup.PopupPopulator
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/CalculatorSearchProvider.kt
similarity index 91%
rename from lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/CalculatorSearchProvider.kt
index 746dc43c2d..959882f3f2 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/CalculatorSearchProvider.kt
@@ -1,11 +1,11 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.Context
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.search.algorithms.data.Calculation
 import app.lawnchair.search.algorithms.data.calculator.Expressions
-import app.lawnchair.search.engine.SearchProvider
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchProvider
+import app.lawnchair.search.algorithms.engine.SearchResult
 import java.math.BigDecimal
 import java.math.MathContext
 import kotlinx.coroutines.flow.Flow
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/ContactsSearchProvider.kt
similarity index 97%
rename from lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/ContactsSearchProvider.kt
index b448518485..acd7acbcbd 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/ContactsSearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.Context
 import android.provider.ContactsContract
@@ -6,8 +6,8 @@ import android.util.Log
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.search.algorithms.data.ContactInfo
-import app.lawnchair.search.engine.SearchProvider
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchProvider
+import app.lawnchair.search.algorithms.engine.SearchResult
 import com.patrykmichalik.opto.core.firstBlocking
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/FileSearchProvider.kt
similarity index 97%
rename from lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/FileSearchProvider.kt
index d019790577..2a35a9437a 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/FileSearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.Context
 import android.database.Cursor
@@ -9,8 +9,8 @@ import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.search.algorithms.data.FileInfo
 import app.lawnchair.search.algorithms.data.FolderInfo
 import app.lawnchair.search.algorithms.data.IFileInfo
-import app.lawnchair.search.engine.SearchProvider
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchProvider
+import app.lawnchair.search.algorithms.engine.SearchResult
 import app.lawnchair.util.exists
 import app.lawnchair.util.isDirectory
 import app.lawnchair.util.isHidden
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/HistorySearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/HistorySearchProvider.kt
similarity index 95%
rename from lawnchair/src/app/lawnchair/search/engine/provider/HistorySearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/HistorySearchProvider.kt
index 47cf8ec4e0..50241cd0d9 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/HistorySearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/HistorySearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.ContentResolver
 import android.content.Context
@@ -8,7 +8,7 @@ import android.util.Log
 import androidx.core.net.toUri
 import app.lawnchair.search.LawnchairRecentSuggestionProvider
 import app.lawnchair.search.algorithms.data.RecentKeyword
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/SettingsSearchProvider.kt
similarity index 94%
rename from lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/SettingsSearchProvider.kt
index 67c1ce5a7a..4191ec7161 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/SettingsSearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.Context
 import android.provider.Settings
@@ -6,8 +6,8 @@ import android.util.Log
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences2.PreferenceManager2
 import app.lawnchair.search.algorithms.data.SettingInfo
-import app.lawnchair.search.engine.SearchProvider
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchProvider
+import app.lawnchair.search.algorithms.engine.SearchResult
 import com.patrykmichalik.opto.core.firstBlocking
 import java.lang.reflect.Modifier
 import kotlinx.coroutines.CoroutineExceptionHandler
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/ShortcutSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/ShortcutSearchProvider.kt
similarity index 90%
rename from lawnchair/src/app/lawnchair/search/engine/provider/ShortcutSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/ShortcutSearchProvider.kt
index c8d4bee4ae..74be31a84c 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/ShortcutSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/ShortcutSearchProvider.kt
@@ -1,9 +1,9 @@
-package app.lawnchair.search.engine.provider
+package app.lawnchair.search.algorithms.engine.provider
 
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import app.lawnchair.launcher
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchResult
 import app.lawnchair.util.isDefaultLauncher
 import com.android.launcher3.model.data.AppInfo
 import com.android.launcher3.popup.PopupPopulator
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/web/BuiltInWebSearchProviders.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt
similarity index 99%
rename from lawnchair/src/app/lawnchair/search/engine/provider/web/BuiltInWebSearchProviders.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt
index c007bddead..62a9d30ea6 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/web/BuiltInWebSearchProviders.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/BuiltInWebSearchProviders.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider.web
+package app.lawnchair.search.algorithms.engine.provider.web
 
 import android.net.Uri
 import android.util.Log
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/web/CustomWebSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/CustomWebSearchProvider.kt
similarity index 92%
rename from lawnchair/src/app/lawnchair/search/engine/provider/web/CustomWebSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/CustomWebSearchProvider.kt
index dcdc3c87fc..c00e0cbc6e 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/web/CustomWebSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/CustomWebSearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider.web
+package app.lawnchair.search.algorithms.engine.provider.web
 
 import android.content.Context
 import android.net.Uri
@@ -48,9 +48,9 @@ object CustomWebSearchProvider : WebSearchProvider {
 
     override fun configure(context: Context): WebSearchProvider {
         val prefs = PreferenceManager2.getInstance(context)
-        this.searchUrlTemplate = prefs.webSuggestionProviderUrl.firstBlocking()
-        this.suggestionsUrlTemplate = prefs.webSuggestionProviderSuggestionsUrl.firstBlocking()
-        this.displayName = prefs.webSuggestionProviderName.firstBlocking()
+        searchUrlTemplate = prefs.webSuggestionProviderUrl.firstBlocking()
+        suggestionsUrlTemplate = prefs.webSuggestionProviderSuggestionsUrl.firstBlocking()
+        displayName = prefs.webSuggestionProviderName.firstBlocking()
         return this
     }
 
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSearchProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/WebSearchProvider.kt
similarity index 96%
rename from lawnchair/src/app/lawnchair/search/engine/provider/web/WebSearchProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/WebSearchProvider.kt
index 6ea84037c2..196eb92c11 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/WebSearchProvider.kt
@@ -1,4 +1,4 @@
-package app.lawnchair.search.engine.provider.web
+package app.lawnchair.search.algorithms.engine.provider.web
 
 import android.content.Context
 import androidx.annotation.DrawableRes
diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/WebSuggestionProvider.kt
similarity index 86%
rename from lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt
rename to lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/WebSuggestionProvider.kt
index 25f725ea36..15a2b3a8ff 100644
--- a/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt
+++ b/lawnchair/src/app/lawnchair/search/algorithms/engine/provider/web/WebSuggestionProvider.kt
@@ -1,10 +1,10 @@
-package app.lawnchair.search.engine.provider.web
+package app.lawnchair.search.algorithms.engine.provider.web
 
 import android.content.Context
 import app.lawnchair.preferences.PreferenceManager
 import app.lawnchair.preferences2.PreferenceManager2
-import app.lawnchair.search.engine.SearchProvider
-import app.lawnchair.search.engine.SearchResult
+import app.lawnchair.search.algorithms.engine.SearchProvider
+import app.lawnchair.search.algorithms.engine.SearchResult
 import com.patrykmichalik.opto.core.firstBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt
index 43dc177f66..5974baabdb 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/components/search/WebSearchProvider.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import app.lawnchair.preferences.PreferenceAdapter
-import app.lawnchair.search.engine.provider.web.WebSearchProvider
+import app.lawnchair.search.algorithms.engine.provider.web.WebSearchProvider
 import app.lawnchair.ui.preferences.components.controls.ListPreferenceEntry
 import app.lawnchair.ui.preferences.components.layout.Chip
 import app.lawnchair.ui.preferences.components.layout.PreferenceTemplate