android/app/src/main/java/com/fabledsword/minstrel/player/ui/NowPlayingScreen.kt

@@ -96,6 +96,24 @@ fun NowPlayingScreen(
         snackbarHost = { SnackbarHost(snackbarHostState) },
         containerColor = MaterialTheme.colorScheme.background,
     ) { inner ->
+        NowPlayingBody(
+            inner = inner,
+            state = state,
+            track = track,
+            navController = navController,
+            viewModel = viewModel,
+        )
+    }
+}
+
+@Composable
+private fun NowPlayingBody(
+    inner: androidx.compose.foundation.layout.PaddingValues,
+    state: com.fabledsword.minstrel.player.PlayerUiState,
+    track: com.fabledsword.minstrel.models.TrackRef,
+    navController: NavHostController,
+    viewModel: PlayerViewModel,
+) {
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -106,11 +124,7 @@ fun NowPlayingScreen(
     ) {
         NowPlayingCover(coverUrl = track.coverUrl, contentDescription = track.title)
         Spacer(Modifier.height(24.dp))
-            TrackHeader(
+        TrackHeader(title = track.title, artist = track.artistName, album = track.albumTitle)
-                title = track.title,
-                artist = track.artistName,
-                album = track.albumTitle,
-            )
         Spacer(Modifier.height(24.dp))
         ScrubberRow(
             positionMs = state.positionMs,
@@ -134,7 +148,6 @@ fun NowPlayingScreen(
             onCycleRepeat = viewModel::cycleRepeat,
         )
     }
-    }
 }
 
 @Composable