From 31179f12870ec64ebf22656fc542bba12822fe75 Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Thu, 24 Sep 2026 15:24:19 +0000
Subject: [PATCH] use titleLarge for disc headings and number album tracks

---
 .../subtracks/ui/library/AlbumDetailScreen.kt |  3 +-
 .../com/subtracks/ui/library/SongsContent.kt  | 58 +++++++++++++++----
 .../kotlin/com/subtracks/ui/AlbumDiscsTest.kt |  7 +++
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt b/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
index 77a685d1..5692ecdd 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
@@ -103,6 +103,7 @@ fun AlbumDetailScreen(
                     SongRow(
                         song = song,
                         isPlaying = song.id == playingSongId,
+                        trackNumber = song.track,
                         modifier = rowModifier.clickable { onSongClick(index) },
                     )
                 }
@@ -116,7 +117,7 @@ fun AlbumDetailScreen(
 private fun DiscHeader(disc: Long) {
     Text(
         text = "Disc $disc",
-        style = MaterialTheme.typography.titleSmall,
+        style = MaterialTheme.typography.titleLarge,
         color = MaterialTheme.colorScheme.onSurfaceVariant,
         modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 20.dp, bottom = 4.dp),
     )
diff --git a/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt b/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt
index fc06064e..34633272 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt
@@ -2,12 +2,14 @@ package com.subtracks.ui.library
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -88,22 +90,32 @@ fun SongRow(
     coverArtId: String? = null,
     coverArt: ((String?, Boolean) -> CoverArtRef?)? = null,
     isPlaying: Boolean = false,
+    trackNumber: Long? = null,
     trailingContent: (@Composable () -> Unit)? = null,
     modifier: Modifier = Modifier,
 ) {
+    val leadingTrack = trackNumber?.takeIf { coverArt == null }
     ListItem(
         modifier = modifier,
         leadingContent =
-            if (coverArt != null) {
-                {
-                    CoverArt(
-                        ref = coverArt(coverArtId, true),
-                        name = song.album ?: song.title,
-                        modifier = Modifier.size(48.dp).clip(RoundedCornerShape(6.dp)),
-                    )
+            when {
+                coverArt != null -> {
+                    {
+                        CoverArt(
+                            ref = coverArt(coverArtId, true),
+                            name = song.album ?: song.title,
+                            modifier = Modifier.size(48.dp).clip(RoundedCornerShape(6.dp)),
+                        )
+                    }
+                }
+
+                leadingTrack != null -> {
+                    { TrackNumber(leadingTrack, isPlaying) }
+                }
+
+                else -> {
+                    null
                 }
-            } else {
-                null
             },
         trailingContent = trailingContent,
         headlineContent = {
@@ -111,7 +123,7 @@ fun SongRow(
                 verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
             ) {
-                if (isPlaying) {
+                if (isPlaying && leadingTrack == null) {
                     Icon(
                         imageVector = Icons.Rounded.PlayArrow,
                         contentDescription = "Playing",
@@ -140,3 +152,29 @@ fun SongRow(
         colors = ListItemDefaults.colors(containerColor = Color.Transparent),
     )
 }
+
+@Composable
+private fun TrackNumber(
+    track: Long,
+    isPlaying: Boolean,
+) {
+    Box(
+        modifier = Modifier.width(28.dp),
+        contentAlignment = Alignment.CenterEnd,
+    ) {
+        if (isPlaying) {
+            Icon(
+                imageVector = Icons.Rounded.PlayArrow,
+                contentDescription = "Playing",
+                tint = MaterialTheme.colorScheme.primary,
+                modifier = Modifier.size(18.dp),
+            )
+        } else {
+            Text(
+                text = track.toString(),
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
diff --git a/app/src/test/kotlin/com/subtracks/ui/AlbumDiscsTest.kt b/app/src/test/kotlin/com/subtracks/ui/AlbumDiscsTest.kt
index 03725c29..6804f1da 100644
--- a/app/src/test/kotlin/com/subtracks/ui/AlbumDiscsTest.kt
+++ b/app/src/test/kotlin/com/subtracks/ui/AlbumDiscsTest.kt
@@ -32,6 +32,13 @@ class AlbumDiscsTest {
         assertEquals(1, nodesWithText("Disc 2"))
     }
 
+    @Test
+    fun albumTracksShowTheirTrackNumbers() {
+        setContent(listOf(song("s-a", disc = 1, track = 1), song("s-b", disc = 1, track = 2)))
+        assertEquals(1, nodesWithText("1"))
+        assertEquals(1, nodesWithText("2"))
+    }
+
     @Test
     fun singleDiscAlbumShowsNoDiscHeaders() {
         setContent(listOf(song("s-a", disc = 1, track = 1), song("s-b", disc = 1, track = 2)))