From e1171d7588af61c220f688d7123eedded361afad Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Thu, 24 Sep 2026 13:50:31 +0000
Subject: [PATCH] key the queue now-playing highlight by song id

---
 .../main/kotlin/com/subtracks/ui/playback/QueueScreen.kt    | 6 +++---
 app/src/test/kotlin/com/subtracks/ui/AppScreenshotTest.kt   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt b/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
index 520ea929..fb9a6e75 100644
--- a/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
@@ -254,7 +254,7 @@ fun QueueRoute(
     QueueScreen(
         rows = viewModel.rows,
         ready = viewModel.ready,
-        currentPosition = playback.position,
+        currentSongId = playback.item?.id,
         coverArt = sourceRepository::coverArt,
         onBack = onBack,
         onPlay = viewModel::play,
@@ -273,7 +273,7 @@ fun QueueRoute(
 fun QueueScreen(
     rows: List<QueueRow>,
     ready: Boolean,
-    currentPosition: Long?,
+    currentSongId: String?,
     coverArt: (String?, Boolean) -> CoverArtRef?,
     onBack: () -> Unit,
     onPlay: (Long) -> Unit,
@@ -361,7 +361,7 @@ fun QueueScreen(
                         ) { isDragging ->
                             QueueRowItem(
                                 row = row,
-                                isPlaying = row.position == currentPosition,
+                                isPlaying = row.song.song.id == currentSongId,
                                 floating = isDragging,
                                 coverArt = coverArt,
                                 dragHandle =
diff --git a/app/src/test/kotlin/com/subtracks/ui/AppScreenshotTest.kt b/app/src/test/kotlin/com/subtracks/ui/AppScreenshotTest.kt
index 2fda3ef5..2191a061 100644
--- a/app/src/test/kotlin/com/subtracks/ui/AppScreenshotTest.kt
+++ b/app/src/test/kotlin/com/subtracks/ui/AppScreenshotTest.kt
@@ -308,7 +308,7 @@ class AppScreenshotTest {
                     rows =
                         Fixtures.songItems.mapIndexed { index, item -> QueueRow(index.toLong(), index.toLong(), item) },
                     ready = true,
-                    currentPosition = 1,
+                    currentSongId = Fixtures.songItems[1].song.id,
                     coverArt = { id, _ -> id?.let { CoverArtRef(it, "test:$it") } },
                     onBack = {},
                     onPlay = {},