hamystudio/muza
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use LazyColumn in PlaylistOrAlbumScreen

Browse Source
This commit is contained in:
vfsfitvnm
2022-06-12 19:54:48 +02:00
parent ec052c7636
commit 6737a7b003
1 changed files with 233 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/PlaylistOrAlbumScreen.kt
View File

@@ -3,8 +3,13 @@ package it.vfsfitvnm.vimusic.ui.screens
import android.content.Intent
import android.os.Bundle
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.*
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.*
@@ -51,7 +56,7 @@ import kotlinx.coroutines.withContext
fun PlaylistOrAlbumScreen(
browseId: String,
) {
val scrollState = rememberScrollState()
val lazyListState = rememberLazyListState()
var playlistOrAlbum by remember {
mutableStateOf<Outcome<YouTube.PlaylistOrAlbum>>(Outcome.Loading)
@@ -101,13 +106,14 @@ fun PlaylistOrAlbumScreen(
val coroutineScope = rememberCoroutineScope()
Column(
LazyColumn(
state = lazyListState,
contentPadding = PaddingValues(bottom = 72.dp),
modifier = Modifier
.background(colorPalette.background)
.fillMaxSize()
.verticalScroll(scrollState)
.padding(bottom = 72.dp)
) {
item {
TopAppBar(
modifier = Modifier
.height(52.dp)
@@ -215,7 +221,9 @@ fun PlaylistOrAlbumScreen(
.size(24.dp)
)
}
}
item {
OutcomeItem(
outcome = playlistOrAlbum,
onRetry = onLoad,
@@ -324,17 +332,22 @@ fun PlaylistOrAlbumScreen(
}
}
}
}
}
playlistOrAlbum.items?.forEachIndexed { index, song ->
itemsIndexed(
items = playlistOrAlbum.valueOrNull?.items ?: emptyList(),
contentType = { _, song -> song }
) { index, song ->
SongItem(
title = song.info.name,
authors = (song.authors ?: playlistOrAlbum.authors)?.joinToString("") { it.name },
authors = (song.authors ?: playlistOrAlbum.valueOrNull?.authors)?.joinToString("") { it.name },
durationText = song.durationText,
onClick = {
player?.mediaController?.let {
it.sendCustomCommand(StopRadioCommand, Bundle.EMPTY)
playlistOrAlbum.items?.mapNotNull { song ->
song.toMediaItem(browseId, playlistOrAlbum)
playlistOrAlbum.valueOrNull?.items?.mapNotNull { song ->
song.toMediaItem(browseId, playlistOrAlbum.valueOrNull!!)
}?.let { mediaItems ->
it.forcePlayAtIndex(mediaItems, index)
}
@@ -363,7 +376,7 @@ fun PlaylistOrAlbumScreen(
},
menuContent = {
NonQueuedMediaItemMenu(
mediaItem = song.toMediaItem(browseId, playlistOrAlbum)
mediaItem = song.toMediaItem(browseId, playlistOrAlbum.valueOrNull!!)
?: return@SongItem,
onDismiss = menuState::hide,
)
@@ -374,7 +387,6 @@ fun PlaylistOrAlbumScreen(
}
}
}
}
@Composable
private fun Loading() {