-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(gestures): better volume and brightness gestures
- Loading branch information
1 parent
9121fa4
commit 19d5ae6
Showing
6 changed files
with
247 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
app/src/main/java/live/mehiz/mpvkt/ui/player/controls/components/VerticalSliders.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| package live.mehiz.mpvkt.ui.player.controls.components | ||
|
|
||
| import androidx.compose.animation.core.animateFloatAsState | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.aspectRatio | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.automirrored.filled.VolumeDown | ||
| import androidx.compose.material.icons.automirrored.filled.VolumeMute | ||
| import androidx.compose.material.icons.automirrored.filled.VolumeOff | ||
| import androidx.compose.material.icons.automirrored.filled.VolumeUp | ||
| import androidx.compose.material.icons.filled.BrightnessHigh | ||
| import androidx.compose.material.icons.filled.BrightnessLow | ||
| import androidx.compose.material.icons.filled.BrightnessMedium | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
|
|
||
| val percentage: (Float, ClosedFloatingPointRange<Float>) -> Float = { value, range -> | ||
| ((value - range.start) / (range.endInclusive - range.start)).coerceIn(0f, 1f) | ||
| } | ||
|
|
||
| val percentageInt: (Int, ClosedRange<Int>) -> Float = { value, range -> | ||
| ((value - range.start - 0f) / (range.endInclusive - range.start)).coerceIn(0f, 1f) | ||
| } | ||
|
|
||
| @Composable | ||
| @Preview | ||
| fun VerticalSlider( | ||
| value: Float = 5f, | ||
| range: ClosedFloatingPointRange<Float> = 0f..100f | ||
| ) { | ||
| require(range.contains(value)) { "Value must be within the provided range" } | ||
| Box( | ||
| modifier = Modifier | ||
| .height(120.dp) | ||
| .aspectRatio(0.2f) | ||
| .clip(RoundedCornerShape(16.dp)) | ||
| .background(MaterialTheme.colorScheme.background), | ||
| contentAlignment = Alignment.BottomCenter | ||
| ) { | ||
| val targetHeight by animateFloatAsState(percentage(value, range), label = "") | ||
| Box( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .fillMaxHeight(targetHeight) | ||
| .background(MaterialTheme.colorScheme.tertiary) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @Composable | ||
| @Preview | ||
| fun VerticalSlider( | ||
| value: Int = 5, | ||
| range: ClosedRange<Int> = 0..100 | ||
| ) { | ||
| require(range.contains(value)) { "Value must be within the provided range" } | ||
| Box( | ||
| modifier = Modifier | ||
| .height(120.dp) | ||
| .aspectRatio(0.2f) | ||
| .clip(RoundedCornerShape(16.dp)) | ||
| .background(MaterialTheme.colorScheme.background), | ||
| contentAlignment = Alignment.BottomCenter | ||
| ) { | ||
| val targetHeight by animateFloatAsState(percentageInt(value, range), label = "") | ||
| Box( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .fillMaxHeight(targetHeight) | ||
| .background(MaterialTheme.colorScheme.tertiary) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun BrightnessSlider( | ||
| brightness: Float, | ||
| range: ClosedFloatingPointRange<Float>, | ||
| ) { | ||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.spacedBy(8.dp) | ||
| ) { | ||
| Text( | ||
| (brightness * 100).toInt().toString(), | ||
| style = MaterialTheme.typography.bodySmall | ||
| ) | ||
| VerticalSlider( | ||
| brightness, | ||
| range | ||
| ) | ||
| Icon( | ||
| when (percentage(brightness, range)) { | ||
| in 0f..0.3f -> Icons.Default.BrightnessLow | ||
| in 0.3f..0.6f -> Icons.Default.BrightnessMedium | ||
| in 0.6f..1f -> Icons.Default.BrightnessHigh | ||
| else -> Icons.Default.BrightnessMedium | ||
| }, | ||
| null | ||
| ) | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @Composable | ||
| fun VolumeSlider( | ||
| volume: Int, | ||
| range: ClosedRange<Int> | ||
| ) { | ||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.spacedBy(8.dp) | ||
| ) { | ||
| Text( | ||
| volume.toString(), | ||
| style = MaterialTheme.typography.bodySmall | ||
| ) | ||
| VerticalSlider( | ||
| volume, | ||
| range | ||
| ) | ||
| Icon( | ||
| when(percentageInt(volume, range)) { | ||
| 0f -> Icons.AutoMirrored.Default.VolumeOff | ||
| in 0f..0.3f -> Icons.AutoMirrored.Default.VolumeMute | ||
| in 0.3f..0.6f -> Icons.AutoMirrored.Default.VolumeDown | ||
| in 0.6f..1f -> Icons.AutoMirrored.Default.VolumeUp | ||
| else -> Icons.AutoMirrored.Default.VolumeOff | ||
| }, | ||
| null | ||
| ) | ||
| } | ||
| } |