|
@@ -43,6 +43,7 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
|
|
null
|
|
null
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
fun name(): String? = results.lastOrNull()?.name
|
|
fun name(): String? = results.lastOrNull()?.name
|
|
}
|
|
}
|
|
|
|
|
|
@@ -131,6 +132,7 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
|
|
isLoading.value = false
|
|
isLoading.value = false
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
else -> block()
|
|
else -> block()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -151,6 +153,7 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
|
|
val fullUrl = serverUrl + result.resourceUrl
|
|
val fullUrl = serverUrl + result.resourceUrl
|
|
Uri.parse(fullUrl)
|
|
Uri.parse(fullUrl)
|
|
}
|
|
}
|
|
|
|
+
|
|
else -> uri
|
|
else -> uri
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -194,13 +197,11 @@ class UnifiedSearchViewModel(application: Application) : AndroidViewModel(applic
|
|
searchResults.value = results
|
|
searchResults.value = results
|
|
.filter { it.value.results.isNotEmpty() }
|
|
.filter { it.value.results.isNotEmpty() }
|
|
.map { (key, value) ->
|
|
.map { (key, value) ->
|
|
- val hasMoreResults = results.isNotEmpty() && results[key]?.nextCursor() != null
|
|
|
|
-
|
|
|
|
UnifiedSearchSection(
|
|
UnifiedSearchSection(
|
|
providerID = key,
|
|
providerID = key,
|
|
name = value.name()!!,
|
|
name = value.name()!!,
|
|
entries = value.results.flatMap { it.entries },
|
|
entries = value.results.flatMap { it.entries },
|
|
- hasMoreResults = hasMoreResults
|
|
|
|
|
|
+ hasMoreResults = results.isNotEmpty() && results[key]?.nextCursor() != null
|
|
)
|
|
)
|
|
}
|
|
}
|
|
.sortedWith { o1, o2 ->
|
|
.sortedWith { o1, o2 ->
|