Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SwipeRefresh] Fix overscroll behaviour on Android 12 #1174

Merged
merged 1 commit into from Jun 8, 2022
Merged

[SwipeRefresh] Fix overscroll behaviour on Android 12 #1174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion swiperefresh/src/main/java/com/google/accompanist/swiperefresh/SwipeRefresh.kt
View file
Open in desktop
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down