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

Remove menu for home page song collections

Browse Source
This commit is contained in:
vfsfitvnm
2022-06-17 20:34:51 +02:00
parent 9478f1939d
commit 4da4e4faff
1 changed files with 7 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt
View File

@@ -28,7 +28,6 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import androidx.media3.common.Player
import it.vfsfitvnm.route.RouteHandler import it.vfsfitvnm.route.RouteHandler
import it.vfsfitvnm.route.fastFade import it.vfsfitvnm.route.fastFade
import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.Database
@@ -39,7 +38,6 @@ import it.vfsfitvnm.vimusic.models.Playlist
import it.vfsfitvnm.vimusic.models.SearchQuery import it.vfsfitvnm.vimusic.models.SearchQuery
import it.vfsfitvnm.vimusic.models.SongWithInfo import it.vfsfitvnm.vimusic.models.SongWithInfo
import it.vfsfitvnm.vimusic.services.StopRadioCommand import it.vfsfitvnm.vimusic.services.StopRadioCommand
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.TopAppBar import it.vfsfitvnm.vimusic.ui.components.TopAppBar
import it.vfsfitvnm.vimusic.ui.components.themed.* import it.vfsfitvnm.vimusic.ui.components.themed.*
import it.vfsfitvnm.vimusic.ui.styling.LocalColorPalette import it.vfsfitvnm.vimusic.ui.styling.LocalColorPalette
@@ -145,7 +143,6 @@ fun HomeScreen() {
host { host {
val player = LocalYoutubePlayer.current val player = LocalYoutubePlayer.current
val menuState = LocalMenuState.current
val density = LocalDensity.current val density = LocalDensity.current
val thumbnailSize = remember { val thumbnailSize = remember {
@@ -297,6 +294,7 @@ fun HomeScreen() {
}, },
style = typography.m.semiBold, style = typography.m.semiBold,
modifier = Modifier modifier = Modifier
.alignByBaseline()
.animateContentSize() .animateContentSize()
) )
@@ -318,58 +316,21 @@ fun HomeScreen() {
preferences.homePageSongCollection = nextSongCollection preferences.homePageSongCollection = nextSongCollection
} }
) )
// .alignByBaseline() .alignByBaseline()
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
.animateContentSize() .animateContentSize()
) )
} }
Image( Image(
painter = painterResource(R.drawable.ellipsis_horizontal), painter = painterResource(R.drawable.shuffle),
contentDescription = null, contentDescription = null,
colorFilter = ColorFilter.tint(colorPalette.text), colorFilter = ColorFilter.tint(colorPalette.text),
modifier = Modifier modifier = Modifier
.clickable { .clickable(enabled = songCollection.isNotEmpty()) {
menuState.display { player?.mediaController?.let {
BasicMenu(onDismiss = menuState::hide) { it.sendCustomCommand(StopRadioCommand, Bundle.EMPTY)
MenuEntry( it.forcePlayFromBeginning(songCollection.shuffled().map(SongWithInfo::asMediaItem))
icon = R.drawable.play,
text = "Play",
enabled = songCollection.isNotEmpty(),
onClick = {
menuState.hide()
player?.mediaController?.let {
it.sendCustomCommand(StopRadioCommand, Bundle.EMPTY)
it.forcePlayFromBeginning(songCollection.map(SongWithInfo::asMediaItem))
}
}
)
MenuEntry(
icon = R.drawable.shuffle,
text = "Shuffle",
enabled = songCollection.isNotEmpty(),
onClick = {
menuState.hide()
player?.mediaController?.let {
it.sendCustomCommand(StopRadioCommand, Bundle.EMPTY)
it.forcePlayFromBeginning(songCollection.shuffled().map(SongWithInfo::asMediaItem))
}
}
)
MenuEntry(
icon = R.drawable.time,
text = "Enqueue",
enabled = songCollection.isNotEmpty() && player?.playbackState == Player.STATE_READY,
onClick = {
menuState.hide()
player?.mediaController?.enqueue(
songCollection.map(SongWithInfo::asMediaItem)
)
}
)
}
} }
} }
.padding(horizontal = 8.dp, vertical = 8.dp) .padding(horizontal = 8.dp, vertical = 8.dp)