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

Improve MediaItemMenu UI

Browse Source
This commit is contained in:
vfsfitvnm
2022-10-07 12:08:52 +02:00
parent 3364bb9f30
commit b2ad011cfd
13 changed files with 440 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/Routes.kt
View File

@@ -20,7 +20,6 @@ val playlistRoute = Route1<String?>("playlistRoute")
val searchResultRoute = Route1<String>("searchResultRoute")
val searchRoute = Route1<String>("searchRoute")
val settingsRoute = Route0("settingsRoute")
val viewPlaylistsRoute = Route0("createPlaylistRoute")
@SuppressLint("ComposableNaming")
@Suppress("NOTHING_TO_INLINE")

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

@@ -88,7 +88,7 @@ fun AlbumSongs(
headerContent {
SecondaryTextButton(
text = "Enqueue",
isEnabled = songs.isNotEmpty(),
enabled = songs.isNotEmpty(),
onClick = {
binder?.player?.enqueue(songs.map(DetailedSong::asMediaItem))
}

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

@@ -83,7 +83,7 @@ fun ArtistLocalSongs(
headerContent {
SecondaryTextButton(
text = "Enqueue",
isEnabled = !songs.isNullOrEmpty(),
enabled = !songs.isNullOrEmpty(),
onClick = {
binder?.player?.enqueue(songs!!.map(DetailedSong::asMediaItem))
}

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

@@ -23,9 +23,8 @@ import it.vfsfitvnm.vimusic.savers.DetailedSongListSaver
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
import it.vfsfitvnm.vimusic.ui.components.themed.Header
import it.vfsfitvnm.vimusic.ui.components.themed.InFavoritesMediaItemMenu
import it.vfsfitvnm.vimusic.ui.components.themed.InHistoryMediaItemMenu
import it.vfsfitvnm.vimusic.ui.components.themed.PrimaryButton
import it.vfsfitvnm.vimusic.ui.components.themed.NonQueuedMediaItemMenu
import it.vfsfitvnm.vimusic.ui.components.themed.SecondaryTextButton
import it.vfsfitvnm.vimusic.ui.items.SongItem
import it.vfsfitvnm.vimusic.ui.styling.Dimensions
@@ -94,7 +93,7 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
) {
SecondaryTextButton(
text = "Enqueue",
isEnabled = songs.isNotEmpty(),
enabled = songs.isNotEmpty(),
onClick = {
binder?.player?.enqueue(songs.map(DetailedSong::asMediaItem))
}
@@ -121,8 +120,8 @@ fun BuiltInPlaylistSongs(builtInPlaylist: BuiltInPlaylist) {
onLongClick = {
menuState.display {
when (builtInPlaylist) {
BuiltInPlaylist.Favorites -> InFavoritesMediaItemMenu(
song = song,
BuiltInPlaylist.Favorites -> NonQueuedMediaItemMenu(
mediaItem = song.asMediaItem,
onDismiss = menuState::hide
)

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

@@ -150,7 +150,7 @@ fun LocalPlaylistSongs(
Header(title = playlistWithSongs?.playlist?.name ?: "Unknown") {
SecondaryTextButton(
text = "Enqueue",
isEnabled = playlistWithSongs?.songs?.isNotEmpty() == true,
enabled = playlistWithSongs?.songs?.isNotEmpty() == true,
onClick = {
playlistWithSongs?.songs
?.map(DetailedSong::asMediaItem)

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Lyrics.kt
View File

@@ -351,7 +351,7 @@ fun Lyrics(
MenuEntry(
icon = R.drawable.download,
text = "Fetch lyrics again",
isEnabled = lyrics != null,
enabled = lyrics != null,
onClick = {
menuState.hide()
query {

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistSongList.kt
View File

@@ -125,7 +125,7 @@ fun PlaylistSongList(
Header(title = playlistPage?.title ?: "Unknown") {
SecondaryTextButton(
text = "Enqueue",
isEnabled = playlistPage?.songsPage?.items?.isNotEmpty() == true,
enabled = playlistPage?.songsPage?.items?.isNotEmpty() == true,
onClick = {
playlistPage?.songsPage?.items?.map(Innertube.SongItem::asMediaItem)?.let { mediaItems ->
binder?.player?.enqueue(mediaItems)