From 81e4c77644ab54603bca7901159cdfe8d06a0447 Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Tue, 15 Jul 2025 17:18:53 +0900 Subject: [PATCH] ... --- app/app/src/main/res/values/styles.xml | 4 +++- .../java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt | 2 +- .../java/de/mm20/launcher2/contacts/ContactRepository.kt | 2 +- data/weather/build.gradle.kts | 2 +- gradle/libs.versions.toml | 6 ++++-- .../src/main/java/de/mm20/launcher2/search/SearchService.kt | 1 + 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/app/src/main/res/values/styles.xml b/app/app/src/main/res/values/styles.xml index 3ea04e70..d781ec5f 100644 --- a/app/app/src/main/res/values/styles.xml +++ b/app/app/src/main/res/values/styles.xml @@ -1,2 +1,4 @@ - + + + diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt index e9059df3..fa8591e4 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt @@ -214,7 +214,7 @@ class SearchVM : ViewModel(), KoinComponent { if (query.isEmpty()) { val hiddenItemKeys = if (!filters.hiddenItems) { searchableRepository.getKeys( - maxVisibility = VisibilityLevel.SearchOnly, + maxVisibility = VisibilityLevel.Hidden, includeTypes = listOf("app"), ) } else { diff --git a/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt index 8044700c..ce2e8fe1 100644 --- a/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt +++ b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt @@ -27,7 +27,7 @@ internal class ContactRepository( override fun search(query: String, allowNetwork: Boolean): Flow> { val hasPermission = permissionsManager.hasPermission(PermissionGroup.Contacts) - if (query.length < 2) { + if (query.length < 1) { return flow { emit(persistentListOf()) } diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts index afde795f..7606d6d5 100644 --- a/data/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { implementation(libs.bundles.retrofit) implementation(libs.suncalc) implementation(libs.koin.android) - implementation("com.squareup.okhttp3:logging-interceptor:4.5.0") + implementation(libs.logging.interceptor) implementation(project(":data:database")) implementation(project(":core:base")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c485209a..1ce5f39f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,11 @@ [versions] +loggingInterceptor = "4.5.0" mustache = "0.9.14" jacksonCore = "2.19.0" jacksonDataformatYaml = "2.19.0" minSdk = "26" -compileSdk = "36" -targetSdk = "36" +compileSdk = "35" +targetSdk = "34" pluginSdk = "2.2.0" @@ -48,6 +49,7 @@ espressoCore = "3.6.1" osmOpeningHours = "0.2.0" [libraries] +logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptor" } mustache-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "mustache" } jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jacksonCore" } diff --git a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt index 228074a3..e0521fa4 100644 --- a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt +++ b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt @@ -235,6 +235,7 @@ internal class SearchServiceImpl( } if (filters.places) { launch { + Log.e("SearchService","filters.places >>> $query ${filters.allowNetwork}") locationRepository.search(query, filters.allowNetwork) .combine(customAttrResults) { locations, customAttrs -> if (customAttrs.locations != null) locations + customAttrs.locations