diff --git a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/ApiClient.kt b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/ApiClient.kt index 6964cba..972263c 100644 --- a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/ApiClient.kt +++ b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/ApiClient.kt @@ -179,8 +179,10 @@ class ApiClient(private val http: HttpClient) { suspend fun preview(moodId: String, limit: Int = 20): List = get("/moods/$moodId/preview?limit=$limit").songs - suspend fun search(query: String, limit: Int = 20): List = - get("/search?q=${query.encodeURLParameter()}&limit=$limit").results + suspend fun search(query: String, limit: Int = 20, moodId: String? = null): List { + val mood = moodId?.let { "&moodId=${it.encodeURLParameter()}" }.orEmpty() + return get("/search?q=${query.encodeURLParameter()}&limit=$limit$mood").results + } suspend fun startSession(moodId: String, limit: Int = 12): Session = parse( diff --git a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/Models.kt b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/Models.kt index 9408f0a..c22cf92 100644 --- a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/Models.kt +++ b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/api/Models.kt @@ -129,6 +129,7 @@ data class SearchResult( val thumbnail: String? = null, val songId: String? = null, val downloaded: Boolean = false, + val inMood: Boolean = false, ) @Serializable diff --git a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/store/AppStore.kt b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/store/AppStore.kt index bd92fc3..c8b490f 100644 --- a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/store/AppStore.kt +++ b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/store/AppStore.kt @@ -345,6 +345,7 @@ class AppStore( fun selectSearchMood(moodId: String) { _state.update { it.copy(searchTargetMoodId = moodId) } + if (_state.value.searchQuery.isNotBlank()) search(_state.value.searchQuery) } fun setSearchQuery(query: String) { @@ -362,7 +363,7 @@ class AppStore( delay(SEARCH_DEBOUNCE_MS) _state.update { it.copy(searching = true) } try { - val results = api.search(query, 20) + val results = api.search(query, 20, _state.value.searchTargetMoodId) _state.update { it.copy(searchResults = results) } } catch (t: CancellationException) { throw t diff --git a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/ui/SearchScreen.kt b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/ui/SearchScreen.kt index 108673c..26d0cd6 100644 --- a/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/ui/SearchScreen.kt +++ b/composeApp/src/commonMain/kotlin/win/taptap/musicmanager/client/ui/SearchScreen.kt @@ -186,7 +186,22 @@ private fun SearchRow(result: SearchResult, store: AppStore) { maxLines = 1, overflow = TextOverflow.Ellipsis, ) - if (result.downloaded) { + if (result.inMood) { + Row(verticalAlignment = Alignment.CenterVertically) { + Icon( + Icons.Rounded.Check, + contentDescription = null, + tint = MaterialTheme.colorScheme.primary, + modifier = Modifier.size(14.dp), + ) + Spacer(Modifier.width(4.dp)) + Text( + "Already in this mood", + style = MaterialTheme.typography.labelSmall, + color = MaterialTheme.colorScheme.primary, + ) + } + } else if (result.downloaded) { Row(verticalAlignment = Alignment.CenterVertically) { Icon( Icons.Rounded.DownloadDone,