0ct0pu5/ViMusic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove close button from menu

Browse source
This commit is contained in:
vfsfitvnm 2022-07-09 16:13:35 +02:00
parent 29025da7e9
commit 32aeadf87d
7 changed files with 9 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
View file

@ -18,17 +18,18 @@ import it.vfsfitvnm.route.RouteHandler
import it.vfsfitvnm.route.empty
import it.vfsfitvnm.vimusic.*
import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.models.Playlist
import it.vfsfitvnm.vimusic.models.SongPlaylistMap
import it.vfsfitvnm.vimusic.models.DetailedSong
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.screens.rememberAlbumRoute
import it.vfsfitvnm.vimusic.ui.screens.rememberArtistRoute
import it.vfsfitvnm.vimusic.ui.screens.rememberCreatePlaylistRoute
import it.vfsfitvnm.vimusic.ui.screens.rememberAlbumRoute
import it.vfsfitvnm.vimusic.utils.*
import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint
import kotlinx.coroutines.Dispatchers
@ExperimentalAnimationApi
@Composable
fun InFavoritesMediaItemMenu(
@ -344,8 +345,6 @@ fun MediaItemMenu(
detectTapGestures { }
}
) {
MenuCloseButton(onClick = onDismiss)
onStartRadio?.let { onStartRadio ->
MenuEntry(
icon = R.drawable.radio,

37
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/Menu.kt
View file

@ -20,7 +20,7 @@ import it.vfsfitvnm.vimusic.ui.styling.LocalColorPalette
import it.vfsfitvnm.vimusic.ui.styling.LocalTypography
import it.vfsfitvnm.vimusic.utils.medium
import it.vfsfitvnm.vimusic.utils.secondary
import it.vfsfitvnm.vimusic.utils.semiBold
@Composable
inline fun Menu(
@ -31,30 +31,19 @@ inline fun Menu(
Column(
modifier = modifier
.padding(top = 48.dp)
.verticalScroll(rememberScrollState())
.fillMaxWidth()
.background(
color = colorPalette.elevatedBackground,
shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)
)
.padding(top = 8.dp)
.padding(vertical = 8.dp),
content = content
)
}
@Composable
inline fun BasicMenu(
noinline onDismiss: () -> Unit,
modifier: Modifier = Modifier,
content: @Composable ColumnScope.() -> Unit
) {
Menu(modifier = modifier) {
MenuCloseButton(onClick = onDismiss)
content()
}
}
@Composable
fun MenuEntry(
@DrawableRes icon: Int,
@ -114,7 +103,7 @@ fun MenuIconButton(
Box(
modifier = modifier
.padding(horizontal = 12.dp)
.padding(horizontal = 14.dp)
) {
Image(
painter = painterResource(icon),
@ -122,24 +111,12 @@ fun MenuIconButton(
colorFilter = ColorFilter.tint(colorPalette.text),
modifier = Modifier
.clickable(onClick = onClick)
.padding(horizontal = 8.dp, vertical = 16.dp)
.padding(horizontal = 8.dp, vertical = 8.dp)
.size(20.dp)
)
}
}
@Composable
fun MenuCloseButton(
onClick: () -> Unit,
modifier: Modifier = Modifier
) {
MenuIconButton(
icon = R.drawable.close,
onClick = onClick,
modifier = modifier
)
}
@Composable
fun MenuBackButton(
onClick: () -> Unit,
@ -151,5 +128,3 @@ fun MenuBackButton(
modifier = modifier
)
}

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/AlbumScreen.kt
View file

@ -126,8 +126,6 @@ fun AlbumScreen(
.clickable {
menuState.display {
Menu {
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.enqueue,
text = "Enqueue",

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

@ -114,8 +114,6 @@ fun BuiltInPlaylistScreen(
.clickable {
menuState.display {
Menu {
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.enqueue,
text = "Enqueue",

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/IntentUriScreen.kt
View file

@ -157,8 +157,6 @@ fun IntentUriScreen(uri: Uri) {
.clickable {
menuState.display {
Menu {
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.enqueue,
text = "Enqueue",

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

@ -148,8 +148,6 @@ fun LocalPlaylistScreen(
.clickable {
menuState.display {
Menu {
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.enqueue,
text = "Enqueue",

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/PlaylistScreen.kt
View file

@ -121,8 +121,6 @@ fun PlaylistScreen(
.clickable {
menuState.display {
Menu {
MenuCloseButton(onClick = menuState::hide)
MenuEntry(
icon = R.drawable.enqueue,
text = "Enqueue",