search: address review findings

Prefix result keys per type so ids shared across songs, albums, artists
and playlists cannot collide and crash the list; add a loading state so
a query in flight no longer reads as no results; gate on code points to
match SQLite's length(); bind the three-character floor to one constant;
label the search field for TalkBack; and drop the vacuous trigram-plan
test. Cancel the ViewModel scope in its test teardown so it cannot leak
into later Robolectric tests.
This commit is contained in:
austinried
2026-10-04 00:30:07 +00:00
parent c1081b4ae7
commit b25b9deacd
7 changed files with 67 additions and 30 deletions
@@ -29,20 +29,23 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.subtracks.data.db.SEARCH_MIN_LENGTH
import com.subtracks.data.model.Album
import com.subtracks.data.model.AlbumSongItem
import com.subtracks.data.model.Artist
import com.subtracks.data.model.CoverArtRef
import com.subtracks.data.model.Playlist
import com.subtracks.data.model.Song
import com.subtracks.data.repo.SEARCH_MIN_LENGTH
import com.subtracks.data.source.StarType
import com.subtracks.playback.PlaybackController
import com.subtracks.ui.components.ContextMenuHost
import com.subtracks.ui.components.EmptyState
import com.subtracks.ui.components.ItemActions
import com.subtracks.ui.components.LoadingState
import com.subtracks.ui.components.MenuTarget
import com.subtracks.ui.home.AlbumListRow
import com.subtracks.ui.home.ArtistListRow
@@ -138,20 +141,28 @@ fun SearchScreen(
focusedIndicatorColor = Color.Transparent,
unfocusedIndicatorColor = Color.Transparent,
),
modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
modifier =
Modifier
.fillMaxWidth()
.focusRequester(focusRequester)
.semantics { contentDescription = "Search your library" },
)
},
)
},
) { padding ->
when {
query.length < SEARCH_MIN_LENGTH -> {
!searchReady(query) -> {
EmptyState(
text = "Type at least $SEARCH_MIN_LENGTH characters to search.",
modifier = Modifier.padding(padding),
)
}
results.loading -> {
LoadingState(Modifier.padding(padding))
}
results.isEmpty -> {
EmptyState(
text = "No results for \u201C$query\u201D.",
@@ -194,7 +205,7 @@ private fun LazyListScope.songResults(
) {
if (songs.isEmpty()) return
resultHeader("Songs")
items(songs, key = { it.song.id }) { item ->
items(songs, key = { "song-${it.song.id}" }) { item ->
SongRow(
song = item.song,
coverArtId = item.coverArt,
@@ -218,7 +229,7 @@ private fun LazyListScope.albumResults(
) {
if (albums.isEmpty()) return
resultHeader("Albums")
items(albums, key = { it.id }) { album ->
items(albums, key = { "album-${it.id}" }) { album ->
AlbumListRow(
album = album,
coverArt = coverArt,
@@ -237,7 +248,7 @@ private fun LazyListScope.artistResults(
) {
if (artists.isEmpty()) return
resultHeader("Artists")
items(artists, key = { it.id }) { artist ->
items(artists, key = { "artist-${it.id}" }) { artist ->
ArtistListRow(
artist = artist,
coverArt = coverArt,
@@ -256,7 +267,7 @@ private fun LazyListScope.playlistResults(
) {
if (playlists.isEmpty()) return
resultHeader("Playlists")
items(playlists, key = { it.id }) { playlist ->
items(playlists, key = { "playlist-${it.id}" }) { playlist ->
PlaylistRow(
playlist = playlist,
coverArt = coverArt,