Merge pull request onebone#47 from onebone/fix/velocity-tracking

Fix velocity tracker is considering wrong values
dpastor · Jun 9, 2022 · f76bd79 · f76bd79
2 parents 66d04bb + 0cb37a4
commit f76bd79
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/src/main/java/me/onebone/toolbar/ScrollStrategy.kt b/lib/src/main/java/me/onebone/toolbar/ScrollStrategy.kt
@@ -87,7 +87,10 @@ internal class EnterAlwaysNestedScrollConnection(
 
 	override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
 		val dy = available.y
-		tracker.delta(dy)
+
+		if (source == NestedScrollSource.Drag) {
+			tracker.delta(dy)
+		}
 
 		val toolbar = toolbarState.height.toFloat()
 		val offset = offsetY.value.toFloat()
@@ -138,7 +141,10 @@ internal class EnterAlwaysCollapsedNestedScrollConnection(
 
 	override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
 		val dy = available.y
-		tracker.delta(dy)
+
+		if (source == NestedScrollSource.Drag) {
+			tracker.delta(dy)
+		}
 
 		val consumed = if(dy > 0) { // expanding: offset -> body -> toolbar
 			val offsetConsumption = dy.coerceAtMost(-offsetY.value.toFloat())
@@ -198,7 +204,10 @@ internal class ExitUntilCollapsedNestedScrollConnection(
 
 	override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
 		val dy = available.y
-		tracker.delta(dy)
+
+		if (source == NestedScrollSource.Drag) {
+			tracker.delta(dy)
+		}
 
 		val consume = if(dy < 0) { // collapsing: toolbar -> body
 			toolbarState.dispatchRawDelta(dy)