beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix BottomSheet nestedScrollConnection buggy fling logic

Browse source
This commit is contained in:
vfsfitvnm 2022-08-30 11:34:11 +02:00
parent 0e3e36acb2
commit ddb6c40c76
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/BottomSheet.kt
View file

@ -39,7 +39,6 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.Velocity import androidx.compose.ui.unit.Velocity
import kotlin.math.absoluteValue
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -240,14 +239,23 @@ class BottomSheetState(
override suspend fun onPreFling(available: Velocity): Velocity { override suspend fun onPreFling(available: Velocity): Velocity {
if (isTopReached) { if (isTopReached) {
val velocity = -available.y
coroutineScope { coroutineScope {
if (available.y.absoluteValue > 1000) { if (velocity > 250) {
expand()
} else if (velocity < -250) {
collapse() collapse()
} else { } else {
if (animatable.upperBound!! - value > value - collapsedBound) { val l0 = dismissedBound
collapse() val l1 = (collapsedBound - dismissedBound) / 2
} else { val l2 = (expandedBound - collapsedBound) / 2
expand() val l3 = expandedBound
when (value) {
in l0..l1 -> collapse()
in l1..l2 -> collapse()
in l2..l3 -> expand()
else -> Unit
} }
} }
} }