From 98f97ba33f31b5de4eb8091a3452e8f5050ba5ec Mon Sep 17 00:00:00 2001 From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> Date: Thu, 24 Jul 2025 16:08:35 +0800 Subject: [PATCH] feat(search): remove unneeded allApps parameter in query function --- lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt | 3 --- .../search/engine/provider/CalculatorSearchProvider.kt | 2 -- .../lawnchair/search/engine/provider/ContactsSearchProvider.kt | 2 -- .../app/lawnchair/search/engine/provider/FileSearchProvider.kt | 2 -- .../lawnchair/search/engine/provider/SettingsSearchProvider.kt | 2 -- .../search/engine/provider/web/WebSuggestionProvider.kt | 2 -- 6 files changed, 13 deletions(-) diff --git a/lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt b/lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt index b0bfdea20b..dbc59f519f 100644 --- a/lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt +++ b/lawnchair/src/app/lawnchair/search/engine/SearchProvider.kt @@ -1,7 +1,6 @@ package app.lawnchair.search.engine import android.content.Context -import com.android.launcher3.model.AllAppsList import kotlinx.coroutines.flow.Flow /** @@ -22,12 +21,10 @@ interface SearchProvider { * * @param context The application context. * @param query The user's search query. - * @param allApps (Optional) The current list of all apps, for providers that require apps. * @return A Flow that emits a list of [SearchResult]s. */ fun search( context: Context, query: String, - allApps: AllAppsList? = null, ): Flow> } diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt b/lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt index b17c653008..746dc43c2d 100644 --- a/lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/search/engine/provider/CalculatorSearchProvider.kt @@ -6,7 +6,6 @@ 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 com.android.launcher3.model.AllAppsList import java.math.BigDecimal import java.math.MathContext import kotlinx.coroutines.flow.Flow @@ -19,7 +18,6 @@ object CalculatorSearchProvider : SearchProvider { override fun search( context: Context, query: String, - allApps: AllAppsList?, ): Flow> = flow { val legacyPrefs = PreferenceManager.getInstance(context) diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt b/lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt index f8c7df8274..b448518485 100644 --- a/lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/search/engine/provider/ContactsSearchProvider.kt @@ -8,7 +8,6 @@ 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 com.android.launcher3.model.AllAppsList import com.patrykmichalik.opto.core.firstBlocking import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.Dispatchers @@ -25,7 +24,6 @@ object ContactsSearchProvider : SearchProvider { override fun search( context: Context, query: String, - allApps: AllAppsList?, ): Flow> = flow { val prefs = PreferenceManager.getInstance(context) val prefs2 = PreferenceManager2.getInstance(context) diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt b/lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt index 3fe091e856..d019790577 100644 --- a/lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/search/engine/provider/FileSearchProvider.kt @@ -16,7 +16,6 @@ import app.lawnchair.util.isDirectory import app.lawnchair.util.isHidden import app.lawnchair.util.isRegularFile import app.lawnchair.util.mimeType2Extension -import com.android.launcher3.model.AllAppsList import com.patrykmichalik.opto.core.firstBlocking import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow @@ -30,7 +29,6 @@ object FileSearchProvider : SearchProvider { override fun search( context: Context, query: String, - allApps: AllAppsList?, ): Flow> = flow { val prefs = PreferenceManager.getInstance(context) val prefs2 = PreferenceManager2.getInstance(context) diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt b/lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt index e49043b48e..67c1ce5a7a 100644 --- a/lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt +++ b/lawnchair/src/app/lawnchair/search/engine/provider/SettingsSearchProvider.kt @@ -8,7 +8,6 @@ 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 com.android.launcher3.model.AllAppsList import com.patrykmichalik.opto.core.firstBlocking import java.lang.reflect.Modifier import kotlinx.coroutines.CoroutineExceptionHandler @@ -24,7 +23,6 @@ object SettingsSearchProvider : SearchProvider { override fun search( context: Context, query: String, - allApps: AllAppsList?, ): Flow> = flow { // We get the preference manager instance when needed, using the passed context. val prefs = PreferenceManager.getInstance(context) diff --git a/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt b/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt index eebf4e36fd..e31ee79968 100644 --- a/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt +++ b/lawnchair/src/app/lawnchair/search/engine/provider/web/WebSuggestionProvider.kt @@ -5,7 +5,6 @@ import app.lawnchair.preferences.PreferenceManager import app.lawnchair.preferences2.PreferenceManager2 import app.lawnchair.search.engine.SearchProvider import app.lawnchair.search.engine.SearchResult -import com.android.launcher3.model.AllAppsList import com.patrykmichalik.opto.core.firstBlocking import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow @@ -17,7 +16,6 @@ object WebSuggestionProvider : SearchProvider { override fun search( context: Context, query: String, - allApps: AllAppsList?, ): Flow> { val prefs = PreferenceManager.getInstance(context) val prefs2 = PreferenceManager2.getInstance(context)