lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Adjust music widget to new material 3 slider style

Browse Source
This commit is contained in:
MM20 2024-04-19 22:48:13 +02:00
parent 4a69b19145
commit 734f5681e0
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
View File

@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredHeight
import androidx.compose.foundation.layout.requiredHeightIn import androidx.compose.foundation.layout.requiredHeightIn
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentHeight
@ -44,6 +45,7 @@ import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.PlainTooltip import androidx.compose.material3.PlainTooltip
import androidx.compose.material3.Slider import androidx.compose.material3.Slider
import androidx.compose.material3.SliderDefaults
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TooltipBox import androidx.compose.material3.TooltipBox
import androidx.compose.material3.TooltipDefaults import androidx.compose.material3.TooltipDefaults
@ -153,8 +155,6 @@ fun MusicWidget(widget: MusicWidget) {
) )
} }
Column { Column {
val dur = duration val dur = duration
var pos by remember(position) { mutableStateOf(position) } var pos by remember(position) { mutableStateOf(position) }
@ -168,7 +168,7 @@ fun MusicWidget(widget: MusicWidget) {
Slider( Slider(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 8.dp) .padding(horizontal = 14.dp)
.requiredHeightIn(max = 20.dp), .requiredHeightIn(max = 20.dp),
value = (if (isDragged) seekPosition else pos?.toFloat()) ?: 0f, value = (if (isDragged) seekPosition else pos?.toFloat()) ?: 0f,
valueRange = 0f..dur.toFloat(), valueRange = 0f..dur.toFloat(),
@ -182,10 +182,16 @@ fun MusicWidget(widget: MusicWidget) {
pos = it.toLong() pos = it.toLong()
} }
}, },
track = {
SliderDefaults.Track(
sliderState = it,
modifier = Modifier.requiredHeight(4.dp)
)
}
) )
} else { } else {
LinearProgressIndicator( LinearProgressIndicator(
progress = (pos?.toFloat() ?: 0f) / dur.toFloat(), progress = { (pos?.toFloat() ?: 0f) / dur.toFloat() },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 8.dp, horizontal = 16.dp), .padding(vertical = 8.dp, horizontal = 16.dp),
@ -294,7 +300,7 @@ fun MusicWidget(widget: MusicWidget) {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp), .padding(horizontal = 16.dp, vertical = 16.dp),
horizontalArrangement = Arrangement.SpaceAround, horizontalArrangement = Arrangement.SpaceAround,
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@ -313,13 +319,10 @@ fun MusicWidget(widget: MusicWidget) {
val playPauseIcon = val playPauseIcon =
AnimatedImageVector.animatedVectorResource(R.drawable.anim_ic_play_pause) AnimatedImageVector.animatedVectorResource(R.drawable.anim_ic_play_pause)
FilledTonalIconButton( FilledTonalIconButton(
modifier = Modifier
.size(40.dp),
colors = IconButtonDefaults.filledTonalIconButtonColors( colors = IconButtonDefaults.filledTonalIconButtonColors(
containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = LocalCardStyle.current.opacity), containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = LocalCardStyle.current.opacity),
), ),
onClick = { viewModel.togglePause() }, onClick = { viewModel.togglePause() },
shape = MaterialTheme.shapes.extraSmall,
) { ) {
Icon( Icon(
painter = rememberAnimatedVectorPainter( painter = rememberAnimatedVectorPainter(