diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 35dd59e9..80c1bfcc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -115,7 +115,6 @@ dependencies { implementation(libs.koin.android) implementation(project(":applications")) - implementation(project(":appsearch")) implementation(project(":badges")) implementation(project(":base")) implementation(project(":calculator")) diff --git a/appsearch/.gitignore b/appsearch/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/appsearch/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/appsearch/build.gradle.kts b/appsearch/build.gradle.kts deleted file mode 100644 index 937f6d5e..00000000 --- a/appsearch/build.gradle.kts +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - id("com.android.library") - id("kotlin-android") - id("kotlin-kapt") -} - -android { - compileSdk = sdk.versions.compileSdk.get().toInt() - - defaultConfig { - minSdk = sdk.versions.minSdk.get().toInt() - targetSdk = sdk.versions.targetSdk.get().toInt() - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = false - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } -} - -dependencies { - implementation(libs.bundles.kotlin) - implementation(libs.androidx.core) - implementation(libs.androidx.appcompat) - - implementation(libs.bundles.androidx.lifecycle) - - implementation(libs.bundles.androidx.appsearch) - kapt(libs.androidx.appsearchcompiler) - - implementation(libs.guava) - - implementation(libs.koin.android) - - implementation(project(":search")) - implementation(project(":base")) - implementation(project(":icons")) - implementation(project(":preferences")) - implementation(project(":ktx")) - implementation(project(":badges")) - implementation(project(":hiddenitems")) -} \ No newline at end of file diff --git a/appsearch/consumer-rules.pro b/appsearch/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/appsearch/proguard-rules.pro b/appsearch/proguard-rules.pro deleted file mode 100644 index ff59496d..00000000 --- a/appsearch/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle.kts. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/appsearch/src/main/AndroidManifest.xml b/appsearch/src/main/AndroidManifest.xml deleted file mode 100644 index fcb7f5f2..00000000 --- a/appsearch/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/appsearch/src/main/java/de/mm20/launcher2/appsearch/AppSearchRepository.kt b/appsearch/src/main/java/de/mm20/launcher2/appsearch/AppSearchRepository.kt deleted file mode 100644 index 1a2d9107..00000000 --- a/appsearch/src/main/java/de/mm20/launcher2/appsearch/AppSearchRepository.kt +++ /dev/null @@ -1,63 +0,0 @@ -package de.mm20.launcher2.appsearch - -import android.app.appsearch.AppSearchManager -import android.app.appsearch.GlobalSearchSession -import android.app.appsearch.SearchResult -import android.app.appsearch.SearchSpec -import android.content.Context -import androidx.lifecycle.MediatorLiveData -import androidx.lifecycle.MutableLiveData -import de.mm20.launcher2.hiddenitems.HiddenItemsRepository -import de.mm20.launcher2.ktx.isAtLeastApiLevel -import de.mm20.launcher2.search.BaseSearchableRepository -import de.mm20.launcher2.search.data.AppSearchResult -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext -import java.util.concurrent.Executors -import kotlin.coroutines.suspendCoroutine - -class AppSearchRepository( - val context: Context, - hiddenItemsRepository: HiddenItemsRepository - ) : BaseSearchableRepository() { - - private var session: GlobalSearchSession? = null - - val appSearchResults = MediatorLiveData?>() - - private val allAppSearchResults = MutableLiveData?>(emptyList()) - private val hiddenItemKeys = hiddenItemsRepository.hiddenItemsKeys - - init { - appSearchResults.addSource(hiddenItemKeys) { keys -> - appSearchResults.value = allAppSearchResults.value?.filter { !keys.contains(it.key) } - } - appSearchResults.addSource(allAppSearchResults) { c -> - appSearchResults.value = c?.filter { hiddenItemKeys.value?.contains(it.key) != true } - } - } - - override suspend fun search(query: String) { - val results = emptyList() - if (!isAtLeastApiLevel(31)) return - val executor = Executors.newSingleThreadExecutor() - if (session == null) { - val appSearchManager = context.getSystemService(AppSearchManager::class.java) - session = suspendCoroutine { cont -> - appSearchManager.createGlobalSearchSession(executor) { - cont.resumeWith(Result.success(it.resultValue)) - } - } - } - - withContext(Dispatchers.IO) { - val searchResults = session?.search(query, SearchSpec.Builder().build()) - val page = suspendCoroutine?> { cont -> - searchResults?.getNextPage(executor) { - cont.resumeWith(Result.success(it.resultValue)) - } - } - } - allAppSearchResults.value = results - } -} \ No newline at end of file diff --git a/appsearch/src/main/java/de/mm20/launcher2/appsearch/AppSearchViewModel.kt b/appsearch/src/main/java/de/mm20/launcher2/appsearch/AppSearchViewModel.kt deleted file mode 100644 index ddc66f47..00000000 --- a/appsearch/src/main/java/de/mm20/launcher2/appsearch/AppSearchViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package de.mm20.launcher2.appsearch - -import android.app.Application -import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.LiveData -import androidx.lifecycle.ViewModel -import de.mm20.launcher2.search.data.AppSearchResult - -class AppSearchViewModel( - appSearchRepository: AppSearchRepository -) : ViewModel() { - private val appSearch: LiveData?> = appSearchRepository.appSearchResults -} \ No newline at end of file diff --git a/appsearch/src/main/java/de/mm20/launcher2/appsearch/Module.kt b/appsearch/src/main/java/de/mm20/launcher2/appsearch/Module.kt deleted file mode 100644 index 045f3a70..00000000 --- a/appsearch/src/main/java/de/mm20/launcher2/appsearch/Module.kt +++ /dev/null @@ -1,10 +0,0 @@ -package de.mm20.launcher2.appsearch - -import org.koin.android.ext.koin.androidContext -import org.koin.androidx.viewmodel.dsl.viewModel -import org.koin.dsl.module - -val appSearchModule = module { - single { AppSearchRepository(androidContext(), get()) } - viewModel { AppSearchViewModel(get()) } -} \ No newline at end of file diff --git a/appsearch/src/main/java/de/mm20/launcher2/search/data/AppSearchResult.kt b/appsearch/src/main/java/de/mm20/launcher2/search/data/AppSearchResult.kt deleted file mode 100644 index 28a6fe07..00000000 --- a/appsearch/src/main/java/de/mm20/launcher2/search/data/AppSearchResult.kt +++ /dev/null @@ -1,15 +0,0 @@ -package de.mm20.launcher2.search.data - -import android.content.Context -import de.mm20.launcher2.icons.LauncherIcon - -class AppSearchResult: Searchable() { - override val key: String - get() = TODO("Not yet implemented") - override val label: String - get() = TODO("Not yet implemented") - - override fun getPlaceholderIcon(context: Context): LauncherIcon { - TODO("Not yet implemented") - } -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 55465e9a..065f1a95 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -386,5 +386,4 @@ dependencyResolutionManagement { } } } -include(":appsearch") include(":notifications")