hamystudio/muza
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix another BottomSheet regression (of #457e6712)

Browse Source
This commit is contained in:
vfsfitvnm
2022-07-26 15:14:44 +02:00
parent 1d259ebaa6
commit f86970e09a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/BottomSheet.kt
View File

@@ -82,10 +82,10 @@ fun BottomSheet(
state.snapTo(initialValue)
},
onDragEnd = {
val velocity = velocityTracker.calculateVelocity().y.absoluteValue
val velocity = velocityTracker.calculateVelocity().y
velocityTracker.resetTracking()
if (velocity.absoluteValue > 300 && initialValue != state.value) {
if (velocity.absoluteValue > 250 && initialValue != state.value) {
when (initialValue) {
state.expandedBound -> state.collapse()
state.collapsedBound -> if (initialValue > state.value && onDismiss != null) {
@@ -94,6 +94,7 @@ fun BottomSheet(
} else {
state.expand()
}
else -> state.expand()
}
} else {
val l0 = state.dismissedBound
@@ -112,7 +113,9 @@ fun BottomSheet(
}
in l1..l2 -> state.collapse()
in l2..l3 -> state.expand()
else -> {}
else -> {
}
}
}
@@ -304,8 +307,8 @@ fun rememberBottomSheetState(
}
val animatable = Animatable(initialValue, Dp.VectorConverter).also {
it.updateBounds(dismissedBound.coerceAtMost(expandedBound), expandedBound)
}
it.updateBounds(dismissedBound.coerceAtMost(expandedBound), expandedBound)
}
BottomSheetState(
draggableState = DraggableState { delta ->