Merge pull request #49 from futuredapp/feature/disable-drag-up-comple…

…tely Disable dragUp activity completely when dragUpEnabled is set to…
futuredapp · Aug 11, 2021 · 99623b5 · 99623b5
2 parents 7da9585 + 806a2db
commit 99623b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/kotlin/app/futured/hauler/HaulerView.kt b/core/src/main/kotlin/app/futured/hauler/HaulerView.kt
@@ -77,7 +77,7 @@ class HaulerView @JvmOverloads constructor(
     }
 
     override fun onNestedScroll(target: View, dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int) {
-        if (isDragEnabled.not()) {
+        if (isDragEnabled.not() || (dragUpEnabled.not() && dyUnconsumed > 0)) {
             return super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed)
         }
         dragScale(dyUnconsumed)