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

Drop DetailedSong model

Browse Source
This commit is contained in:
vfsfitvnm
2022-10-29 16:43:17 +02:00
parent f3995b8c46
commit 33221746fc
17 changed files with 151 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
View File

@@ -25,6 +25,7 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicText
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -48,7 +49,7 @@ import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.enums.PlaylistSortBy
import it.vfsfitvnm.vimusic.enums.SortOrder
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Info
import it.vfsfitvnm.vimusic.models.Playlist
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.models.SongPlaylistMap
@@ -69,15 +70,16 @@ import it.vfsfitvnm.vimusic.utils.formatAsDuration
import it.vfsfitvnm.vimusic.utils.medium
import it.vfsfitvnm.vimusic.utils.semiBold
import it.vfsfitvnm.vimusic.utils.thumbnail
import kotlin.system.measureTimeMillis
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.withContext
@ExperimentalAnimationApi
@Composable
fun InHistoryMediaItemMenu(
onDismiss: () -> Unit,
song: DetailedSong,
song: Song,
modifier: Modifier = Modifier
) {
val binder = LocalPlayerServiceBinder.current
@@ -115,7 +117,7 @@ fun InPlaylistMediaItemMenu(
onDismiss: () -> Unit,
playlistId: Long,
positionInPlaylist: Int,
song: DetailedSong,
song: Song,
modifier: Modifier = Modifier
) {
NonQueuedMediaItemMenu(
@@ -276,15 +278,43 @@ fun MediaItemMenu(
mutableStateOf(0.dp)
}
val likedAt by remember(mediaItem.mediaId) {
Database.likedAt(mediaItem.mediaId).distinctUntilChanged()
}.collectAsState(initial = null, context = Dispatchers.IO)
var albumInfo by remember {
mutableStateOf(mediaItem.mediaMetadata.extras?.getString("albumId")?.let { albumId ->
Info(albumId, null)
})
}
var artistsInfo by remember {
mutableStateOf(
mediaItem.mediaMetadata.extras?.getStringArrayList("artistNames")?.let { artistNames ->
mediaItem.mediaMetadata.extras?.getStringArrayList("artistIds")?.let { artistIds ->
artistNames.zip(artistIds).map { (authorName, authorId) ->
Info(authorId, authorName)
}
}
}
)
}
var likedAt by remember {
mutableStateOf<Long?>(null)
}
LaunchedEffect(Unit) {
withContext(Dispatchers.IO) {
if (albumInfo == null) albumInfo = Database.songAlbumInfo(mediaItem.mediaId)
if (artistsInfo == null) artistsInfo = Database.songArtistInfo(mediaItem.mediaId)
Database.likedAt(mediaItem.mediaId).collect { likedAt = it }
}
}
AnimatedContent(
targetState = isViewingPlaylists,
transitionSpec = {
val animationSpec = tween<IntOffset>(400)
val slideDirection = if (targetState) AnimatedContentScope.SlideDirection.Left else AnimatedContentScope.SlideDirection.Right
val slideDirection =
if (targetState) AnimatedContentScope.SlideDirection.Left else AnimatedContentScope.SlideDirection.Right
slideIntoContainer(slideDirection, animationSpec) with
slideOutOfContainer(slideDirection, animationSpec)
@@ -371,7 +401,8 @@ fun MediaItemMenu(
.padding(end = 12.dp)
) {
SongItem(
thumbnailUrl = mediaItem.mediaMetadata.artworkUri.thumbnail(thumbnailSizePx)?.toString(),
thumbnailUrl = mediaItem.mediaMetadata.artworkUri.thumbnail(thumbnailSizePx)
?.toString(),
title = mediaItem.mediaMetadata.title.toString(),
authors = mediaItem.mediaMetadata.artist.toString(),
duration = null,
@@ -601,7 +632,10 @@ fun MediaItemMenu(
text = "${formatAsDuration(it)} left",
style = typography.xxs.medium,
modifier = modifier
.background(color = colorPalette.background0, shape = RoundedCornerShape(16.dp))
.background(
color = colorPalette.background0,
shape = RoundedCornerShape(16.dp)
)
.padding(horizontal = 16.dp, vertical = 8.dp)
.animateContentSize()
)
@@ -619,7 +653,9 @@ fun MediaItemMenu(
Image(
painter = painterResource(R.drawable.chevron_forward),
contentDescription = null,
colorFilter = androidx.compose.ui.graphics.ColorFilter.tint(colorPalette.textSecondary),
colorFilter = androidx.compose.ui.graphics.ColorFilter.tint(
colorPalette.textSecondary
),
modifier = Modifier
.size(16.dp)
)
@@ -628,7 +664,7 @@ fun MediaItemMenu(
}
onGoToAlbum?.let { onGoToAlbum ->
mediaItem.mediaMetadata.extras?.getString("albumId")?.let { albumId ->
albumInfo?.let { (albumId) ->
MenuEntry(
icon = R.drawable.disc,
text = "Go to album",
@@ -641,25 +677,16 @@ fun MediaItemMenu(
}
onGoToArtist?.let { onGoToArtist ->
mediaItem.mediaMetadata.extras?.getStringArrayList("artistNames")
?.let { artistNames ->
mediaItem.mediaMetadata.extras?.getStringArrayList("artistIds")
?.let { artistIds ->
artistNames.zip(artistIds)
.forEach { (authorName, authorId) ->
if (authorId != null) {
MenuEntry(
icon = R.drawable.person,
text = "More of $authorName",
onClick = {
onDismiss()
onGoToArtist(authorId)
}
)
}
}
}
}
artistsInfo?.forEach { (authorId, authorName) ->
MenuEntry(
icon = R.drawable.person,
text = "More of $authorName",
onClick = {
onDismiss()
onGoToArtist(authorId)
}
)
}
}
onRemoveFromQueue?.let { onRemoveFromQueue ->

4
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/SongItem.kt
View File

@@ -19,7 +19,6 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.media3.common.MediaItem
import coil.compose.AsyncImage
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.ui.components.themed.TextPlaceholder
import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance
import it.vfsfitvnm.vimusic.ui.styling.shimmer
@@ -28,6 +27,7 @@ import it.vfsfitvnm.vimusic.utils.secondary
import it.vfsfitvnm.vimusic.utils.semiBold
import it.vfsfitvnm.vimusic.utils.thumbnail
import it.vfsfitvnm.innertube.Innertube
import it.vfsfitvnm.vimusic.models.Song
@Composable
fun SongItem(
@@ -69,7 +69,7 @@ fun SongItem(
@Composable
fun SongItem(
song: DetailedSong,
song: Song,
thumbnailSizePx: Int,
thumbnailSizeDp: Dp,
modifier: Modifier = Modifier,

10
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumSongs.kt
View File

@@ -27,7 +27,7 @@ import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.ShimmerHost
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
@@ -59,7 +59,7 @@ fun AlbumSongs(
val binder = LocalPlayerServiceBinder.current
val menuState = LocalMenuState.current
var songs by persistList<DetailedSong>("album/$browseId/songs")
var songs by persistList<Song>("album/$browseId/songs")
LaunchedEffect(Unit) {
Database.albumSongs(browseId).collect { songs = it }
@@ -89,7 +89,7 @@ fun AlbumSongs(
text = "Enqueue",
enabled = songs.isNotEmpty(),
onClick = {
binder?.player?.enqueue(songs.map(DetailedSong::asMediaItem))
binder?.player?.enqueue(songs.map(Song::asMediaItem))
}
)
}
@@ -133,7 +133,7 @@ fun AlbumSongs(
onClick = {
binder?.stopRadio()
binder?.player?.forcePlayAtIndex(
songs.map(DetailedSong::asMediaItem),
songs.map(Song::asMediaItem),
index
)
}
@@ -162,7 +162,7 @@ fun AlbumSongs(
if (songs.isNotEmpty()) {
binder?.stopRadio()
binder?.player?.forcePlayFromBeginning(
songs.shuffled().map(DetailedSong::asMediaItem)
songs.shuffled().map(Song::asMediaItem)
)
}
}

10
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistLocalSongs.kt
View File

@@ -24,7 +24,7 @@ import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.ShimmerHost
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
@@ -53,7 +53,7 @@ fun ArtistLocalSongs(
val (colorPalette) = LocalAppearance.current
val menuState = LocalMenuState.current
var songs by persist<List<DetailedSong>?>("artist/$browseId/localSongs")
var songs by persist<List<Song>?>("artist/$browseId/localSongs")
LaunchedEffect(Unit) {
Database.artistSongs(browseId).collect { songs = it }
@@ -84,7 +84,7 @@ fun ArtistLocalSongs(
text = "Enqueue",
enabled = !songs.isNullOrEmpty(),
onClick = {
binder?.player?.enqueue(songs!!.map(DetailedSong::asMediaItem))
binder?.player?.enqueue(songs!!.map(Song::asMediaItem))
}
)
}
@@ -115,7 +115,7 @@ fun ArtistLocalSongs(
onClick = {
binder?.stopRadio()
binder?.player?.forcePlayAtIndex(
songs.map(DetailedSong::asMediaItem),
songs.map(Song::asMediaItem),
index
)
}
@@ -139,7 +139,7 @@ fun ArtistLocalSongs(
if (songs.isNotEmpty()) {
binder?.stopRadio()
binder?.player?.forcePlayFromBeginning(
songs.shuffled().map(DetailedSong::asMediaItem)
songs.shuffled().map(Song::asMediaItem)
)
}
}

15
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistSongs.kt
View File

@@ -26,7 +26,8 @@ import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.models.SongWithContentLength
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
import it.vfsfitvnm.vimusic.ui.components.themed.Header
@@ -53,7 +54,7 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
val binder = LocalPlayerServiceBinder.current
val menuState = LocalMenuState.current
var songs by persistList<DetailedSong>("${builtInPlaylist.name}/songs")
var songs by persistList<Song>("${builtInPlaylist.name}/songs")
LaunchedEffect(Unit) {
when (builtInPlaylist) {
@@ -66,9 +67,9 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
.map { songs ->
songs.filter { song ->
song.contentLength?.let {
binder?.cache?.isCached(song.id, 0, song.contentLength)
binder?.cache?.isCached(song.song.id, 0, song.contentLength)
} ?: false
}
}.map(SongWithContentLength::song)
}
}.collect { songs = it }
}
@@ -103,7 +104,7 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
text = "Enqueue",
enabled = songs.isNotEmpty(),
onClick = {
binder?.player?.enqueue(songs.map(DetailedSong::asMediaItem))
binder?.player?.enqueue(songs.map(Song::asMediaItem))
}
)
@@ -143,7 +144,7 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
onClick = {
binder?.stopRadio()
binder?.player?.forcePlayAtIndex(
songs.map(DetailedSong::asMediaItem),
songs.map(Song::asMediaItem),
index
)
}
@@ -160,7 +161,7 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
if (songs.isNotEmpty()) {
binder?.stopRadio()
binder?.player?.forcePlayFromBeginning(
songs.shuffled().map(DetailedSong::asMediaItem)
songs.shuffled().map(Song::asMediaItem)
)
}
}

12
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeSongs.kt
View File

@@ -38,7 +38,8 @@ import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.enums.SongSortBy
import it.vfsfitvnm.vimusic.enums.SortOrder
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.query
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
import it.vfsfitvnm.vimusic.ui.components.themed.Header
@@ -58,6 +59,8 @@ import it.vfsfitvnm.vimusic.utils.rememberPreference
import it.vfsfitvnm.vimusic.utils.semiBold
import it.vfsfitvnm.vimusic.utils.songSortByKey
import it.vfsfitvnm.vimusic.utils.songSortOrderKey
import kotlin.system.measureTimeMillis
import kotlinx.coroutines.flow.first
@ExperimentalFoundationApi
@ExperimentalAnimationApi
@@ -75,9 +78,12 @@ fun HomeSongs(
var sortBy by rememberPreference(songSortByKey, SongSortBy.DateAdded)
var sortOrder by rememberPreference(songSortOrderKey, SortOrder.Descending)
var items by persistList<DetailedSong>("home/songs")
var items by persistList<Song>("home/songs")
LaunchedEffect(sortBy, sortOrder) {
// 670, 58, 97, 91, 94
println("took ${measureTimeMillis { Database.songs(sortBy, sortOrder).first() }}ms")
Database.songs(sortBy, sortOrder).collect { items = it }
}
@@ -175,7 +181,7 @@ fun HomeSongs(
onClick = {
binder?.stopRadio()
binder?.player?.forcePlayAtIndex(
items.map(DetailedSong::asMediaItem),
items.map(Song::asMediaItem),
index
)
}

4
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/QuickPicks.kt
View File

@@ -47,7 +47,7 @@ import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.query
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.ShimmerHost
@@ -89,7 +89,7 @@ fun QuickPicks(
val menuState = LocalMenuState.current
val windowInsets = LocalPlayerAwareWindowInsets.current
var trending by persist<DetailedSong?>("home/trending")
var trending by persist<Song?>("home/trending")
var relatedPageResult by persist<Result<Innertube.RelatedPage?>?>(tag = "home/relatedPageResult")

8
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt
View File

@@ -36,8 +36,8 @@ import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.PlaylistWithSongs
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.models.SongPlaylistMap
import it.vfsfitvnm.vimusic.query
import it.vfsfitvnm.vimusic.transaction
@@ -158,7 +158,7 @@ fun LocalPlaylistSongs(
enabled = playlistWithSongs?.songs?.isNotEmpty() == true,
onClick = {
playlistWithSongs?.songs
?.map(DetailedSong::asMediaItem)
?.map(Song::asMediaItem)
?.let { mediaItems ->
binder?.player?.enqueue(mediaItems)
}
@@ -266,7 +266,7 @@ fun LocalPlaylistSongs(
},
onClick = {
playlistWithSongs?.songs
?.map(DetailedSong::asMediaItem)
?.map(Song::asMediaItem)
?.let { mediaItems ->
binder?.stopRadio()
binder?.player?.forcePlayAtIndex(mediaItems, index)
@@ -288,7 +288,7 @@ fun LocalPlaylistSongs(
if (songs.isNotEmpty()) {
binder?.stopRadio()
binder?.player?.forcePlayFromBeginning(
songs.shuffled().map(DetailedSong::asMediaItem)
songs.shuffled().map(Song::asMediaItem)
)
}
}

6
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LocalSongSearch.kt
View File

@@ -27,7 +27,7 @@ import it.vfsfitvnm.innertube.models.NavigationEndpoint
import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Song
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
import it.vfsfitvnm.vimusic.ui.components.themed.Header
@@ -54,7 +54,7 @@ fun LocalSongSearch(
val binder = LocalPlayerServiceBinder.current
val menuState = LocalMenuState.current
var items by persistList<DetailedSong>("search/local/songs")
var items by persistList<Song>("search/local/songs")
LaunchedEffect(textFieldValue.text) {
if (textFieldValue.text.length > 1) {
@@ -105,7 +105,7 @@ fun LocalSongSearch(
items(
items = items,
key = DetailedSong::id,
key = Song::id,
) { song ->
SongItem(
song = song,