Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add shadows to make music player elements more readable #329

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Add shadows to make music player elements more readable #329

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd54a6
Add shadows to make music player elements more readable
newmskywalker Oct 3, 2024
a56ea5a
disable shuffle button when the track isn't playing
newmskywalker Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 33 additions & 8 deletions android/features/music-player/src/main/java/io/newm/feature/musicplayer/MusicPlayerViewer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
Expand All @@ -30,8 +31,10 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shadow
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -142,7 +145,15 @@ internal fun MusicPlayerViewer(
.padding(vertical = 16.dp),
horizontalArrangement = Arrangement.SpaceBetween
) {
IconButton(onClick = onNavigateUp) {
val buttonModifier =
Modifier
.clip(CircleShape)
.background(Color.Black.copy(alpha = 0.4f))

IconButton(
modifier = buttonModifier,
onClick = onNavigateUp
) {
Icon(
painter = painterResource(id = R.drawable.ic_arrow_down),
contentDescription = "Back",
Expand All @@ -151,6 +162,7 @@ internal fun MusicPlayerViewer(
}

ShareButton(
modifier = buttonModifier,
songTitle = playbackStatus.track?.title,
songArtist = playbackStatus.track?.artist
)
Expand All @@ -166,15 +178,19 @@ internal fun MusicPlayerViewer(
textAlign = TextAlign.Center,
lineHeight = 32.sp,
lineBreak = LineBreak.Heading,
shadow = Shadow(color = Black, blurRadius = 10f, offset = Offset(2f, 3f)),
)
)
Text(
text = song.artist,
modifier = Modifier.padding(top = 4.dp, bottom = 28.dp),
color = White,
fontFamily = inter,
fontWeight = FontWeight.Medium,
fontSize = 14.sp,
style = LocalTextStyle.current.copy(
color = White,
fontFamily = inter,
fontWeight = FontWeight.Medium,
fontSize = 14.sp,
shadow = Shadow(color = Black, blurRadius = 10f, offset = Offset(2f, 0f)),
)
)
MusicPlayerControls(playbackStatus, onEvent)
Spacer(modifier = Modifier.height(16.dp))
Expand Down Expand Up @@ -262,6 +278,7 @@ fun PlaybackControlPanel(
onClick = { onEvent(PlaybackUiEvent.Next) })
Spacer(modifier = Modifier.weight(1f))
ShuffleButton(
enabled = playbackStatus.state == PlaybackState.PLAYING,
shuffleMode = playbackStatus.shuffleMode,
onClick = { onEvent(PlaybackUiEvent.ToggleShuffle) }
)
Expand All @@ -273,13 +290,21 @@ fun PlaybackControlPanel(
@Composable
fun ShuffleButton(
onClick: () -> Unit,
shuffleMode: Boolean
shuffleMode: Boolean,
enabled: Boolean
) {
IconButton(onClick = onClick) {
IconButton(
onClick = onClick,
enabled = enabled
) {
Icon(
painter = painterResource(R.drawable.ic_music_player_shuffle),
contentDescription = "Shuffle",
tint = if (shuffleMode) DarkViolet else White
tint = when {
enabled.not() -> Gray500
shuffleMode -> DarkViolet
else -> White
}
)
}
}
Expand Down
Loading