BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-12-12 09:13:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: use absolute dragging distance in Switch

Browse Source
This commit is contained in:
fankesyooni
2023-11-12 23:56:52 +08:00
parent e42d117d22
commit f90e2c8459
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Switch.kt
View File

@@ -103,6 +103,7 @@ fun Switch(
val halfWidth = maxOffset / 2 val halfWidth = maxOffset / 2
val hovered by interactionSource.collectIsHoveredAsState() val hovered by interactionSource.collectIsHoveredAsState()
var dragging by remember { mutableStateOf(false) } var dragging by remember { mutableStateOf(false) }
var absOffsetX by remember { mutableStateOf(0f) }
var offsetX by remember { mutableStateOf(0f) } var offsetX by remember { mutableStateOf(0f) }
var distance by remember { mutableStateOf(0f) } var distance by remember { mutableStateOf(0f) }
if (!hovered && !dragging) offsetX = if (checked) maxOffset else 0f if (!hovered && !dragging) offsetX = if (checked) maxOffset else 0f
@@ -110,7 +111,8 @@ fun Switch(
val animatedScale by animateFloatAsState(if (hovered || dragging) style.thumbGain else 1f) val animatedScale by animateFloatAsState(if (hovered || dragging) style.thumbGain else 1f)
var trackColor by remember { mutableStateOf(colors.trackInactive) } var trackColor by remember { mutableStateOf(colors.trackInactive) }
fun updateTrackColor() { fun updateTrackColor() {
trackColor = lerp(colors.trackInactive, colors.trackActive, offsetX / maxOffset) val fraction = (offsetX / maxOffset).coerceIn(0f, 1f)
trackColor = lerp(colors.trackInactive, colors.trackActive, fraction)
} }
updateTrackColor() updateTrackColor()
val animatedTrackColor by animateColorAsState(trackColor) val animatedTrackColor by animateColorAsState(trackColor)
@@ -151,10 +153,18 @@ fun Switch(
orientation = Orientation.Horizontal, orientation = Orientation.Horizontal,
interactionSource = interactionSource, interactionSource = interactionSource,
state = rememberDraggableState { delta -> state = rememberDraggableState { delta ->
offsetX = (offsetX + delta).coerceIn(0f, maxOffset) absOffsetX += delta
when {
absOffsetX in 0f..maxOffset -> offsetX += delta
absOffsetX < 0f -> offsetX = 0f
absOffsetX > maxOffset -> offsetX = maxOffset
}
updateTrackColor() updateTrackColor()
}, },
onDragStarted = { dragging = true }, onDragStarted = {
dragging = true
absOffsetX = offsetX
},
onDragStopped = { onDragStopped = {
dragging = false dragging = false
if (offsetX >= halfWidth) { if (offsetX >= halfWidth) {