Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
TV: what Myspoti has beyond Apple Music TV: the queue beside the lyrics in the player (both from the Immersive look, with translation and romanization), Spotify Connect devices to move the music, the artist of the song opening its page, artist pages (popular songs in two columns, releases, fans also like) and podcast pages with their episodes, artists and shows from Home and Your Library, a full search (songs, artists, albums, playlists, podcasts); pink accent; the screens split from their loading so they can be drawn alone
kota-zobb6d4659ce7c
diff --git a/base/app/src/main/java/com/music/spotui/ui/tv/TvApp.kt b/base/app/src/main/java/com/music/spotui/ui/tv/TvApp.ktindex 147f09aa..69e20e07 100644--- a/base/app/src/main/java/com/music/spotui/ui/tv/TvApp.kt+++ b/base/app/src/main/java/com/music/spotui/ui/tv/TvApp.kt@@ -69,10 +69,13 @@ import androidx.compose.ui.unit.spimport androidx.lifecycle.viewmodel.compose.viewModelimport app.myspoti.engine.Rimport com.music.spotui.data.api.Api+import com.music.spotui.data.api.Features+import com.music.spotui.data.entity.HomeSectionimport com.music.spotui.data.api.Responseimport com.music.spotui.data.entity.ContextPageModelimport com.music.spotui.data.entity.HomeItemimport com.music.spotui.data.entity.LibraryEntry+import com.music.spotui.data.entity.SearchResultsimport com.music.spotui.data.entity.SongsModelimport com.music.spotui.data.entity.withoutDjimport com.music.spotui.di.Graph@@ -100,19 +103,38 @@ fun TvApp() {var tab by remember { mutableStateOf(TvTab.Home) }// The tab the player was opened from, for Back.var from by remember { mutableStateOf(TvTab.Home) }- val lists = remember { mutableStateListOf<LibraryEntry>() }+ val pages = remember { mutableStateListOf<TvPage>() }fun select(t: TvTab) {if (t == TvTab.NowPlaying && tab != TvTab.NowPlaying) from = tab- lists.clear()+ pages.clear()tab = t}- val open: (LibraryEntry) -> Unit = { lists += it }+ val open: (TvPage) -> Unit = { pages += it }val played: () -> Unit = { select(TvTab.NowPlaying) }- BackHandler(enabled = lists.isNotEmpty()) { lists.removeAt(lists.lastIndex) }- BackHandler(enabled = lists.isEmpty() && tab == TvTab.NowPlaying) { tab = from }- BackHandler(enabled = lists.isEmpty() && (tab == TvTab.Library || tab == TvTab.Search)) { tab = TvTab.Home }+ BackHandler(enabled = pages.isNotEmpty()) { pages.removeAt(pages.lastIndex) }+ BackHandler(enabled = pages.isEmpty() && tab == TvTab.NowPlaying) { tab = from }+ BackHandler(enabled = pages.isEmpty() && (tab == TvTab.Library || tab == TvTab.Search)) { tab = TvTab.Home }+ TvFrame(tab, ::select) {+ when {+ // The player's artist opens over the tab it was opened from.+ tab == TvTab.NowPlaying -> TvNowPlaying(onArtist = { id, name -> tab = from; pages.clear(); pages += TvPage.Artist(id, name) })+ pages.isNotEmpty() -> when (val p = pages.last()) {+ is TvPage.Songs -> TvSongs(p.entry, played)+ is TvPage.Artist -> TvArtist(p, open, played)+ is TvPage.Show -> TvShow(p, played)+ }+ tab == TvTab.Home -> TvHome(open)+ tab == TvTab.Library -> TvLibrary(open)+ else -> TvSearch(open, played)+ }+ }+}++/** The page of [tab] under the floating bar of tabs. */+@Composable+internal fun TvFrame(tab: TvTab, onSelect: (TvTab) -> Unit, page: @Composable () -> Unit) {val labels = mapOf(TvTab.Home to stringResource(R.string.navigationbar_musicappitems_home_title),TvTab.Library to stringResource(R.string.aa_library),@@ -121,80 +143,78 @@ fun TvApp() {)Box(Modifier.fillMaxSize().background(TvBg)) {// The player runs under the bar to the top of the screen; the other pages start below it.- Box(Modifier.fillMaxSize().padding(top = if (tab == TvTab.NowPlaying) 0.dp else 72.dp)) {- when {- tab == TvTab.NowPlaying -> TvNowPlaying()- lists.isNotEmpty() -> TvSongs(lists.last(), played)- tab == TvTab.Home -> TvHome(open, played)- tab == TvTab.Library -> TvLibrary(open)- else -> TvSearch(open, played)- }- }- TvTopBar(tab, labels, ::select, Modifier.align(Alignment.TopCenter))+ Box(Modifier.fillMaxSize().padding(top = if (tab == TvTab.NowPlaying) 0.dp else 72.dp)) { page() }+ TvTopBar(tab, labels, onSelect, Modifier.align(Alignment.TopCenter))}}/** Home: Spotify's shelves as rows of covers, the first one big. Artists and shows stay on the phone. */@Composable-private fun TvHome(onOpen: (LibraryEntry) -> Unit, onPlayed: () -> Unit) {+private fun TvHome(onOpen: (TvPage) -> Unit) {val vm: HomeViewModel = viewModel()val home by vm.home.collectAsState()- val context = LocalContext.current- val likedName = stringResource(R.string.collection_liked_songs_title)val feed = (home as? Response.Success)?.data- val sections = remember(feed) {- feed?.sections.orEmpty().withoutDj()- .map { s -> s.copy(items = s.items.filter { it.entry(likedName) != null }) }- .filter { it.items.isNotEmpty() }- }when {feed == null && home is Response.Loading -> TvShelfSkeleton()feed == null -> TvRetry { vm.retry() }- else -> {- val first = remember { FocusRequester() }- LazyColumn(Modifier.fillMaxSize(), contentPadding = PaddingValues(top = 20.dp, bottom = 60.dp), verticalArrangement = Arrangement.spacedBy(30.dp)) {- itemsIndexed(sections, key = { i, s -> "$i:${s.title}" }) { i, section ->- val lead = i == 0- Column(Modifier.fillMaxWidth()) {- val title = section.title.ifBlank { feed.greeting.ifBlank { context.getString(R.string.navigationbar_musicappitems_home_title) } }- Text(title, fontSize = if (lead) 24.sp else 20.sp, fontWeight = FontWeight.Bold, color = Color.White,- modifier = Modifier.padding(start = 48.dp, bottom = 14.dp))- LazyRow(contentPadding = PaddingValues(horizontal = 48.dp, vertical = 12.dp), horizontalArrangement = Arrangement.spacedBy(if (lead) 20.dp else 16.dp)) {- itemsIndexed(section.items, key = { j, it -> "$j:${it.name}:${it.imageUrl}" }) { j, item ->- val focus = if (lead && j == 0) Modifier.focusRequester(first) else Modifier- val entry = item.entry(likedName) ?: return@itemsIndexed- if (lead) TvGradientCard(item.name, item.subtitleText(), item.imageUrl, 240.dp, focus) { onOpen(entry) }- else TvAlbumCard(item.name, item.subtitleText(), item.imageUrl, 160.dp, modifier = focus) { onOpen(entry) }- }- }+ else -> TvHomeShelves(feed.greeting, feed.sections, onOpen)+ }+}++/** Home's shelves, the first one in big cards; an untitled one is named [greeting]. */+@Composable+internal fun TvHomeShelves(greeting: String, feedSections: List<HomeSection>, onOpen: (TvPage) -> Unit) {+ val likedName = stringResource(R.string.collection_liked_songs_title)+ val homeName = stringResource(R.string.navigationbar_musicappitems_home_title)+ val sections = remember(feedSections, likedName) {+ feedSections.withoutDj()+ .map { s -> s.copy(items = s.items.filter { it.page(likedName) != null }) }+ .filter { it.items.isNotEmpty() }+ }+ val first = remember { FocusRequester() }+ LazyColumn(Modifier.fillMaxSize(), contentPadding = PaddingValues(top = 20.dp, bottom = 60.dp), verticalArrangement = Arrangement.spacedBy(30.dp)) {+ itemsIndexed(sections, key = { i, s -> "$i:${s.title}" }) { i, section ->+ val lead = i == 0+ Column(Modifier.fillMaxWidth()) {+ val title = section.title.ifBlank { greeting.ifBlank { homeName } }+ Text(title, fontSize = if (lead) 24.sp else 20.sp, fontWeight = FontWeight.Bold, color = Color.White,+ modifier = Modifier.padding(start = 48.dp, bottom = 14.dp))+ LazyRow(contentPadding = PaddingValues(horizontal = 48.dp, vertical = 12.dp), horizontalArrangement = Arrangement.spacedBy(if (lead) 20.dp else 16.dp)) {+ itemsIndexed(section.items, key = { j, it -> "$j:${it.name}:${it.imageUrl}" }) { j, item ->+ val focus = if (lead && j == 0) Modifier.focusRequester(first) else Modifier+ val page = item.page(likedName) ?: return@itemsIndexed+ if (lead) TvGradientCard(item.name, item.subtitleText(), item.imageUrl, 240.dp, focus) { onOpen(page) }+ else TvAlbumCard(item.name, item.subtitleText(), item.imageUrl, 160.dp, round = item is HomeItem.Artist, modifier = focus) { onOpen(page) }}}}- LaunchedEffect(sections.isNotEmpty()) { if (sections.isNotEmpty()) runCatching { delay(80); first.requestFocus() } }}}+ LaunchedEffect(sections.isNotEmpty()) { if (sections.isNotEmpty()) runCatching { delay(80); first.requestFocus() } }}-/** The list a Home card opens, or null for what the TV does not open (artists, shows). */-private fun HomeItem.entry(likedName: String): LibraryEntry? = when (this) {- is HomeItem.Album -> if (id.isBlank()) null else LibraryEntry(id, name, artists.ifBlank { subtitle }, imageUrl, isPlaylist = false, uri = "spotify:album:$id")+/** The page a Home card opens, or null for one the TV cannot open (a card with no id, a single episode). */+private fun HomeItem.page(likedName: String): TvPage? = when (this) {+ is HomeItem.Album -> if (id.isBlank()) null else TvPage.Songs(LibraryEntry(id, name, artists.ifBlank { subtitle }, imageUrl, isPlaylist = false, uri = "spotify:album:$id"))is HomeItem.Playlist -> when {- id == Api.HomeCache.LIKED_SONGS_ID -> LibraryEntry("collection", likedName, "", imageUrl, isPlaylist = true, uri = LIKED)- id.isNotBlank() -> LibraryEntry(id, name, subtitle, imageUrl, isPlaylist = true, uri = "spotify:playlist:$id")+ id == Api.HomeCache.LIKED_SONGS_ID -> TvPage.Songs(LibraryEntry("collection", likedName, "", imageUrl, isPlaylist = true, uri = LIKED))+ id.isNotBlank() -> TvPage.Songs(LibraryEntry(id, name, subtitle, imageUrl, isPlaylist = true, uri = "spotify:playlist:$id"))else -> null}- else -> null+ is HomeItem.Artist -> if (id.isBlank()) null else TvPage.Artist(id, name)+ is HomeItem.Show -> if (id.isBlank() || isEpisode || !Features.PODCASTS) null else TvPage.Show(id, name)}private fun HomeItem.subtitleText(): String = when (this) {is HomeItem.Album -> artists.ifBlank { subtitle }is HomeItem.Playlist -> subtitle- else -> ""+ is HomeItem.Show -> subtitle+ is HomeItem.Artist -> ""}/** Liked Songs, then the playlists and albums of Your Library (a folder opens its own list of them). */@Composable-private fun TvLibrary(onOpen: (LibraryEntry) -> Unit) {+private fun TvLibrary(onOpen: (TvPage) -> Unit) {val context = LocalContext.currentvar folder by remember { mutableStateOf<LibraryEntry?>(null) }var entries by remember { mutableStateOf<List<LibraryEntry>?>(null) }@@ -217,7 +237,7 @@ private fun TvLibrary(onOpen: (LibraryEntry) -> Unit) {when {failed && list == null -> TvRetry { attempt++ }list == null -> TvShelfSkeleton()- else -> TvGrid(list) { e -> if (e.folderUri.isNotEmpty()) folder = e else onOpen(e) }+ else -> TvGrid(list) { e -> if (e.folderUri.isNotEmpty()) folder = e else onOpen(e.page()) }}}@@ -227,32 +247,29 @@ private fun TvGrid(entries: List<LibraryEntry>, modifier: Modifier = Modifier, oLazyVerticalGrid(GridCells.Adaptive(176.dp), modifier, contentPadding = PaddingValues(horizontal = 48.dp, vertical = 20.dp),horizontalArrangement = Arrangement.spacedBy(20.dp), verticalArrangement = Arrangement.spacedBy(16.dp)) {itemsIndexed(entries, key = { _, it -> it.uri.ifEmpty { it.folderUri.ifEmpty { it.spotifyId } } }) { i, e ->- TvAlbumCard(e.name, e.subtitle, e.coverUri, 160.dp, modifier = if (i == 0) Modifier.focusRequester(first) else Modifier) { onClick(e) }+ TvAlbumCard(e.name, e.subtitle, e.coverUri, 160.dp, round = ":artist:" in e.uri, modifier = if (i == 0) Modifier.focusRequester(first) else Modifier) { onClick(e) }}}LaunchedEffect(entries) { runCatching { delay(80); first.requestFocus() } }}-/** Songs, playlists and albums matching what was typed (the TV's own keyboard opens on the field). */+/**+ * Search: the field (the TV's own keyboard opens on it), then the songs in two columns and shelves+ * of artists, albums, playlists and (podcasts on) shows.+ */@Composable-private fun TvSearch(onOpen: (LibraryEntry) -> Unit, onPlayed: () -> Unit) {+private fun TvSearch(onOpen: (TvPage) -> Unit, onPlayed: () -> Unit) {val context = LocalContext.currentvar query by remember { mutableStateOf("") }var asked by remember { mutableStateOf("") }- var songs by remember { mutableStateOf<List<SongsModel>>(emptyList()) }- var lists by remember { mutableStateOf<List<LibraryEntry>>(emptyList()) }+ var found by remember { mutableStateOf<SearchResults?>(null) }var failed by remember { mutableStateOf(false) }val field = remember { FocusRequester() }LaunchedEffect(asked) {if (asked.isBlank()) return@LaunchedEffectfailed = falsewhen (val r = Graph.api.searchEverything(asked).first { it !is Response.Loading }) {- is Response.Success -> {- songs = r.data.songs- lists = r.data.playlists + r.data.albums.map {- LibraryEntry(it.spotifyId, it.name, it.artists, it.coverUri, isPlaylist = false, uri = "spotify:album:${it.spotifyId}")- }.filter { it.spotifyId.isNotBlank() }- }+ is Response.Success -> found = r.dataelse -> failed = true}}@@ -266,21 +283,65 @@ private fun TvSearch(onOpen: (LibraryEntry) -> Unit, onPlayed: () -> Unit) {focusedTextColor = Color.White, unfocusedTextColor = Color.White,focusedIndicatorColor = Color.Transparent, unfocusedIndicatorColor = Color.Transparent, cursorColor = TvAccent,),- modifier = Modifier.padding(horizontal = 48.dp).width(560.dp).focusRequester(field))+ modifier = Modifier.padding(horizontal = 64.dp).width(560.dp).focusRequester(field))Spacer(Modifier.height(20.dp))+ val f = foundwhen {- failed -> Text(stringResource(R.string.search_failed), color = TvSubtle, fontSize = 16.sp, modifier = Modifier.padding(start = 48.dp))- asked.isNotBlank() && songs.isEmpty() && lists.isEmpty() ->- Text(context.getString(R.string.assisted_curation_search_empty_view_no_result_title, asked), color = TvSubtle, fontSize = 16.sp,- modifier = Modifier.padding(start = 48.dp))- else -> Row(Modifier.fillMaxSize()) {- LazyColumn(Modifier.weight(1f).padding(start = 48.dp), contentPadding = PaddingValues(bottom = 40.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {- itemsIndexed(songs, key = { i, s -> "$i:${s.url}" }) { _, s ->- TvSongRow(s, null) { play(s, null, listOf(s)); onPlayed() }+ failed -> Text(stringResource(R.string.search_failed), color = TvSubtle, fontSize = 16.sp, modifier = Modifier.padding(start = 64.dp))+ f == null -> Unit+ f.isEmpty() -> Text(context.getString(R.string.assisted_curation_search_empty_view_no_result_title, asked), color = TvSubtle, fontSize = 16.sp,+ modifier = Modifier.padding(start = 64.dp))+ else -> TvSearchResults(f, onOpen) { s -> play(s, null, listOf(s)); onPlayed() }+ }+ }+}++private fun SearchResults.isEmpty() = songs.isEmpty() && albums.isEmpty() && artists.isEmpty() && playlists.isEmpty() && (!Features.PODCASTS || shows.isEmpty())++@Composable+internal fun TvSearchResults(f: SearchResults, onOpen: (TvPage) -> Unit, onSong: (SongsModel) -> Unit) {+ LazyColumn(Modifier.fillMaxSize(), contentPadding = PaddingValues(bottom = 60.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) {+ if (f.songs.isNotEmpty()) item("songs") {+ Column(Modifier.padding(horizontal = 64.dp)) {+ TvSectionTitle(stringResource(R.string.assisted_curation_search_filter_songs), Modifier)+ val songs = f.songs.take(8)+ Row(horizontalArrangement = Arrangement.spacedBy(32.dp)) {+ listOf(songs.take(4), songs.drop(4)).forEach { part ->+ Column(Modifier.weight(1f)) { part.forEach { s -> TvSongRow(s, null) { onSong(s) } } }+ }+ }+ }+ }+ val artists = f.artists.filter { it.id.isNotBlank() }+ if (artists.isNotEmpty()) item("artists") {+ TvShelf(stringResource(R.string.assisted_curation_search_filter_artists)) {+ itemsIndexed(artists, key = { i, a -> "$i:${a.id}" }) { _, a ->+ TvAlbumCard(a.name, "", a.coverUri, 150.dp, round = true) { onOpen(TvPage.Artist(a.id, a.name)) }+ }+ }+ }+ val albums = f.albums.filter { it.spotifyId.isNotBlank() }+ if (albums.isNotEmpty()) item("albums") {+ TvShelf(stringResource(R.string.assisted_curation_search_filter_albums)) {+ itemsIndexed(albums, key = { i, a -> "$i:${a.spotifyId}" }) { _, a ->+ TvAlbumCard(a.name, a.artists, a.coverUri, 160.dp) {+ onOpen(TvPage.Songs(LibraryEntry(a.spotifyId, a.name, a.artists, a.coverUri, isPlaylist = false, uri = "spotify:album:${a.spotifyId}")))}}- Box(Modifier.weight(1f)) {- if (lists.isNotEmpty()) TvGrid(lists, onClick = onOpen)+ }+ }+ if (f.playlists.isNotEmpty()) item("playlists") {+ TvShelf(stringResource(R.string.assisted_curation_search_filter_playlists)) {+ itemsIndexed(f.playlists, key = { i, e -> "$i:${e.uri}" }) { _, e ->+ TvAlbumCard(e.name, e.subtitle, e.coverUri, 160.dp) { onOpen(TvPage.Songs(e)) }+ }+ }+ }+ val shows = if (Features.PODCASTS) f.shows.filter { it.id.isNotBlank() } else emptyList()+ if (shows.isNotEmpty()) item("shows") {+ TvShelf(stringResource(R.string.assisted_curation_search_filter_podcasts)) {+ itemsIndexed(shows, key = { i, sh -> "$i:${sh.id}" }) { _, sh ->+ TvAlbumCard(sh.name, sh.publisher, sh.coverUri, 160.dp) { onOpen(TvPage.Show(sh.id, sh.name)) }}}}@@ -315,40 +376,42 @@ private fun TvSongs(entry: LibraryEntry, onPlayed: () -> Unit) {when {failed && p == null -> TvRetry { attempt++ }p == null -> TvShelfSkeleton(rows = 2)- else -> Row(Modifier.fillMaxSize().padding(start = 64.dp, end = 48.dp, top = 24.dp), horizontalArrangement = Arrangement.spacedBy(56.dp)) {- val playFocus = remember { FocusRequester() }- Column(Modifier.width(300.dp)) {- TvCover(p.coverUri.ifBlank { entry.coverUri }, Modifier.size(300.dp), RoundedCornerShape(12.dp))- Text(p.name.ifBlank { entry.name }, color = Color.White, fontSize = 24.sp, fontWeight = FontWeight.Bold, maxLines = 2,- overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 16.dp))- val owner = p.ownerName.ifBlank { entry.subtitle }- if (owner.isNotBlank()) Text(owner, color = TvAccent, fontSize = 16.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)- Row(Modifier.padding(top = 18.dp), horizontalArrangement = Arrangement.spacedBy(12.dp)) {- TvPillButton(Icons.Default.PlayArrow, stringResource(R.string.immersive_player_play), filled = true, modifier = Modifier.focusRequester(playFocus)) {- p.tracks.firstOrNull()?.let { vm.updateShuffleState(false); play(it, p.uri, p.tracks); onPlayed() }- }- TvPillButton(Icons.Default.Shuffle, stringResource(R.string.immersive_player_shuffle_on), filled = false) {- if (p.tracks.isNotEmpty()) { vm.updateShuffleState(true); play(p.tracks.random(), p.uri, p.tracks); onPlayed() }- }- }- }- LazyColumn(Modifier.weight(1f), contentPadding = PaddingValues(bottom = 40.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {- itemsIndexed(p.tracks, key = { i, s -> "$i:${s.url}" }) { i, s ->- TvSongRow(s, i + 1) { play(s, p.uri, p.tracks); onPlayed() }- }+ else -> TvSongsPage(entry, p,+ onPlay = { p.tracks.firstOrNull()?.let { vm.updateShuffleState(false); play(it, p.uri, p.tracks); onPlayed() } },+ onShuffle = { if (p.tracks.isNotEmpty()) { vm.updateShuffleState(true); play(p.tracks.random(), p.uri, p.tracks); onPlayed() } },+ onSong = { s -> play(s, p.uri, p.tracks); onPlayed() })+ }+}++@Composable+internal fun TvSongsPage(entry: LibraryEntry, p: ContextPageModel, onPlay: () -> Unit, onShuffle: () -> Unit, onSong: (SongsModel) -> Unit) {+ Row(Modifier.fillMaxSize().padding(start = 64.dp, end = 48.dp, top = 24.dp), horizontalArrangement = Arrangement.spacedBy(56.dp)) {+ val playFocus = remember { FocusRequester() }+ Column(Modifier.width(300.dp)) {+ TvCover(p.coverUri.ifBlank { entry.coverUri }, Modifier.size(300.dp), RoundedCornerShape(12.dp))+ Text(p.name.ifBlank { entry.name }, color = Color.White, fontSize = 24.sp, fontWeight = FontWeight.Bold, maxLines = 2,+ overflow = TextOverflow.Ellipsis, modifier = Modifier.padding(top = 16.dp))+ val owner = p.ownerName.ifBlank { entry.subtitle }+ if (owner.isNotBlank()) Text(owner, color = TvAccent, fontSize = 16.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)+ Row(Modifier.padding(top = 18.dp), horizontalArrangement = Arrangement.spacedBy(12.dp)) {+ TvPillButton(Icons.Default.PlayArrow, stringResource(R.string.immersive_player_play), filled = true, modifier = Modifier.focusRequester(playFocus), onClick = onPlay)+ TvPillButton(Icons.Default.Shuffle, stringResource(R.string.immersive_player_shuffle_on), filled = false, onClick = onShuffle)}- LaunchedEffect(p.tracks.isNotEmpty()) { if (p.tracks.isNotEmpty()) runCatching { delay(80); playFocus.requestFocus() } }}+ LazyColumn(Modifier.weight(1f), contentPadding = PaddingValues(bottom = 40.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {+ itemsIndexed(p.tracks, key = { i, s -> "$i:${s.url}" }) { i, s -> TvSongRow(s, i + 1) { onSong(s) } }+ }+ LaunchedEffect(p.tracks.isNotEmpty()) { if (p.tracks.isNotEmpty()) runCatching { delay(80); playFocus.requestFocus() } }}}/** Play or Shuffle under a list's cover: the filled one in the accent. */@Composable-private fun TvPillButton(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, filled: Boolean, modifier: Modifier = Modifier, onClick: () -> Unit) {- val fg = if (filled) Color.Black else Color.White+internal fun TvPillButton(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, filled: Boolean, modifier: Modifier = Modifier, onClick: () -> Unit) {+ val fg = Color.WhiteRow(modifier.tvPill(RoundedCornerShape(10.dp), base = if (filled) TvAccent else Color(0x26FFFFFF),- focusedFill = if (filled) Color(0xFF3BE477) else Color(0x4DFFFFFF), focusedScale = 1.06f, onClick = onClick)+ focusedFill = if (filled) Color(0xFFFF5C97) else Color(0x4DFFFFFF), focusedScale = 1.06f, onClick = onClick).padding(horizontal = 18.dp, vertical = 10.dp),verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp),) {@@ -359,7 +422,7 @@ private fun TvPillButton(icon: androidx.compose.ui.graphics.vector.ImageVector,/** One song: its number (or cover), title and artist, and its length. */@Composable-private fun TvSongRow(s: SongsModel, number: Int?, onClick: () -> Unit) {+internal fun TvSongRow(s: SongsModel, number: Int?, onClick: () -> Unit) {Row(Modifier.fillMaxWidth().tvPill(RoundedCornerShape(10.dp), focusedFill = Color(0x26FFFFFF), focusedScale = 1.02f, onClick = onClick).padding(horizontal = 14.dp, vertical = 10.dp),@@ -376,7 +439,7 @@ private fun TvSongRow(s: SongsModel, number: Int?, onClick: () -> Unit) {}@Composable-private fun TvRetry(onRetry: () -> Unit) {+internal fun TvRetry(onRetry: () -> Unit) {val focus = remember { FocusRequester() }Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {Text(stringResource(R.string.retry_button), color = Color.White, fontSize = 18.sp,@@ -388,8 +451,16 @@ private fun TvRetry(onRetry: () -> Unit) {private const val LIKED = "spotify:collection:tracks"-/** A Library row that holds songs: a playlist or an album (artists, shows and the rest stay on the phone). */-private fun LibraryEntry.opens() = ":playlist:" in uri || ":album:" in uri || uri == LIKED+/** A Library row the TV opens: a playlist, an album, an artist or (podcasts on) a show. */+private fun LibraryEntry.opens() = ":playlist:" in uri || ":album:" in uri || ":artist:" in uri || uri == LIKED ||+ (Features.PODCASTS && ":show:" in uri)++/** The page a Library row opens. */+private fun LibraryEntry.page(): TvPage = when {+ ":artist:" in uri -> TvPage.Artist(uri.substringAfterLast(':'), name)+ ":show:" in uri -> TvPage.Show(uri.substringAfterLast(':'), name)+ else -> TvPage.Songs(this)+}internal fun formatMs(ms: Long): String {val s = (ms / 1000).coerceAtLeast(0)diff --git a/base/app/src/main/java/com/music/spotui/ui/tv/TvNowPlaying.kt b/base/app/src/main/java/com/music/spotui/ui/tv/TvNowPlaying.ktindex a8a8f34d..b78acada 100644--- a/base/app/src/main/java/com/music/spotui/ui/tv/TvNowPlaying.kt+++ b/base/app/src/main/java/com/music/spotui/ui/tv/TvNowPlaying.kt@@ -6,8 +6,9 @@** Changes: Myspoti's player state and actions (rememberImmersivePlayer), its mesh backdrop from* the cover instead of the beat-driven orbs, its lyrics panel; shuffle, repeat and like on the- * transport row instead of an options menu; no motion cover, queue panel, sleep timer, live radio,- * screensaver or full-screen lyrics.+ * transport row instead of an options menu; Myspoti's queue panel and Connect devices beside the+ * lyrics; the artist opens its page; no motion cover, sleep timer, live radio, screensaver or+ * full-screen lyrics.*/package com.music.spotui.ui.tv@@ -36,7 +37,10 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Icons+import androidx.compose.material.icons.automirrored.filled.QueueMusic+import androidx.compose.material.icons.filled.Devicesimport androidx.compose.material.icons.filled.Favorite+import androidx.compose.material.icons.filled.Lyricsimport androidx.compose.material.icons.filled.FavoriteBorderimport androidx.compose.material.icons.filled.Pauseimport androidx.compose.material.icons.filled.PlayArrow@@ -52,6 +56,7 @@ import androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableLongStateOfimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.remember+import androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.runtime.setValueimport androidx.compose.runtime.withFrameMillisimport androidx.compose.ui.Alignment@@ -77,7 +82,9 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.navigation.compose.rememberNavControllerimport app.myspoti.engine.R+import com.music.spotui.ui.components.ArtistChooserimport com.music.spotui.ui.immersive.lyrics.ImmersiveLyricsPanel+import com.music.spotui.ui.immersive.lyrics.ImmersiveQueuePanelimport com.music.spotui.ui.immersive.player.ImmersivePlayerActionsimport com.music.spotui.ui.immersive.player.ImmersivePlayerStateimport com.music.spotui.ui.immersive.player.ImmersiveRepeat@@ -86,6 +93,7 @@ import com.music.spotui.ui.look.MeshGradientBackgroundimport com.music.spotui.ui.look.rememberArtworkColorsimport kotlinx.coroutines.delayimport kotlinx.coroutines.isActive+import kotlinx.coroutines.launchimport java.text.DateFormatimport java.util.Date@@ -98,12 +106,37 @@ private const val CHROME_HIDE_MS = 8_000L* synced lyrics. Idle, the controls fade and only the cover, its words and the lyrics remain.*/@Composable-internal fun TvNowPlaying() {- // The TV opens no album or artist page: the controller only satisfies the bridge.+internal fun TvNowPlaying(onArtist: (id: String, name: String) -> Unit) {+ // The TV opens its own artist page: the controller only satisfies the bridge.val bridge = rememberImmersivePlayer(rememberNavController())val state = bridge.state- val actions = bridge.actions- val palette = rememberArtworkColors(state.coverUrl.ifBlank { null })+ var devices by remember { mutableStateOf(false) }+ if (devices) TvDevicesDialog { devices = false }+ val scope = rememberCoroutineScope()+ TvPlayerScreen(+ state, bridge.actions, rememberArtworkColors(state.coverUrl.ifBlank { null }),+ onArtist = {+ scope.launch {+ val a = ArtistChooser.artistsOf(state.trackId, state.artist).firstOrNull { it.uri.isNotBlank() } ?: return@launch+ onArtist(a.uri.substringAfterLast(':'), a.name)+ }+ },+ onDevices = { devices = true },+ ) { queue, modifier ->+ if (queue) ImmersiveQueuePanel(modifier, PaddingValues(vertical = 8.dp)) else ImmersiveLyricsPanel(modifier, PaddingValues(vertical = 8.dp))+ }+}++/** The player drawn from plain state; [panel] draws the lyrics, or the queue when its flag is set. */+@Composable+internal fun TvPlayerScreen(+ state: ImmersivePlayerState,+ actions: ImmersivePlayerActions,+ palette: com.music.spotui.ui.look.MeshPalette,+ onArtist: () -> Unit,+ onDevices: () -> Unit,+ panel: @Composable (queue: Boolean, Modifier) -> Unit,+) {var chromeVisible by remember { mutableStateOf(true) }var lastNavMs by remember { mutableLongStateOf(System.currentTimeMillis()) }@@ -121,6 +154,7 @@ internal fun TvNowPlaying() {label = "idle",)val chromeAlpha = 1f - idle+ var queue by remember { mutableStateOf(false) }Box(Modifier.fillMaxSize().background(TvBg).onPreviewKeyEvent { e ->@@ -160,14 +194,28 @@ internal fun TvNowPlaying() {}Spacer(Modifier.height(18.dp))TvMarquee(state.title, 26.sp, FontWeight.Bold, Color.White)- TvMarquee(state.artist, 18.sp, FontWeight.Medium, TvAccent)+ // The artist opens its page (the first one of the credit on a TV, no chooser).+ Box(Modifier.fillMaxWidth().tvPill(RoundedCornerShape(8.dp), focusedFill = Color(0x1FFFFFFF), focusedScale = 1f, onClick = onArtist)) { TvMarquee(state.artist, 18.sp, FontWeight.Medium, TvAccent) }+ // Where the sound goes when it is not this TV (Spotify Connect).+ state.deviceName?.let { Text(it, color = TvSubtle, fontSize = 14.sp, maxLines = 1, modifier = Modifier.padding(top = 4.dp)) }Spacer(Modifier.height(18.dp))TvTransport(state, actions, Modifier.graphicsLayer { alpha = chromeAlpha })Spacer(Modifier.height(16.dp))TvSeekBar(state, actions, Modifier.graphicsLayer { alpha = chromeAlpha })}- // Lyrics are content, not chrome: they stay when the controls hide.- ImmersiveLyricsPanel(Modifier.weight(1f).fillMaxHeight(), PaddingValues(vertical = 8.dp))+ Column(Modifier.weight(1f).fillMaxHeight()) {+ // Lyrics or queue, and where the music plays: chrome, they fade with the controls.+ Row(Modifier.align(Alignment.End).graphicsLayer { alpha = chromeAlpha }, horizontalArrangement = Arrangement.spacedBy(10.dp)) {+ TvIconButton(Icons.Default.Lyrics, stringResource(R.string.immersive_player_lyrics), size = 44.dp,+ tint = if (!queue) TvAccent else Color.White.copy(alpha = 0.6f)) { queue = false }+ TvIconButton(Icons.AutoMirrored.Filled.QueueMusic, stringResource(R.string.immersive_player_queue), size = 44.dp,+ tint = if (queue) TvAccent else Color.White.copy(alpha = 0.6f)) { queue = true }+ TvIconButton(Icons.Default.Devices, stringResource(R.string.listen_on), size = 44.dp,+ tint = if (state.deviceName != null) TvAccent else Color.White.copy(alpha = 0.6f), onClick = onDevices)+ }+ // Lyrics are content, not chrome: they stay when the controls hide; the queue fades.+ panel(queue, Modifier.weight(1f).fillMaxWidth().graphicsLayer { alpha = if (queue) chromeAlpha else 1f })+ }}}}diff --git a/base/app/src/main/java/com/music/spotui/ui/tv/TvPages.kt b/base/app/src/main/java/com/music/spotui/ui/tv/TvPages.ktnew file mode 100644index 00000000..e98b02d2--- /dev/null+++ b/base/app/src/main/java/com/music/spotui/ui/tv/TvPages.kt@@ -0,0 +1,274 @@+/* SPDX-License-Identifier: GPL-3.0-only */+package com.music.spotui.ui.tv++import androidx.compose.foundation.background+import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Box+import androidx.compose.foundation.layout.Column+import androidx.compose.foundation.layout.PaddingValues+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.fillMaxSize+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.size+import androidx.compose.foundation.layout.width+import androidx.compose.foundation.lazy.LazyColumn+import androidx.compose.foundation.lazy.LazyRow+import androidx.compose.foundation.lazy.itemsIndexed+import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.material.icons.Icons+import androidx.compose.material.icons.filled.Cast+import androidx.compose.material.icons.filled.Computer+import androidx.compose.material.icons.filled.PlayArrow+import androidx.compose.material.icons.filled.Smartphone+import androidx.compose.material.icons.filled.Speaker+import androidx.compose.material.icons.filled.Tv+import androidx.compose.material3.Icon+import androidx.compose.material3.Text+import androidx.compose.runtime.Composable+import androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.getValue+import androidx.compose.runtime.mutableIntStateOf+import androidx.compose.runtime.mutableStateOf+import androidx.compose.runtime.remember+import androidx.compose.runtime.setValue+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.draw.clip+import androidx.compose.ui.focus.FocusRequester+import androidx.compose.ui.focus.focusRequester+import androidx.compose.ui.graphics.Brush+import androidx.compose.ui.graphics.Color+import androidx.compose.ui.res.stringResource+import androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextOverflow+import androidx.compose.ui.unit.dp+import androidx.compose.ui.unit.sp+import androidx.compose.ui.window.Dialog+import androidx.lifecycle.viewmodel.compose.viewModel+import app.myspoti.engine.R+import com.music.spotui.data.api.Response+import com.music.spotui.data.entity.ArtistOverviewModel+import com.music.spotui.data.entity.LibraryEntry+import com.music.spotui.data.entity.ShowPage+import com.music.spotui.data.entity.SongsModel+import com.music.spotui.di.Graph+import com.music.spotui.di.SongPlayer+import com.music.spotui.ui.viewmodel.PlayerViewModel+import kotlinx.coroutines.delay+import java.text.NumberFormat++/** What opens over a tab: a list of songs, an artist or a podcast. */+internal sealed interface TvPage {+ data class Songs(val entry: LibraryEntry) : TvPage+ data class Artist(val id: String, val name: String) : TvPage+ data class Show(val id: String, val name: String) : TvPage+}++/** An artist: its picture and name, Play, the popular songs, then its releases and the artists like it. */+@Composable+internal fun TvArtist(page: TvPage.Artist, onOpen: (TvPage) -> Unit, onPlayed: () -> Unit) {+ val vm: PlayerViewModel = viewModel()+ var overview by remember(page) { mutableStateOf<ArtistOverviewModel?>(null) }+ var failed by remember(page) { mutableStateOf(false) }+ var attempt by remember { mutableIntStateOf(0) }+ LaunchedEffect(page, attempt) {+ failed = false+ Graph.api.getArtistOverview(page.name, page.id).collect { r ->+ when (r) {+ is Response.Success -> overview = r.data+ is Response.Loading -> Unit+ else -> if (overview == null) failed = true+ }+ }+ }+ val o = overview+ when {+ failed && o == null -> TvRetry { attempt++ }+ o == null -> TvShelfSkeleton(rows = 2)+ else -> TvArtistPage(o, onOpen) { index ->+ // As the phone's artist page: its popular songs become the queue.+ val songs = o.topTracks.map { it.song }+ val s = songs.getOrNull(index) ?: return@TvArtistPage+ vm.updateQueue(songs)+ SongPlayer.playSong(s.url, contextUri = "spotify:artist:${o.id}", songs = songs)+ vm.updateSongState(s.coverUri, s.title, s.singer, true, s.id, index)+ onPlayed()+ }+ }+}++@Composable+internal fun TvArtistPage(o: ArtistOverviewModel, onOpen: (TvPage) -> Unit, onPlayTrack: (Int) -> Unit) {+ val playFocus = remember { FocusRequester() }+ LazyColumn(Modifier.fillMaxSize(), contentPadding = PaddingValues(bottom = 60.dp), verticalArrangement = Arrangement.spacedBy(28.dp)) {+ item("head") {+ Box(Modifier.fillMaxWidth()) {+ // The header picture, faded into the black under the name.+ if (o.headerImage.isNotBlank()) {+ TvCover(o.headerImage, Modifier.fillMaxWidth().height(300.dp), RoundedCornerShape(0.dp))+ Box(Modifier.matchParentSize().background(Brush.verticalGradient(0f to Color(0x33000000), 1f to TvBg)))+ }+ Row(Modifier.padding(start = 64.dp, top = if (o.headerImage.isNotBlank()) 150.dp else 24.dp), verticalAlignment = Alignment.Bottom,+ horizontalArrangement = Arrangement.spacedBy(28.dp)) {+ if (o.headerImage.isBlank()) TvCover(o.avatarImage, Modifier.size(180.dp), RoundedCornerShape(90.dp))+ Column {+ Text(o.name, color = Color.White, fontSize = 44.sp, fontWeight = FontWeight.Bold, maxLines = 1, overflow = TextOverflow.Ellipsis)+ o.monthlyListeners?.let {+ Text(stringResource(R.string.monthly_listeners_text, NumberFormat.getIntegerInstance().format(it)), color = TvSubtle, fontSize = 16.sp)+ }+ Row(Modifier.padding(top = 16.dp)) {+ if (o.topTracks.isNotEmpty()) TvPillButton(Icons.Default.PlayArrow, stringResource(R.string.immersive_player_play), filled = true,+ modifier = Modifier.focusRequester(playFocus)) { onPlayTrack(0) }+ }+ }+ }+ }+ }+ if (o.topTracks.isNotEmpty()) item("popular") {+ Column(Modifier.padding(horizontal = 64.dp)) {+ TvSectionTitle(stringResource(R.string.artist_popular_tracks), Modifier.padding(start = 0.dp))+ // Two columns of five, as a TV is wide.+ val tracks = o.topTracks.take(10)+ Row(horizontalArrangement = Arrangement.spacedBy(32.dp)) {+ listOf(tracks.take(5), tracks.drop(5)).forEachIndexed { col, part ->+ Column(Modifier.weight(1f)) {+ part.forEachIndexed { i, t -> TvSongRow(t.song, col * 5 + i + 1) { onPlayTrack(col * 5 + i) } }+ }+ }+ }+ }+ }+ val releases = o.popularReleases.filter { it.spotifyId.isNotBlank() }+ if (releases.isNotEmpty()) item("releases") {+ TvShelf(stringResource(R.string.popular_releases_section_title)) {+ itemsIndexed(releases, key = { i, a -> "$i:${a.spotifyId}" }) { _, a ->+ TvAlbumCard(a.name, a.year, a.coverUri, 160.dp) {+ onOpen(TvPage.Songs(LibraryEntry(a.spotifyId, a.name, a.artists, a.coverUri, isPlaylist = false, uri = "spotify:album:${a.spotifyId}")))+ }+ }+ }+ }+ val related = o.relatedArtists.filter { it.id.isNotBlank() }+ if (related.isNotEmpty()) item("related") {+ TvShelf(stringResource(R.string.fans_also_like_section_title)) {+ itemsIndexed(related, key = { i, a -> "$i:${a.id}" }) { _, a ->+ TvAlbumCard(a.name, "", a.coverUri, 150.dp, round = true) { onOpen(TvPage.Artist(a.id, a.name)) }+ }+ }+ }+ }+ LaunchedEffect(o.id) { runCatching { delay(80); playFocus.requestFocus() } }+}++/** A podcast: its cover, name and publisher on the left, its episodes on the right. */+@Composable+internal fun TvShow(page: TvPage.Show, onPlayed: () -> Unit) {+ var show by remember(page) { mutableStateOf<ShowPage?>(null) }+ var failed by remember(page) { mutableStateOf(false) }+ var attempt by remember { mutableIntStateOf(0) }+ LaunchedEffect(page, attempt) {+ failed = false+ Graph.api.getShowPage(page.id).collect { r ->+ when (r) {+ is Response.Success -> show = r.data+ is Response.Loading -> Unit+ else -> if (show == null) failed = true+ }+ }+ }+ val s = show+ when {+ failed && s == null -> TvRetry { attempt++ }+ s == null -> TvShelfSkeleton(rows = 2)+ else -> TvShowPage(s) { ep ->+ SongPlayer.playSong(ep.url, contextUri = "spotify:show:${page.id}")+ Graph.currentSongState.updateSongState(ep.coverUri, ep.title, ep.singer, true, ep.id, 0, ep.album)+ onPlayed()+ }+ }+}++@Composable+internal fun TvShowPage(s: ShowPage, onEpisode: (SongsModel) -> Unit) {+ val first = remember { FocusRequester() }+ Row(Modifier.fillMaxSize().padding(start = 64.dp, end = 48.dp, top = 24.dp), horizontalArrangement = Arrangement.spacedBy(56.dp)) {+ Column(Modifier.width(300.dp)) {+ TvCover(s.coverUri.ifBlank { s.show.coverUri }, Modifier.size(300.dp), RoundedCornerShape(12.dp))+ Text(s.show.name, color = Color.White, fontSize = 24.sp, fontWeight = FontWeight.Bold, maxLines = 2, overflow = TextOverflow.Ellipsis,+ modifier = Modifier.padding(top = 16.dp))+ if (s.show.publisher.isNotBlank()) Text(s.show.publisher, color = TvAccent, fontSize = 16.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)+ if (s.show.description.isNotBlank()) Text(s.show.description, color = TvSubtle, fontSize = 13.sp, maxLines = 6, overflow = TextOverflow.Ellipsis,+ modifier = Modifier.padding(top = 14.dp))+ }+ LazyColumn(Modifier.weight(1f), contentPadding = PaddingValues(bottom = 40.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) {+ itemsIndexed(s.items, key = { i, e -> "$i:${e.url}" }) { i, e ->+ Box(if (i == 0) Modifier.focusRequester(first) else Modifier) { TvSongRow(e, null) { onEpisode(e) } }+ }+ }+ }+ LaunchedEffect(s.items.isNotEmpty()) { if (s.items.isNotEmpty()) runCatching { delay(80); first.requestFocus() } }+}++/** "Listen on": the Connect devices; the one playing is in the accent, a press moves the music there. */+@Composable+internal fun TvDevicesDialog(onDismiss: () -> Unit) {+ var devices by remember { mutableStateOf<List<SongPlayer.ConnectDevice>?>(null) }+ LaunchedEffect(Unit) { devices = runCatching { SongPlayer.devices() }.getOrDefault(emptyList()) }+ Dialog(onDismissRequest = onDismiss) {+ TvDevicesList(devices) { d -> SongPlayer.transferTo(d); onDismiss() }+ }+}++@Composable+internal fun TvDevicesList(devices: List<SongPlayer.ConnectDevice>?, onPick: (SongPlayer.ConnectDevice) -> Unit) {+ val first = remember { FocusRequester() }+ Column(Modifier.width(420.dp).clip(RoundedCornerShape(16.dp)).background(Color(0xFF1C1C1E)).padding(12.dp)) {+ Text(stringResource(R.string.listen_on), color = Color.White, fontSize = 22.sp, fontWeight = FontWeight.Bold,+ modifier = Modifier.padding(horizontal = 12.dp, vertical = 10.dp))+ val list = devices+ if (list == null) TvShelfSkeletonLine()+ else list.forEachIndexed { i, d ->+ val playing = d.isActive || (d.isSelf && list.none { it.isActive })+ Row(+ (if (i == 0) Modifier.focusRequester(first) else Modifier).fillMaxWidth()+ .tvPill(RoundedCornerShape(10.dp), focusedFill = Color(0x26FFFFFF), focusedScale = 1.02f) { onPick(d) }+ .padding(horizontal = 12.dp, vertical = 12.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ Icon(deviceIcon(d.type), null, tint = if (playing) TvAccent else Color.White, modifier = Modifier.size(26.dp))+ Text(d.name, color = if (playing) TvAccent else Color.White, fontSize = 17.sp, maxLines = 1, overflow = TextOverflow.Ellipsis,+ modifier = Modifier.padding(start = 16.dp))+ }+ }+ LaunchedEffect(list?.isNotEmpty()) { if (!list.isNullOrEmpty()) runCatching { delay(80); first.requestFocus() } }+ }+}++private fun deviceIcon(type: String) = when (type.uppercase()) {+ "TV", "CAST_VIDEO", "GAME_CONSOLE" -> Icons.Default.Tv+ "SMARTPHONE", "TABLET" -> Icons.Default.Smartphone+ "COMPUTER" -> Icons.Default.Computer+ "CAST_AUDIO" -> Icons.Default.Cast+ else -> Icons.Default.Speaker+}++@Composable+private fun TvShelfSkeletonLine() {+ Box(Modifier.padding(12.dp).fillMaxWidth().height(20.dp).clip(RoundedCornerShape(5.dp)).background(Color(0x1FFFFFFF)))+}++@Composable+internal fun TvSectionTitle(title: String, modifier: Modifier = Modifier.padding(start = 48.dp)) {+ Text(title, fontSize = 20.sp, fontWeight = FontWeight.Bold, color = Color.White, modifier = modifier.padding(bottom = 14.dp))+}++/** A titled row of cards. */+@Composable+internal fun TvShelf(title: String, content: androidx.compose.foundation.lazy.LazyListScope.() -> Unit) {+ Column(Modifier.fillMaxWidth()) {+ TvSectionTitle(title, Modifier.padding(start = 64.dp))+ LazyRow(contentPadding = PaddingValues(horizontal = 64.dp, vertical = 12.dp), horizontalArrangement = Arrangement.spacedBy(16.dp), content = content)+ }+}diff --git a/base/app/src/main/java/com/music/spotui/ui/tv/TvParts.kt b/base/app/src/main/java/com/music/spotui/ui/tv/TvParts.ktindex 1fc1cee3..04933af9 100644--- a/base/app/src/main/java/com/music/spotui/ui/tv/TvParts.kt+++ b/base/app/src/main/java/com/music/spotui/ui/tv/TvParts.kt@@ -66,7 +66,7 @@ import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApiimport com.bumptech.glide.integration.compose.GlideImageinternal val TvBg = Color(0xFF000000)-internal val TvAccent = Color(0xFF1ED760)+internal val TvAccent = Color(0xFFFF2D78)internal val TvTitle = Color(0xFFF2F2F5)internal val TvSubtle = Color(0xFF8A8A8E)