+
Skip to content

Fix wonky player progress bar #453

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

Merged
merged 1 commit into from
Oct 3, 2022
Merged

Fix wonky player progress bar #453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 17 additions & 20 deletions app/src/main/java/me/vanpetegem/accentor/ui/player/Controls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.vanpetegem.accentor.ui.player

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand All @@ -11,7 +12,6 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Slider
import androidx.compose.material3.SliderDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -48,7 +48,7 @@ fun Controls(playerViewModel: PlayerViewModel = viewModel()) {
painterResource(R.drawable.ic_repeat_all),
contentDescription = stringResource(R.string.repeat_all),
modifier = Modifier.height(32.dp).aspectRatio(1f),
tint = MaterialTheme.colorScheme.secondary.copy(alpha = LocalContentAlpha.current),
tint = MaterialTheme.colorScheme.primary.copy(alpha = LocalContentAlpha.current),
)
}
}
Expand All @@ -58,7 +58,7 @@ fun Controls(playerViewModel: PlayerViewModel = viewModel()) {
painterResource(R.drawable.ic_repeat_one),
contentDescription = stringResource(R.string.repeat_one),
modifier = Modifier.height(32.dp).aspectRatio(1f),
tint = MaterialTheme.colorScheme.secondary.copy(alpha = LocalContentAlpha.current),
tint = MaterialTheme.colorScheme.primary.copy(alpha = LocalContentAlpha.current),
)
}
}
Expand Down Expand Up @@ -127,7 +127,7 @@ fun Controls(playerViewModel: PlayerViewModel = viewModel()) {
painterResource(R.drawable.ic_shuffle_all),
contentDescription = stringResource(R.string.shuffle_all),
modifier = Modifier.height(32.dp).aspectRatio(1f),
tint = MaterialTheme.colorScheme.secondary.copy(alpha = LocalContentAlpha.current),
tint = MaterialTheme.colorScheme.primary.copy(alpha = LocalContentAlpha.current),
)
}
} else {
Expand All @@ -148,22 +148,19 @@ fun Controls(playerViewModel: PlayerViewModel = viewModel()) {
val trackLength = currentTrack?.length ?: 1
Timer { playerViewModel.updateCurrentPosition() }
Text(if (seekPosition != null) seekPosition.formatTrackLength() else currentPosition.formatTrackLength())
Slider(
seekPosition?.toFloat() ?: (currentPosition?.toFloat() ?: 0f),
onValueChange = { seekPosition = it.toInt() },
onValueChangeFinished = {
val positionCopy = seekPosition!!
scope.launch(IO) { playerViewModel.seekTo(positionCopy) }
seekPosition = null
},
enabled = !buffering,
modifier = Modifier.weight(1f).padding(horizontal = 8.dp),
valueRange = 0f..(trackLength.toFloat()),
colors = SliderDefaults.colors(
thumbColor = MaterialTheme.colorScheme.secondary,
activeTrackColor = MaterialTheme.colorScheme.secondary,
),
)
Box(modifier = Modifier.weight(1f).padding(horizontal = 8.dp)) {
Slider(
seekPosition?.toFloat() ?: (currentPosition?.toFloat() ?: 0f),
onValueChange = { seekPosition = it.toInt() },
onValueChangeFinished = {
val positionCopy = seekPosition!!
scope.launch(IO) { playerViewModel.seekTo(positionCopy) }
seekPosition = null
},
enabled = !buffering,
valueRange = 0f..(trackLength.toFloat()),
)
}
Text(currentTrack?.length.formatTrackLength())
}
}
Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载