Modify android code and tests to conform to API change

JetBrains · Jun 27, 2023 · d5ad295 · d5ad295
1 parent 5656f02
commit d5ad295
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.../src/skikoTest/kotlin/androidx/compose/foundation/copyPasteAndroidTests/ScrollableTest.kt b/.../src/skikoTest/kotlin/androidx/compose/foundation/copyPasteAndroidTests/ScrollableTest.kt
@@ -1289,7 +1289,7 @@ class ScrollableTest {
         val outerState = ScrollableState(consumeScrollDelta = { 0f })
         val innerState = ScrollableState(consumeScrollDelta = { 0f })
         val innerFlingBehavior = object : FlingBehavior {
-            override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+            override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
                 return initialVelocity
             }
         }
@@ -1473,7 +1473,7 @@ class ScrollableTest {
         var flingCalled = 0
         var flingVelocity: Float = Float.MAX_VALUE
         val flingBehaviour = object : FlingBehavior {
-            override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+            override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
                 flingCalled++
                 flingVelocity = initialVelocity
                 return 0f
@@ -1509,7 +1509,7 @@ class ScrollableTest {
         var flingCalled = 0
         var flingVelocity: Float = Float.MAX_VALUE
         val flingBehaviour = object : FlingBehavior {
-            override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+            override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
                 flingCalled++
                 flingVelocity = initialVelocity
                 return 0f
@@ -1546,7 +1546,7 @@ class ScrollableTest {
         var flingCalled = 0
         var flingVelocity: Float = Float.MAX_VALUE
         val flingBehaviour = object : FlingBehavior {
-            override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+            override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
                 flingCalled++
                 flingVelocity = initialVelocity
                 return 0f
@@ -1582,7 +1582,7 @@ class ScrollableTest {
             }
         )
         val flingBehaviour = object : FlingBehavior {
-            override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+            override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
                 returned = scrollBy(123f)
                 return 0f
             }
@@ -1625,7 +1625,7 @@ class ScrollableTest {
             }
         )
         val flingBehaviour = object : FlingBehavior {
-            override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+            override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
                 returned = scrollBy(123f)
                 return 0f
             }

diff --git a/...rc/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt b/...rc/commonMain/kotlin/androidx/wear/compose/material/ScalingLazyColumnSnapFlingBehavior.kt
@@ -38,7 +38,7 @@ internal class ScalingLazyColumnSnapFlingBehavior(
     val decay: DecayAnimationSpec<Float> = exponentialDecay()
 ) : FlingBehavior {
 
-    override suspend fun ScrollScope.performFling(initialVelocity: Float): Float {
+    override suspend fun ScrollScope.performFling(initialVelocity: Float, flingIntoOverscrollEffect: FlingIntoOverscrollEffect?): Float {
         val animationState = AnimationState(
             initialValue = 0f,
             initialVelocity = initialVelocity,