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

Add enqueue and playlist icons

Browse Source
This commit is contained in:
vfsfitvnm
2022-07-08 22:11:57 +02:00
parent cb29edc3b8
commit 872ec273dd
9 changed files with 105 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,7 +321,7 @@ fun MediaItemMenu(
onAddToPlaylist?.let { onAddToPlaylist ->
playlistPreviews.forEach { playlistPreview ->
MenuEntry(
icon = R.drawable.list,
icon = R.drawable.playlist,
text = playlistPreview.playlist.name,
secondaryText = "${playlistPreview.songCount} songs",
onClick = {
@@ -370,7 +370,7 @@ fun MediaItemMenu(
onPlayNext?.let { onPlayNext ->
MenuEntry(
icon = R.drawable.play,
icon = R.drawable.play_skip_forward,
text = "Play next",
onClick = {
onDismiss()
@@ -381,7 +381,7 @@ fun MediaItemMenu(
onEnqueue?.let { onEnqueue ->
MenuEntry(
icon = R.drawable.time,
icon = R.drawable.enqueue,
text = "Enqueue",
onClick = {
onDismiss()
@@ -390,42 +390,9 @@ fun MediaItemMenu(
)
}
onRemoveFromQueue?.let { onRemoveFromQueue ->
MenuEntry(
icon = R.drawable.trash,
text = "Remove",
onClick = {
onDismiss()
onRemoveFromQueue()
}
)
}
onRemoveFromFavorites?.let { onRemoveFromFavorites ->
MenuEntry(
icon = R.drawable.heart_dislike,
text = "Dislike",
onClick = {
onDismiss()
onRemoveFromFavorites()
}
)
}
onRemoveFromPlaylist?.let { onRemoveFromPlaylist ->
MenuEntry(
icon = R.drawable.trash,
text = "Remove",
onClick = {
onDismiss()
onRemoveFromPlaylist()
}
)
}
if (onAddToPlaylist != null) {
MenuEntry(
icon = R.drawable.list,
icon = R.drawable.playlist,
text = "Add to playlist",
onClick = {
viewPlaylistsRoute()
@@ -481,11 +448,44 @@ fun MediaItemMenu(
)
}
onHideFromDatabase?.let { onDeleteFromDatabase ->
onRemoveFromQueue?.let { onRemoveFromQueue ->
MenuEntry(
icon = R.drawable.trash,
text = "Remove from queue",
onClick = {
onDismiss()
onRemoveFromQueue()
}
)
}
onRemoveFromFavorites?.let { onRemoveFromFavorites ->
MenuEntry(
icon = R.drawable.heart_dislike,
text = "Remove from favorites",
onClick = {
onDismiss()
onRemoveFromFavorites()
}
)
}
onRemoveFromPlaylist?.let { onRemoveFromPlaylist ->
MenuEntry(
icon = R.drawable.trash,
text = "Remove from playlist",
onClick = {
onDismiss()
onRemoveFromPlaylist()
}
)
}
onHideFromDatabase?.let { onHideFromDatabase ->
MenuEntry(
icon = R.drawable.trash,
text = "Hide",
onClick = onDeleteFromDatabase
onClick = onHideFromDatabase
)
}
}

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

@@ -148,7 +148,7 @@ fun AlbumScreen(
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.time,
icon = R.drawable.enqueue,
text = "Enqueue",
onClick = {
menuState.hide()
@@ -159,7 +159,7 @@ fun AlbumScreen(
)
MenuEntry(
icon = R.drawable.list,
icon = R.drawable.playlist,
text = "Import as playlist",
onClick = {
menuState.hide()

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

@@ -117,7 +117,7 @@ fun BuiltInPlaylistScreen(
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.time,
icon = R.drawable.enqueue,
text = "Enqueue",
isEnabled = songs.isNotEmpty(),
onClick = {

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

@@ -160,7 +160,7 @@ fun IntentUriScreen(uri: Uri) {
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.time,
icon = R.drawable.enqueue,
text = "Enqueue",
onClick = {
menuState.hide()
@@ -177,7 +177,7 @@ fun IntentUriScreen(uri: Uri) {
)
MenuEntry(
icon = R.drawable.list,
icon = R.drawable.playlist,
text = "Import as playlist",
onClick = {
isImportingAsPlaylist = true

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

@@ -151,7 +151,7 @@ fun LocalPlaylistScreen(
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.time,
icon = R.drawable.enqueue,
text = "Enqueue",
isEnabled = playlistWithSongs.songs.isNotEmpty(),
onClick = {

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

@@ -124,7 +124,7 @@ fun PlaylistScreen(
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.time,
icon = R.drawable.enqueue,
text = "Enqueue",
onClick = {
menuState.hide()
@@ -143,7 +143,7 @@ fun PlaylistScreen(
)
MenuEntry(
icon = R.drawable.list,
icon = R.drawable.playlist,
text = "Import",
onClick = {
menuState.hide()