Merge pull request #1174 from google/ben/swiperefresh

[SwipeRefresh] Fix overscroll behaviour on Android 12
google · Jun 8, 2022 · 6a9615a · 6a9615a
2 parents a0ebf63 + 677bc4c
commit 6a9615a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/swiperefresh/src/main/java/com/google/accompanist/swiperefresh/SwipeRefresh.kt b/swiperefresh/src/main/java/com/google/accompanist/swiperefresh/SwipeRefresh.kt
@@ -45,6 +45,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.math.absoluteValue
+import kotlin.math.roundToInt
 
 private const val DragMultiplier = 0.5f
 
@@ -150,7 +151,11 @@ private class SwipeRefreshNestedScrollConnection(
     }
 
     private fun onScroll(available: Offset): Offset {
-        state.isSwipeInProgress = true
+        if (available.y > 0) {
+            state.isSwipeInProgress = true
+        } else if (state.indicatorOffset.roundToInt() == 0) {
+            state.isSwipeInProgress = false
+        }
 
         val newOffset = (available.y * DragMultiplier + state.indicatorOffset).coerceAtLeast(0f)
         val dragConsumed = newOffset - state.indicatorOffset