...
This commit is contained in:
parent
0f77c9cf10
commit
81e4c77644
@ -1,2 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources></resources>
|
<resources>
|
||||||
|
|
||||||
|
</resources>
|
||||||
|
|||||||
@ -214,7 +214,7 @@ class SearchVM : ViewModel(), KoinComponent {
|
|||||||
if (query.isEmpty()) {
|
if (query.isEmpty()) {
|
||||||
val hiddenItemKeys = if (!filters.hiddenItems) {
|
val hiddenItemKeys = if (!filters.hiddenItems) {
|
||||||
searchableRepository.getKeys(
|
searchableRepository.getKeys(
|
||||||
maxVisibility = VisibilityLevel.SearchOnly,
|
maxVisibility = VisibilityLevel.Hidden,
|
||||||
includeTypes = listOf("app"),
|
includeTypes = listOf("app"),
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -27,7 +27,7 @@ internal class ContactRepository(
|
|||||||
override fun search(query: String, allowNetwork: Boolean): Flow<List<Contact>> {
|
override fun search(query: String, allowNetwork: Boolean): Flow<List<Contact>> {
|
||||||
val hasPermission = permissionsManager.hasPermission(PermissionGroup.Contacts)
|
val hasPermission = permissionsManager.hasPermission(PermissionGroup.Contacts)
|
||||||
|
|
||||||
if (query.length < 2) {
|
if (query.length < 1) {
|
||||||
return flow {
|
return flow {
|
||||||
emit(persistentListOf())
|
emit(persistentListOf())
|
||||||
}
|
}
|
||||||
|
|||||||
@ -47,7 +47,7 @@ dependencies {
|
|||||||
implementation(libs.bundles.retrofit)
|
implementation(libs.bundles.retrofit)
|
||||||
implementation(libs.suncalc)
|
implementation(libs.suncalc)
|
||||||
implementation(libs.koin.android)
|
implementation(libs.koin.android)
|
||||||
implementation("com.squareup.okhttp3:logging-interceptor:4.5.0")
|
implementation(libs.logging.interceptor)
|
||||||
|
|
||||||
implementation(project(":data:database"))
|
implementation(project(":data:database"))
|
||||||
implementation(project(":core:base"))
|
implementation(project(":core:base"))
|
||||||
|
|||||||
@ -1,10 +1,11 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
loggingInterceptor = "4.5.0"
|
||||||
mustache = "0.9.14"
|
mustache = "0.9.14"
|
||||||
jacksonCore = "2.19.0"
|
jacksonCore = "2.19.0"
|
||||||
jacksonDataformatYaml = "2.19.0"
|
jacksonDataformatYaml = "2.19.0"
|
||||||
minSdk = "26"
|
minSdk = "26"
|
||||||
compileSdk = "36"
|
compileSdk = "35"
|
||||||
targetSdk = "36"
|
targetSdk = "34"
|
||||||
|
|
||||||
pluginSdk = "2.2.0"
|
pluginSdk = "2.2.0"
|
||||||
|
|
||||||
@ -48,6 +49,7 @@ espressoCore = "3.6.1"
|
|||||||
osmOpeningHours = "0.2.0"
|
osmOpeningHours = "0.2.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "loggingInterceptor" }
|
||||||
mustache-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "mustache" }
|
mustache-compiler = { module = "com.github.spullara.mustache.java:compiler", version.ref = "mustache" }
|
||||||
|
|
||||||
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jacksonCore" }
|
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jacksonCore" }
|
||||||
|
|||||||
@ -235,6 +235,7 @@ internal class SearchServiceImpl(
|
|||||||
}
|
}
|
||||||
if (filters.places) {
|
if (filters.places) {
|
||||||
launch {
|
launch {
|
||||||
|
Log.e("SearchService","filters.places >>> $query ${filters.allowNetwork}")
|
||||||
locationRepository.search(query, filters.allowNetwork)
|
locationRepository.search(query, filters.allowNetwork)
|
||||||
.combine(customAttrResults) { locations, customAttrs ->
|
.combine(customAttrResults) { locations, customAttrs ->
|
||||||
if (customAttrs.locations != null) locations + customAttrs.locations
|
if (customAttrs.locations != null) locations + customAttrs.locations
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user