diff --git a/app/src/main/java/com/rada/ui/player/NowPlayingBar.kt b/app/src/main/java/com/rada/ui/player/NowPlayingBar.kt index a3cbde2..c7f0834 100644 --- a/app/src/main/java/com/rada/ui/player/NowPlayingBar.kt +++ b/app/src/main/java/com/rada/ui/player/NowPlayingBar.kt @@ -72,9 +72,17 @@ fun NowPlayingBar( subtitle = localMedia?.second.orEmpty() } else { val meta = streamMeta - title = meta?.displayTitle?.takeIf { it.isNotEmpty() } ?: stationName - subtitle = if (meta != null && meta.displayTitle.isNotEmpty()) - meta.displayArtist.ifEmpty { stationName } else "" + val track = meta?.displayTitle?.takeIf { it.isNotEmpty() } + if (track != null) { + // Radio playing a tagged track: track on top, "artist · Station" + // below so the track is always attributable to its station. + title = track + val artist = meta?.displayArtist.orEmpty() + subtitle = if (artist.isNotEmpty()) "$artist · $stationName" else stationName + } else { + title = stationName + subtitle = "" + } } AnimatedVisibility(