From 5758609c25703da0efccbf3406e885399f724e3b Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Mon, 19 Oct 2026 05:14:13 +0000 Subject: [PATCH] ui: reserve a second meta row for the artist actions Keep the type and count on the first row with space reserved for the hanging shuffle, and put the star and more buttons on the blank second row so they sit at their old height. --- .../ui/library/ArtistDetailScreen.kt | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailScreen.kt b/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailScreen.kt index 8a28043a..b17d9322 100644 --- a/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailScreen.kt +++ b/app/src/main/kotlin/com/subtracks/ui/library/ArtistDetailScreen.kt @@ -259,12 +259,6 @@ fun ArtistDetailScreen( ) val albumCountText = pluralStringResource(R.plurals.resources_album_count, albumCount.toInt(), albumCount) val metaText = if (albumsLoaded) stringResource(R.string.artist_meta, artistType, albumCountText) else "" - val metaTop = - TITLE_INSET + - with(density) { - MaterialTheme.typography.labelLarge.lineHeight - .toDp() - } var titleHeightPx by remember { mutableFloatStateOf(0f) } val titleHeight = if (titleHeightPx > 0f) with(density) { titleHeightPx.toDp() } else lineHeight val titleMaxLines = @@ -394,18 +388,19 @@ fun ArtistDetailScreen( } } Column( - modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = metaTop), + modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 8.dp, top = TITLE_INSET), ) { + Text( + text = metaText, + style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.fillMaxWidth().padding(end = SHUFFLE_RESERVE), + ) Row( modifier = Modifier.fillMaxWidth().defaultMinSize(minHeight = 48.dp), + horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically, ) { - Text( - text = metaText, - style = MaterialTheme.typography.bodyLarge, - color = MaterialTheme.colorScheme.onSurfaceVariant, - modifier = Modifier.weight(1f), - ) ArtistActions(artist, starred, onToggleStar, onMore) } }