Remove scrollable animation workaround (#9690)

Reverts ba93060e59
Related https://android-review.googlesource.com/c/platform/frameworks/support/+/2239762

presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyGrid.kt

@@ -1,6 +1,5 @@
 package tachiyomi.presentation.core.components
 
-import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.grid.GridCells
@@ -14,7 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import tachiyomi.presentation.core.util.flingBehaviorIgnoringMotionScale
 
 @Composable
 fun FastScrollLazyVerticalGrid(
@@ -31,7 +29,6 @@ fun FastScrollLazyVerticalGrid(
     verticalArrangement: Arrangement.Vertical =
         if (!reverseLayout) Arrangement.Top else Arrangement.Bottom,
     horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
-    flingBehavior: FlingBehavior = flingBehaviorIgnoringMotionScale(),
     userScrollEnabled: Boolean = true,
     content: LazyGridScope.() -> Unit,
 ) {
@@ -54,7 +51,6 @@ fun FastScrollLazyVerticalGrid(
             reverseLayout = reverseLayout,
             verticalArrangement = verticalArrangement,
             horizontalArrangement = horizontalArrangement,
-            flingBehavior = flingBehavior,
             userScrollEnabled = userScrollEnabled,
             content = content,
         )

presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyList.kt

@@ -1,9 +1,9 @@
 package tachiyomi.presentation.core.components
 
-import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -15,38 +15,6 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.dp
 import tachiyomi.presentation.core.util.drawVerticalScrollbar
-import tachiyomi.presentation.core.util.flingBehaviorIgnoringMotionScale
-
-/**
- * LazyColumn with fling animation fix
- *
- * @see flingBehaviorIgnoringMotionScale
- */
-@Composable
-fun LazyColumn(
-    modifier: Modifier = Modifier,
-    state: LazyListState = rememberLazyListState(),
-    contentPadding: PaddingValues = PaddingValues(0.dp),
-    reverseLayout: Boolean = false,
-    verticalArrangement: Arrangement.Vertical =
-        if (!reverseLayout) Arrangement.Top else Arrangement.Bottom,
-    horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-    flingBehavior: FlingBehavior = flingBehaviorIgnoringMotionScale(),
-    userScrollEnabled: Boolean = true,
-    content: LazyListScope.() -> Unit,
-) {
-    androidx.compose.foundation.lazy.LazyColumn(
-        modifier = modifier,
-        state = state,
-        contentPadding = contentPadding,
-        reverseLayout = reverseLayout,
-        verticalArrangement = verticalArrangement,
-        horizontalAlignment = horizontalAlignment,
-        flingBehavior = flingBehavior,
-        userScrollEnabled = userScrollEnabled,
-        content = content,
-    )
-}
 
 /**
  * LazyColumn with scrollbar.
@@ -60,7 +28,6 @@ fun ScrollbarLazyColumn(
     verticalArrangement: Arrangement.Vertical =
         if (!reverseLayout) Arrangement.Top else Arrangement.Bottom,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-    flingBehavior: FlingBehavior = flingBehaviorIgnoringMotionScale(),
     userScrollEnabled: Boolean = true,
     content: LazyListScope.() -> Unit,
 ) {
@@ -81,7 +48,6 @@ fun ScrollbarLazyColumn(
         reverseLayout = reverseLayout,
         verticalArrangement = verticalArrangement,
         horizontalAlignment = horizontalAlignment,
-        flingBehavior = flingBehavior,
         userScrollEnabled = userScrollEnabled,
         content = content,
     )
@@ -99,7 +65,6 @@ fun FastScrollLazyColumn(
     verticalArrangement: Arrangement.Vertical =
         if (!reverseLayout) Arrangement.Top else Arrangement.Bottom,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-    flingBehavior: FlingBehavior = flingBehaviorIgnoringMotionScale(),
     userScrollEnabled: Boolean = true,
     content: LazyListScope.() -> Unit,
 ) {
@@ -115,7 +80,6 @@ fun FastScrollLazyColumn(
             reverseLayout = reverseLayout,
             verticalArrangement = verticalArrangement,
             horizontalAlignment = horizontalAlignment,
-            flingBehavior = flingBehavior,
             userScrollEnabled = userScrollEnabled,
             content = content,
         )

presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.LazyListState

presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollable.kt

@@ -1,60 +0,0 @@
-package tachiyomi.presentation.core.util
-
-import androidx.compose.animation.core.AnimationState
-import androidx.compose.animation.core.DecayAnimationSpec
-import androidx.compose.animation.core.animateDecay
-import androidx.compose.animation.rememberSplineBasedDecay
-import androidx.compose.foundation.gestures.FlingBehavior
-import androidx.compose.foundation.gestures.ScrollScope
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.MotionDurationScale
-import kotlinx.coroutines.withContext
-import kotlin.math.abs
-
-/**
- * FlingBehavior that always uses the default motion scale.
- *
- * This makes the scrolling animation works like View's lists
- * when "Remove animation" settings is on.
- */
-@Composable
-fun flingBehaviorIgnoringMotionScale(): FlingBehavior {
-    val flingSpec = rememberSplineBasedDecay<Float>()
-    return remember(flingSpec) {
-        DefaultFlingBehavior(flingSpec)
-    }
-}
-
-private val DefaultMotionDurationScale = object : MotionDurationScale {
-    // Use default motion scale factor
-    override val scaleFactor: Float = 1f
-}
-
-private class DefaultFlingBehavior(
-    private val flingDecay: DecayAnimationSpec<Float>,
-) : FlingBehavior {
-    override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
-        // come up with the better threshold, but we need it since spline curve gives us NaNs
-        return if (abs(initialVelocity) > 1f) {
-            var velocityLeft = initialVelocity
-            var lastValue = 0f
-            withContext(DefaultMotionDurationScale) {
-                AnimationState(
-                    initialValue = 0f,
-                    initialVelocity = initialVelocity,
-                ).animateDecay(flingDecay) {
-                    val delta = value - lastValue
-                    val consumed = scrollBy(delta)
-                    lastValue = value
-                    velocityLeft = this.velocity
-                    // avoid rounding errors and stop if anything is unconsumed
-                    if (abs(delta - consumed) > 0.5f) this.cancelAnimation()
-                }
-            }
-            velocityLeft
-        } else {
-            initialVelocity
-        }
-    }
-}