From e71800fff69014443aa24cbfceff6d2f386bc16b Mon Sep 17 00:00:00 2001
From: Dionysis <ddl449@gmail.com>
Date: Sun, 4 Dec 2016 22:31:36 +0100
Subject: [PATCH] Add up/down directions capacity

---
 example/build.gradle                          |   6 +-
 .../lorentzos/swipecards/AsyncActivity.java   |  37 +++--
 .../swipecards/SingleViewActivity.java        |   2 +-
 example/src/main/res/layout/buttons.xml       |  30 +++-
 example/src/main/res/values/dimens.xml        |   2 +-
 library/build.gradle                          |   2 +-
 .../flingswipe/OnScrollListener.java          |   4 +-
 .../flingswipe/SwipeAdapterView.java          |  19 ++-
 .../internal/CardEventListener.java           |   2 +-
 .../flingswipe/internal/Direction.java        |   5 +-
 .../flingswipe/internal/ExitPosition.java     |   2 +-
 .../flingswipe/internal/FrameData.java        | 143 ++++++++++++++----
 .../flingswipe/internal/FrameResult.java      |  24 +--
 .../flingswipe/internal/OnSwipeListener.java  |   9 +-
 .../flingswipe/internal/ScrollProgress.java   |  18 +++
 .../flingswipe/internal/SwipeEvent.java       |  10 +-
 .../flingswipe/internal/SwipeOperator.java    |   8 +-
 .../flingswipe/internal/TouchEvent.java       |  30 ++--
 .../flingswipe/internal/UpdatePosition.java   |   8 +-
 .../internal/BottomTouchEventTest.java        |  36 ++---
 .../internal/ExitTouchEventTest.java          |  52 ++++---
 .../flingswipe/internal/MockViewFactory.java  |   2 +
 .../internal/SwipeOperatorTouchTest.java      |   6 +
 .../internal/TestCardEventListener.java       |   2 +-
 .../internal/TopTouchEventTest.java           |  36 ++---
 .../flingswipe/internal/TouchEventTest.java   |   9 +-
 26 files changed, 340 insertions(+), 164 deletions(-)
 create mode 100644 library/src/main/java/com/lorentzos/flingswipe/internal/ScrollProgress.java

diff --git a/example/build.gradle b/example/build.gradle
index f8bf9637d6..d4053ce008 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -23,9 +23,9 @@ android {
 dependencies {
 	compile project(':library')
 
-	compile 'com.android.support:appcompat-v7:25.0.0'
-	compile 'com.android.support:design:25.0.0'
-	compile 'com.android.support:support-v4:25.0.0'
+	compile 'com.android.support:appcompat-v7:25.0.1'
+	compile 'com.android.support:design:25.0.1'
+	compile 'com.android.support:support-v4:25.0.1'
 
 	compile 'com.squareup.moshi:moshi:1.3.1'
 	compile 'com.squareup.okio:okio:1.11.0'
diff --git a/example/src/main/java/com/lorentzos/swipecards/AsyncActivity.java b/example/src/main/java/com/lorentzos/swipecards/AsyncActivity.java
index 1c47aec4c9..e95bd85f72 100644
--- a/example/src/main/java/com/lorentzos/swipecards/AsyncActivity.java
+++ b/example/src/main/java/com/lorentzos/swipecards/AsyncActivity.java
@@ -29,8 +29,8 @@
 import static io.reactivex.schedulers.Schedulers.newThread;
 
 /**
- * Activity with example of a network call to obtain the data and load the avatars
- * in the image views.
+ * Activity with example of a network call to obtain the data and load the avatars in the image
+ * views.
  */
 public class AsyncActivity extends AppCompatActivity {
 
@@ -87,8 +87,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 		// Optionally add an onScrollListener
 		flingContainer.setOnScrollListener(new OnScrollListener() {
 			@Override
-			public void onScroll(View view, float scrollProgressPercent) {
-				Log.i("MyActivity", "onScroll " + scrollProgressPercent);
+			public void onScroll(View view, float scrollProgressPercent, int direction) {
+				Log.i("MyActivity", "onScroll " + direction + ": " + scrollProgressPercent);
 			}
 		});
 
@@ -116,14 +116,14 @@ protected void onDestroy() {
 		super.onDestroy();
 	}
 
-	@OnClick(R.id.right)
-	public void swipeRight() {
+	@OnClick(R.id.up)
+	public void swipeTop() {
 		if (memberAdapter.isEmpty()) {
-			Snackbar.make(coordinatorLayout, "Cannot swipe right. Adapter is empty.", Snackbar.LENGTH_SHORT).show();
+			Snackbar.make(coordinatorLayout, "Cannot swipe up. Adapter is empty.", Snackbar.LENGTH_SHORT).show();
 			return;
 		}
-		//Trigger the right event manually.
-		flingContainer.swipeRight();
+		//Trigger the up event manually.
+		flingContainer.swipeUp();
 	}
 
 	@OnClick(R.id.left)
@@ -136,4 +136,23 @@ public void swipeLeft() {
 		flingContainer.swipeLeft();
 	}
 
+	@OnClick(R.id.right)
+	public void swipeRight() {
+		if (memberAdapter.isEmpty()) {
+			Snackbar.make(coordinatorLayout, "Cannot swipe right. Adapter is empty.", Snackbar.LENGTH_SHORT).show();
+			return;
+		}
+		//Trigger the right event manually.
+		flingContainer.swipeRight();
+	}
+
+	@OnClick(R.id.down)
+	public void swipeDown() {
+		if (memberAdapter.isEmpty()) {
+			Snackbar.make(coordinatorLayout, "Cannot swipe down. Adapter is empty.", Snackbar.LENGTH_SHORT).show();
+			return;
+		}
+		//Trigger the down event manually.
+		flingContainer.swipeDown();
+	}
 }
diff --git a/example/src/main/java/com/lorentzos/swipecards/SingleViewActivity.java b/example/src/main/java/com/lorentzos/swipecards/SingleViewActivity.java
index d2ad992ff9..922ff2342d 100644
--- a/example/src/main/java/com/lorentzos/swipecards/SingleViewActivity.java
+++ b/example/src/main/java/com/lorentzos/swipecards/SingleViewActivity.java
@@ -24,7 +24,7 @@ public void onCardExited(View view, @Direction int direction) {
 			}
 
 			@Override
-			public void onScroll(View view, float scrollProgressPercent) {
+			public void onScroll(View view, float scrollProgressPercent, @Direction int direction) {
 
 			}
 
diff --git a/example/src/main/res/layout/buttons.xml b/example/src/main/res/layout/buttons.xml
index 669d0213e4..9b1657c306 100644
--- a/example/src/main/res/layout/buttons.xml
+++ b/example/src/main/res/layout/buttons.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
@@ -10,11 +10,22 @@
     android:orientation="horizontal"
     tools:showIn="@layout/activity_main">
 
+    <Button
+        android:id="@+id/up"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="10dp"
+        android:text="Up"
+        tools:ignore="HardcodedText"/>
+
     <Button
         android:id="@+id/left"
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@id/up"
         android:layout_margin="10dp"
         android:text="Left"
         tools:ignore="HardcodedText"/>
@@ -24,8 +35,21 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
+        android:layout_below="@id/up"
+        android:layout_marginTop="10dp"
+        android:layout_toRightOf="@id/left"
         android:text="Right"
         tools:ignore="HardcodedText"/>
 
-</LinearLayout>
\ No newline at end of file
+    <Button
+        android:id="@+id/down"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/left"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="10dp"
+        android:text="Down"
+        tools:ignore="HardcodedText"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/example/src/main/res/values/dimens.xml b/example/src/main/res/values/dimens.xml
index f2f99ca4e4..f09365119d 100644
--- a/example/src/main/res/values/dimens.xml
+++ b/example/src/main/res/values/dimens.xml
@@ -2,6 +2,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="buttons_bottom_margin">80dp</dimen>
+    <dimen name="buttons_bottom_margin">20dp</dimen>
     <dimen name="naive_snackbar_help_padding">48dp</dimen>
 </resources>
diff --git a/library/build.gradle b/library/build.gradle
index 44415d2b8e..9496ace96a 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-	compile 'com.android.support:support-annotations:25.0.0'
+	compile 'com.android.support:support-annotations:25.0.1'
 
 	testCompile 'com.google.truth:truth:0.30'
 	testCompile 'org.mockito:mockito-core:2.2.9'
diff --git a/library/src/main/java/com/lorentzos/flingswipe/OnScrollListener.java b/library/src/main/java/com/lorentzos/flingswipe/OnScrollListener.java
index 4986f99231..5886633106 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/OnScrollListener.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/OnScrollListener.java
@@ -2,9 +2,11 @@
 
 import android.view.View;
 
+import com.lorentzos.flingswipe.internal.Direction;
+
 /**
  *
  */
 public interface OnScrollListener {
-	void onScroll(View view, float scrollProgressPercent);
+	void onScroll(View view, float scrollProgressPercent, @Direction int direction);
 }
diff --git a/library/src/main/java/com/lorentzos/flingswipe/SwipeAdapterView.java b/library/src/main/java/com/lorentzos/flingswipe/SwipeAdapterView.java
index 21b4529a5f..c0d4ec7547 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/SwipeAdapterView.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/SwipeAdapterView.java
@@ -5,7 +5,6 @@
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Adapter;
@@ -71,8 +70,6 @@ private void layoutChildren(int startingIndex, int adapterCount) {
 		for (int i = startingIndex; i < min; i++) {
 			View child = adapter.getView(i, null, this);
 
-			Log.wtf("SwipeFlingAdapterView", "layoutChildren i: " + i);
-
 			if (child.getVisibility() != GONE) {
 				makeAndAddView(child);
 			}
@@ -229,11 +226,11 @@ public void onCardExited(View view, @Direction int direction) {
 	}
 
 	@Override
-	public void onScroll(View view, float scrollProgressPercent) {
+	public void onScroll(View view, float scrollProgressPercent, @Direction int direction) {
 		if (onScrollListener == null) {
 			return;
 		}
-		onScrollListener.onScroll(view, scrollProgressPercent);
+		onScrollListener.onScroll(view, scrollProgressPercent, direction);
 	}
 
 	@Override
@@ -273,6 +270,18 @@ public void swipeLeft() {
 		}
 	}
 
+	public void swipeUp() {
+		synchronized (object) {
+			swipe(Direction.UP);
+		}
+	}
+
+	public void swipeDown() {
+		synchronized (object) {
+			swipe(Direction.DOWN);
+		}
+	}
+
 	private void swipe(int direction) {
 		if (nextLayoutPass) {
 			return;
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/CardEventListener.java b/library/src/main/java/com/lorentzos/flingswipe/internal/CardEventListener.java
index 1499d66e09..f1aec91a25 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/CardEventListener.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/CardEventListener.java
@@ -8,7 +8,7 @@
 public interface CardEventListener {
 	void onCardExited(View view, @Direction int direction);
 
-	void onScroll(View view, float scrollProgressPercent);
+	void onScroll(View view, float scrollProgressPercent, @Direction int direction);
 
 	void onRecenter(View view);
 
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/Direction.java b/library/src/main/java/com/lorentzos/flingswipe/internal/Direction.java
index acbffa53a3..354675db45 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/Direction.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/Direction.java
@@ -11,11 +11,12 @@
  */
 @SuppressWarnings("ConstantDeclaredInInterface")
 @Retention(SOURCE)
-@IntDef({Direction.CENTER, Direction.LEFT, Direction.RIGHT})
+@IntDef({Direction.CENTER, Direction.LEFT, Direction.RIGHT, Direction.UP, Direction.DOWN})
 public @interface Direction {
 
 	int CENTER = -1;
 	int LEFT = 1;
 	int RIGHT = 2;
-
+	int UP = 3;
+	int DOWN = 4;
 }
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/ExitPosition.java b/library/src/main/java/com/lorentzos/flingswipe/internal/ExitPosition.java
index d260d0e943..6303a284d2 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/ExitPosition.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/ExitPosition.java
@@ -10,7 +10,7 @@
 class ExitPosition {
 
 	private static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = new AccelerateInterpolator();
-	private static final int DURATION = 100;
+	private static final int DURATION = 100*10;
 	private final float exitX;
 	private final float exitY;
 	private final float exitRotation;
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/FrameData.java b/library/src/main/java/com/lorentzos/flingswipe/internal/FrameData.java
index 2b544a89aa..2086150c82 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/FrameData.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/FrameData.java
@@ -1,12 +1,17 @@
 package com.lorentzos.flingswipe.internal;
 
-import android.support.annotation.FloatRange;
 import android.view.View;
 
+import static com.lorentzos.flingswipe.internal.Direction.CENTER;
+import static com.lorentzos.flingswipe.internal.Direction.DOWN;
 import static com.lorentzos.flingswipe.internal.Direction.LEFT;
 import static com.lorentzos.flingswipe.internal.Direction.RIGHT;
+import static com.lorentzos.flingswipe.internal.Direction.UP;
 import static com.lorentzos.flingswipe.internal.TouchType.TOUCH_BOTTOM;
 import static com.lorentzos.flingswipe.internal.TouchType.TOUCH_TOP;
+import static java.lang.Math.abs;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
 
 /**
  * Helping class which contains the data and functionality for the flinging view.
@@ -16,9 +21,12 @@ class FrameData {
 	private final float startY;
 	private final float height;
 	private final float width;
+	private final float parentHeight;
 	private final float parentWidth;
 	private final float leftBorder;
 	private final float rightBorder;
+	private final float upperBorder;
+	private final float bottomBorder;
 
 	/**
 	 * Creates a new instance of {@link FrameData} from a given view.
@@ -28,31 +36,35 @@ class FrameData {
 	 */
 	static FrameData fromView(View view) {
 		PointF framePosition = new PointF(view.getX(), view.getY());
+		int parentHeight = ((View) view.getParent()).getHeight();
 		int parentWidth = ((View) view.getParent()).getWidth();
 
-		return new FrameData(framePosition, view.getHeight(), view.getWidth(), parentWidth);
+		return new FrameData(framePosition, view.getHeight(), view.getWidth(), parentHeight, parentWidth);
 	}
 
 	/**
-	 * When the object rotates it's width becomes bigger.
+	 * When the object rotates it's size dimensions (height/dimension) becomes bigger.
 	 * <p>
-	 * The below method calculates the width offset for the given the rotation.
+	 * The below method calculates the dimension offset for the given the rotation.
 	 *
-	 * @param width          the width of the view with 0 degrees rotation.
-	 * @param rotationFactor the base rotation factor to calculate the width offset
+	 * @param dimension      the dimension of the view with 0 degrees rotation.
+	 * @param rotationFactor the base rotation factor to calculate the dimension offset
 	 */
-	private static float getRotationWidthOffset(float width, float rotationFactor) {
-		return (float) (width / StrictMath.cos(Math.toRadians(2 * rotationFactor)) - width);
+	private static float getRotationSizeOffset(float dimension, float rotationFactor) {
+		return (float) (dimension / StrictMath.cos(Math.toRadians(2 * rotationFactor)) - dimension);
 	}
 
-	private FrameData(PointF framePosition, int height, int width, float parentWidth) {
+	private FrameData(PointF framePosition, int height, int width, float parentHeight, float parentWidth) {
 		startX = framePosition.x;
 		startY = framePosition.y;
 		this.height = height;
 		this.width = width;
+		this.parentHeight = parentHeight;
 		this.parentWidth = parentWidth;
 		leftBorder = parentWidth * 0.25f;
 		rightBorder = parentWidth * 0.75f;
+		upperBorder = parentHeight * 0.25f;
+		bottomBorder = parentHeight * 0.75f;
 	}
 
 	/**
@@ -77,8 +89,9 @@ int getTouchType(float initialTouchY) {
 	UpdatePosition createUpdatePosition(float dx, float dy, float rotationFactor) {
 		float updateX = dx + startX;
 		float updateY = dy + startY;
+
+		ScrollProgress scrollProgress = getScrollProgress(dx, dy);
 		float rotation = 2.f * rotationFactor * dx / parentWidth;
-		float scrollProgress = getScrollProgress(dx);
 
 		return new UpdatePosition(updateX, updateY, rotation, scrollProgress);
 	}
@@ -91,8 +104,8 @@ RecenterPosition getRecenterPosition() {
 	}
 
 	/**
-	 * Returns the target {@link ExitPosition} of the view for the given
-	 * current position and rotation factor.
+	 * Returns the target {@link ExitPosition} of the view for the given current position and
+	 * rotation factor.
 	 * <p>
 	 * The position is required to make a smooth linear exit from the center.
 	 *
@@ -109,14 +122,19 @@ ExitPosition getExitPosition(PointF framePosition, @Direction int direction, flo
 				return getLeftExitPosition(framePosition, rotationFactor);
 			case RIGHT:
 				return getRightExitPoint(framePosition, rotationFactor);
+			case UP:
+				return getUpExitPoint(framePosition, rotationFactor);
+			case DOWN:
+				return getDownExitPoint(framePosition, rotationFactor);
 			default:
 				throw new IllegalStateException("Unsupported exit direction : " + direction);
+
 		}
 	}
 
 	/**
-	 * Returns the target left {@link ExitPosition} of the view for the given
-	 * current position and rotation factor.
+	 * Returns the target left {@link ExitPosition} of the view for the given current position and
+	 * rotation factor.
 	 * <p>
 	 * The position is required to make a smooth linear exit from the center.
 	 *
@@ -126,16 +144,16 @@ ExitPosition getExitPosition(PointF framePosition, @Direction int direction, flo
 	 * @see #getRightExitPoint(PointF, float)
 	 */
 	private ExitPosition getLeftExitPosition(PointF framePosition, float rotationFactor) {
-		float exitX = -width - getRotationWidthOffset(width, rotationFactor);
-		float exitY = calculateExitY(framePosition, exitX);
+		float exitX = -width - getRotationSizeOffset(width, rotationFactor);
+		float exitY = calculateHorizontalExitY(framePosition, exitX);
 		float exitRotation = getExitRotation(rotationFactor);
 
 		return new ExitPosition(exitX, exitY, exitRotation);
 	}
 
 	/**
-	 * Returns the target right {@link ExitPosition} of the view for the given
-	 * current position and rotation factor.
+	 * Returns the target right {@link ExitPosition} of the view for the given current position and
+	 * rotation factor.
 	 * <p>
 	 * The position is required to make a smooth linear exit from the center.
 	 *
@@ -145,14 +163,30 @@ private ExitPosition getLeftExitPosition(PointF framePosition, float rotationFac
 	 * @see #getLeftExitPosition(PointF, float)
 	 */
 	private ExitPosition getRightExitPoint(PointF framePosition, float rotationFactor) {
-		float exitX = parentWidth + getRotationWidthOffset(width, rotationFactor);
-		float exitY = calculateExitY(framePosition, exitX);
+		float exitX = parentWidth + getRotationSizeOffset(width, rotationFactor);
+		float exitY = calculateHorizontalExitY(framePosition, exitX);
+		float exitRotation = getExitRotation(rotationFactor);
+
+		return new ExitPosition(exitX, exitY, exitRotation);
+	}
+
+	private ExitPosition getDownExitPoint(PointF framePosition, float rotationFactor) {
+		float exitY = parentHeight + getRotationSizeOffset(height, rotationFactor);
+		float exitX = calculateVerticalExitX(framePosition, exitY);
 		float exitRotation = getExitRotation(rotationFactor);
 
 		return new ExitPosition(exitX, exitY, exitRotation);
 	}
 
-	private float calculateExitY(PointF framePosition, float exitXPoint) {
+	private ExitPosition getUpExitPoint(PointF framePosition, float rotationFactor) {
+		float exitY = -height - getRotationSizeOffset(height, rotationFactor);
+		float exitX = calculateVerticalExitX(framePosition, exitY);
+		float exitRotation = getExitRotation(rotationFactor);
+
+		return new ExitPosition(exitX, exitY, exitRotation);
+	}
+
+	private float calculateHorizontalExitY(PointF framePosition, float exitXPoint) {
 		if (Float.compare(framePosition.y, startY) == 0) {
 			return startY;
 		}
@@ -164,28 +198,54 @@ private float calculateExitY(PointF framePosition, float exitXPoint) {
 		return slope * exitXPoint + intercept;
 	}
 
+	private float calculateVerticalExitX(PointF framePosition, float exitYPoint) {
+		if (Float.compare(framePosition.x, startX) == 0) {
+			return startX;
+		}
+
+		float slope = (framePosition.x - startX) / (framePosition.y - startY);
+		float intercept = startX - slope * startY;
+
+		//Your typical y = ax+b linear regression
+		return slope * exitYPoint + intercept;
+	}
+
 	private float getExitRotation(float rotationFactor) {
 		return 2.f * rotationFactor * (width - startX) / parentWidth;
 	}
 
+	ScrollProgress getScrollProgress(float dx, float dy) {
+		float horizontalProgress = getScrollHorizontalProgress(dx);
+		float verticalProgress = getScrollVerticalProgress(dy);
+
+		if (abs(horizontalProgress) > abs(verticalProgress)) {
+			// bigger horizontal progress
+			if (horizontalProgress > 0) {
+				return new ScrollProgress(RIGHT, min(1, horizontalProgress));
+			} else if (horizontalProgress < 0) {
+				return new ScrollProgress(LEFT, -1 * max(-1, horizontalProgress));
+			}
+
+		} else {
+			// bigger vertical progress
+			if (verticalProgress > 0) {
+				return new ScrollProgress(DOWN, min(1, verticalProgress));
+			} else if (verticalProgress < 0) {
+				return new ScrollProgress(UP, -1 * max(-1, verticalProgress));
+			}
+		}
+
+		return new ScrollProgress(CENTER, 0);
+	}
+
 	/**
 	 * Generates the scroll progress based on the position of the view.
 	 *
 	 * @param dx the differential in x axis
-	 * @return the scroll progress between -1 and 1.
+	 * @return the horizontal scroll progress
 	 */
-	@FloatRange(from = -1, to = 1)
-	float getScrollProgress(float dx) {
+	private float getScrollHorizontalProgress(float dx) {
 		float currentCenterX = startX + dx + width / 2;
-
-		if (currentCenterX < leftBorder) {
-			return -1;
-		}
-
-		if (currentCenterX > rightBorder) {
-			return 1;
-		}
-
 		float halfMovableFrameRange = (rightBorder - leftBorder) / 2f;
 
 		if (dx > 0f) {
@@ -200,4 +260,21 @@ float getScrollProgress(float dx) {
 
 		return 0;
 	}
+
+	private float getScrollVerticalProgress(float dy) {
+		float currentCenterY = startY + dy + height / 2;
+		float halfMovableFrameRange = (upperBorder - bottomBorder) / 2f;
+
+		if (dy > 0f) {
+			float distanceToBottomBorder = bottomBorder - currentCenterY;
+			return distanceToBottomBorder / halfMovableFrameRange + 1;
+		}
+
+		if (dy < 0f) {
+			float distanceToUpperBorder = currentCenterY - upperBorder;
+			return -distanceToUpperBorder / halfMovableFrameRange - 1;
+		}
+
+		return 0;
+	}
 }
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/FrameResult.java b/library/src/main/java/com/lorentzos/flingswipe/internal/FrameResult.java
index fad5a68758..8d79ff1068 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/FrameResult.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/FrameResult.java
@@ -1,15 +1,16 @@
 package com.lorentzos.flingswipe.internal;
 
 import static com.lorentzos.flingswipe.internal.Direction.CENTER;
+import static com.lorentzos.flingswipe.internal.Direction.DOWN;
 import static com.lorentzos.flingswipe.internal.Direction.LEFT;
 import static com.lorentzos.flingswipe.internal.Direction.RIGHT;
+import static com.lorentzos.flingswipe.internal.Direction.UP;
 import static com.lorentzos.flingswipe.internal.EndEvent.EXIT;
 import static com.lorentzos.flingswipe.internal.EndEvent.RECENTER;
 import static java.lang.Math.abs;
 
 /**
- * The resulting details for the view when the user moves up or cancels
- * the drag events.
+ * The resulting details for the view when the user moves up or cancels the drag events.
  */
 class FrameResult {
 
@@ -23,14 +24,19 @@ class FrameResult {
 	 * @param scrollProgress the progress of scrolling for the view.
 	 * @return a new instance of {@link FrameResult}
 	 */
-	static FrameResult fromScrollProgress(float scrollProgress) {
+	static FrameResult fromScrollProgress(ScrollProgress scrollProgress) {
 
-		if (abs(scrollProgress + 1) == 0) {
-			return new FrameResult(EXIT, LEFT);
-
-		}
-		if (abs(scrollProgress - 1) == 0) {
-			return new FrameResult(EXIT, RIGHT);
+		if (abs(scrollProgress.progress - 1) == 0) {
+			switch (scrollProgress.direction) {
+				case DOWN:
+					return new FrameResult(EXIT, DOWN);
+				case LEFT:
+					return new FrameResult(EXIT, LEFT);
+				case RIGHT:
+					return new FrameResult(EXIT, RIGHT);
+				case UP:
+					return new FrameResult(EXIT, UP);
+			}
 		}
 
 		return new FrameResult(RECENTER, CENTER);
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/OnSwipeListener.java b/library/src/main/java/com/lorentzos/flingswipe/internal/OnSwipeListener.java
index 696d23d30f..c0012c467f 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/OnSwipeListener.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/OnSwipeListener.java
@@ -3,8 +3,15 @@
 import android.view.View;
 
 /**
- *
+ * Interface definition for a callback to be invoked when a swipe event is dispatched to this view.
  */
 interface OnSwipeListener {
+
+	/**
+	 * Called when a swipe event is dispatched to a view.
+	 *
+	 * @param view      The view the swipe event has been dispatched to.
+	 * @param direction The direction of the swipe event
+	 */
 	void swipe(View view, @Direction int direction);
 }
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/ScrollProgress.java b/library/src/main/java/com/lorentzos/flingswipe/internal/ScrollProgress.java
new file mode 100644
index 0000000000..43b347e721
--- /dev/null
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/ScrollProgress.java
@@ -0,0 +1,18 @@
+package com.lorentzos.flingswipe.internal;
+
+import android.support.annotation.FloatRange;
+
+/**
+ *
+ */
+public class ScrollProgress {
+	@Direction
+	public final int direction;
+	@FloatRange(from = 0, to = 1.0)
+	public final float progress;
+
+	public ScrollProgress(int direction, float progress) {
+		this.direction = direction;
+		this.progress = progress;
+	}
+}
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeEvent.java b/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeEvent.java
index 1c8ee8d6bc..455fed3f1c 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeEvent.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeEvent.java
@@ -21,9 +21,13 @@ class SwipeEvent {
 	void resultView(@Direction int direction, AnimatorListenerAdapter onAnimationEnd) {
 		PointF f = new PointF(frame.getX(), frame.getY());
 
-		float adjustedFactor = rotationFactor;
-		if (direction == Direction.LEFT) {
-			adjustedFactor *= -1;
+		float adjustedFactor = 0;
+
+		if (Direction.LEFT == direction || Direction.RIGHT == direction) {
+			adjustedFactor = rotationFactor;
+			if (direction == Direction.LEFT) {
+				adjustedFactor *= -1;
+			}
 		}
 
 		frameData.getExitPosition(f, direction, adjustedFactor)
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeOperator.java b/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeOperator.java
index 509b8de1f6..73e50efa6d 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeOperator.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/SwipeOperator.java
@@ -58,8 +58,8 @@ public boolean onTouch(final View view, MotionEvent event) {
 					return false;
 				}
 
-				float scrollProgress = touchEvent.moveView(touchPosition);
-				cardEventListener.onScroll(view, scrollProgress);
+				ScrollProgress scrollProgress = touchEvent.moveView(touchPosition);
+				cardEventListener.onScroll(view, scrollProgress.progress, scrollProgress.direction);
 
 				lastTouchPosition = touchPosition;
 				return true;
@@ -67,7 +67,7 @@ public boolean onTouch(final View view, MotionEvent event) {
 			case MotionEvent.ACTION_UP:
 				isAnimationRunning = true;
 
-				float scrollResult = touchEvent.resultView(touchPosition, new OnCardResult() {
+				ScrollProgress scrollResult = touchEvent.resultView(touchPosition, new OnCardResult() {
 					@Override
 					public void onExit(FrameResult frameResult) {
 						view.setLayerType(View.LAYER_TYPE_NONE, null);
@@ -86,7 +86,7 @@ public void onExit(FrameResult frameResult) {
 						isAnimationRunning = false;
 					}
 				});
-				cardEventListener.onScroll(view, scrollResult);
+				cardEventListener.onScroll(view, scrollResult.progress, scrollResult.direction);
 
 				lastTouchPosition = touchPosition;
 				touchEvent = null;
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/TouchEvent.java b/library/src/main/java/com/lorentzos/flingswipe/internal/TouchEvent.java
index d0bfef4124..bac900f0ea 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/TouchEvent.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/TouchEvent.java
@@ -46,13 +46,13 @@ private static float adjustRotationFactor(float baseRotation, int touchType, int
 	}
 
 	/**
-	 * Notifies to move the view based on the given touch
-	 * {@link android.view.MotionEvent#ACTION_MOVE} event.
+	 * Notifies to move the view based on the given touch {@link android.view.MotionEvent#ACTION_MOVE}
+	 * event.
 	 *
 	 * @param movePosition the position of the pointer at the given time.
 	 * @return the scroll progress of the view
 	 */
-	float moveView(PointF movePosition) {
+	ScrollProgress moveView(PointF movePosition) {
 		float dx = movePosition.x - initialPosition.x;
 		float dy = movePosition.y - initialPosition.y;
 
@@ -64,7 +64,7 @@ float moveView(PointF movePosition) {
 		UpdatePosition updatePosition = frameData.createUpdatePosition(dx, dy, rotationFactor);
 		updatePosition.move(frame);
 
-		return updatePosition.getScrollProgress();
+		return updatePosition.scrollProgress;
 	}
 
 	/**
@@ -74,11 +74,11 @@ float moveView(PointF movePosition) {
 	 * @param onCardResult the callback triggered when the event finishes.
 	 * @return the scroll progress of the view
 	 */
-	float resultView(PointF endPosition, final OnCardResult onCardResult) {
-		float dx = endPosition.x - initialPosition.x;
-		float scrollProgress = frameData.getScrollProgress(dx);
+	ScrollProgress resultView(PointF endPosition, final OnCardResult onCardResult) {
 
-		PointF framePosition = new PointF(frame.getX(), frame.getY());
+		float dx = endPosition.x - initialPosition.x;
+		float dy = endPosition.y - initialPosition.y;
+		ScrollProgress scrollProgress = frameData.getScrollProgress(dx, dy);
 
 		final FrameResult frameResult;
 		if (TouchUtil.minorMovement(endPosition, initialPosition)) {
@@ -89,14 +89,16 @@ float resultView(PointF endPosition, final OnCardResult onCardResult) {
 
 		switch (frameResult.getEndEvent()) {
 			case EXIT:
+				PointF framePosition = new PointF(frame.getX(), frame.getY());
 				float rotation = adjustRotationFactor(rotationFactor, touchType, frameResult.getDirection());
 
-				frameData.getExitPosition(framePosition, frameResult.getDirection(), rotation).exit(frame, new AnimatorListenerAdapter() {
-					@Override
-					public void onAnimationEnd(Animator animation) {
-						onCardResult.onExit(frameResult);
-					}
-				});
+				frameData.getExitPosition(framePosition, frameResult.getDirection(), rotation)
+						.exit(frame, new AnimatorListenerAdapter() {
+							@Override
+							public void onAnimationEnd(Animator animation) {
+								onCardResult.onExit(frameResult);
+							}
+						});
 
 				break;
 			case CLICK:
diff --git a/library/src/main/java/com/lorentzos/flingswipe/internal/UpdatePosition.java b/library/src/main/java/com/lorentzos/flingswipe/internal/UpdatePosition.java
index a1ece1c1cb..5940ad2561 100644
--- a/library/src/main/java/com/lorentzos/flingswipe/internal/UpdatePosition.java
+++ b/library/src/main/java/com/lorentzos/flingswipe/internal/UpdatePosition.java
@@ -9,19 +9,15 @@ class UpdatePosition {
 	private final float updateX;
 	private final float updateY;
 	private final float rotation;
-	private final float scrollProgress;
+	final ScrollProgress scrollProgress;
 
-	UpdatePosition(float updateX, float updateY, float rotation, float scrollProgress) {
+	UpdatePosition(float updateX, float updateY, float rotation, ScrollProgress scrollProgress) {
 		this.updateX = updateX;
 		this.updateY = updateY;
 		this.rotation = rotation;
 		this.scrollProgress = scrollProgress;
 	}
 
-	float getScrollProgress() {
-		return scrollProgress;
-	}
-
 	void move(View frame) {
 		frame.setX(updateX);
 		frame.setY(updateY);
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/BottomTouchEventTest.java b/library/src/test/java/com/lorentzos/flingswipe/internal/BottomTouchEventTest.java
index 95caca1fde..8eb65e45a7 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/BottomTouchEventTest.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/BottomTouchEventTest.java
@@ -39,11 +39,11 @@ public void topLeftOutside() throws Exception {
 		PointF topLeftTouch = new PointF(10f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topLeftTouch);
+		ScrollProgress progress = touchEvent.moveView(topLeftTouch);
 
 		// Then
 		verifyLeft(topLeftTouch);
-		verifyNegativeEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -52,11 +52,11 @@ public void bottomLeftOutside() throws Exception {
 		PointF bottomLeftTouch = new PointF(10f, 200f);
 
 		// When
-		float progress = touchEvent.moveView(bottomLeftTouch);
+		ScrollProgress progress = touchEvent.moveView(bottomLeftTouch);
 
 		// Then
 		verifyLeft(bottomLeftTouch);
-		verifyNegativeEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -65,11 +65,11 @@ public void topRightOutside() throws Exception {
 		PointF topRightTouch = new PointF(330f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topRightTouch);
+		ScrollProgress progress = touchEvent.moveView(topRightTouch);
 
 		// Then
 		verifyRight(topRightTouch);
-		verifyPositiveEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -78,11 +78,11 @@ public void bottomRightOutside() throws Exception {
 		PointF bottomRightTouch = new PointF(330f, 330f);
 
 		// When
-		float progress = touchEvent.moveView(bottomRightTouch);
+		ScrollProgress progress = touchEvent.moveView(bottomRightTouch);
 
 		// Then
 		verifyRight(bottomRightTouch);
-		verifyPositiveEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -91,11 +91,11 @@ public void topLeftInside() throws Exception {
 		PointF topLeftTouch = new PointF(110f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topLeftTouch);
+		ScrollProgress progress = touchEvent.moveView(topLeftTouch);
 
 		// Then
 		verifyLeft(topLeftTouch);
-		verifyNegativeProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -104,11 +104,11 @@ public void bottomLeftInside() throws Exception {
 		PointF bottomLeftTouch = new PointF(110f, 200f);
 
 		// When
-		float progress = touchEvent.moveView(bottomLeftTouch);
+		ScrollProgress progress = touchEvent.moveView(bottomLeftTouch);
 
 		// Then
 		verifyLeft(bottomLeftTouch);
-		verifyNegativeProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -117,11 +117,11 @@ public void topRightInside() throws Exception {
 		PointF topRightTouch = new PointF(290f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topRightTouch);
+		ScrollProgress progress = touchEvent.moveView(topRightTouch);
 
 		// Then
 		verifyRight(topRightTouch);
-		verifyPositiveProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -130,11 +130,11 @@ public void bottomRightInside() throws Exception {
 		PointF bottomRightTouch = new PointF(290f, 160f);
 
 		// When
-		float progress = touchEvent.moveView(bottomRightTouch);
+		ScrollProgress progress = touchEvent.moveView(bottomRightTouch);
 
 		// Then
 		verifyRight(bottomRightTouch);
-		verifyPositiveProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -143,13 +143,13 @@ public void onlyVerticalMove() throws Exception {
 		PointF verticalTouch = new PointF(120f, 160f);
 
 		// When
-		float progress = touchEvent.moveView(verticalTouch);
+		ScrollProgress progress = touchEvent.moveView(verticalTouch);
 
 		// Then
 		verify(mockView).setX(INITIAL_VIEW_X);
 		verify(mockView).setY(verticalTouch.y - initialTouch.y + INITIAL_VIEW_Y);
 		verify(mockView).setRotation(eq(-0f));
-		Truth.assertThat(progress).isWithin(0);
+		Truth.assertThat(progress.progress).isWithin(0);
 	}
 
 	private void verifyLeft(PointF moveTouch) {
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/ExitTouchEventTest.java b/library/src/test/java/com/lorentzos/flingswipe/internal/ExitTouchEventTest.java
index 639ad6456c..3cd0e6f0f1 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/ExitTouchEventTest.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/ExitTouchEventTest.java
@@ -22,10 +22,11 @@ public void onExit(FrameResult frameResult) {
 		}
 	};
 	private TouchEvent touchEvent;
+	private View mockView;
 
 	@Before
 	public void setUp() throws Exception {
-		View mockView = MockViewFactory.createWithAnimate();
+		mockView = MockViewFactory.createWithAnimate();
 		PointF middlishTouch = new PointF(120f, 120f);
 
 		touchEvent = new TouchEvent(15f, mockView, middlishTouch, 40f);
@@ -37,22 +38,24 @@ public void topLeftOutside() throws Exception {
 		PointF topLeftTouch = new PointF(10f, 10f);
 
 		// When
-		float progress = touchEvent.resultView(topLeftTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(topLeftTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyNegativeEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.UP);
 	}
 
 	@Test
 	public void bottomLeftOutside() throws Exception {
 		// Given
-		PointF bottomLeftTouch = new PointF(10f, 200f);
+		PointF bottomLeftTouch = new PointF(50f, 200f);
 
 		// When
-		float progress = touchEvent.resultView(bottomLeftTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(bottomLeftTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyNegativeEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.LEFT);
 	}
 
 	@Test
@@ -61,10 +64,11 @@ public void topRightOutside() throws Exception {
 		PointF topRightTouch = new PointF(330f, 10f);
 
 		// When
-		float progress = touchEvent.resultView(topRightTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(topRightTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyPositiveEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.UP);
 	}
 
 	@Test
@@ -73,10 +77,11 @@ public void bottomRightOutside() throws Exception {
 		PointF bottomRightTouch = new PointF(330f, 330f);
 
 		// When
-		float progress = touchEvent.resultView(bottomRightTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(bottomRightTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyPositiveEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.RIGHT);
 	}
 
 	@Test
@@ -85,10 +90,11 @@ public void topLeftInside() throws Exception {
 		PointF topLeftTouch = new PointF(110f, 10f);
 
 		// When
-		float progress = touchEvent.resultView(topLeftTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(topLeftTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyNegativeProgress(progress);
+		verifyPositiveProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.UP);
 	}
 
 	@Test
@@ -97,10 +103,11 @@ public void bottomLeftInside() throws Exception {
 		PointF bottomLeftTouch = new PointF(110f, 200f);
 
 		// When
-		float progress = touchEvent.resultView(bottomLeftTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(bottomLeftTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyNegativeProgress(progress);
+		verifyPositiveProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.LEFT);
 	}
 
 	@Test
@@ -109,10 +116,11 @@ public void topRightInside() throws Exception {
 		PointF topRightTouch = new PointF(290f, 10f);
 
 		// When
-		float progress = touchEvent.resultView(topRightTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(topRightTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyPositiveProgress(progress);
+		verifyPositiveProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.UP);
 	}
 
 	@Test
@@ -121,22 +129,24 @@ public void bottomRightInside() throws Exception {
 		PointF bottomRightTouch = new PointF(290f, 160f);
 
 		// When
-		float progress = touchEvent.resultView(bottomRightTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(bottomRightTouch, ON_CARD_RESULT);
 
 		// Then
-		verifyPositiveProgress(progress);
+		verifyPositiveProgress(progress.progress);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.RIGHT);
 	}
 
 	@Test
 	public void onlyVerticalMove() throws Exception {
 		// Given
-		PointF verticalTouch = new PointF(120f, 160f);
+		PointF verticalTouch = new PointF(120f, 360f);
 
 		// When
-		float progress = touchEvent.resultView(verticalTouch, ON_CARD_RESULT);
+		ScrollProgress progress = touchEvent.resultView(verticalTouch, ON_CARD_RESULT);
 
 		// Then
-		Truth.assertThat(progress).isWithin(0);
+		Truth.assertThat(progress.progress).isWithin(0);
+		Truth.assertThat(progress.direction).isEqualTo(Direction.DOWN);
 	}
 
 }
\ No newline at end of file
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/MockViewFactory.java b/library/src/test/java/com/lorentzos/flingswipe/internal/MockViewFactory.java
index 08a676c7f3..88c06d8470 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/MockViewFactory.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/MockViewFactory.java
@@ -32,6 +32,7 @@ static View create() {
 		when(mockView.getWidth()).thenReturn(SIDE_SIZE_PIXELS);
 
 		when(mockParent.getWidth()).thenReturn(400);
+		when(mockParent.getHeight()).thenReturn(450);
 		when((View) mockView.getParent()).thenReturn(mockParent);
 
 		return mockView;
@@ -49,6 +50,7 @@ static View createWithAnimate() {
 		when(mockView.animate()).thenReturn(mockViewPropertyAnimator);
 
 		when(mockParent.getWidth()).thenReturn(400);
+		when(mockParent.getHeight()).thenReturn(450);
 
 		when((View) mockView.getParent()).thenReturn(mockParent);
 
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/SwipeOperatorTouchTest.java b/library/src/test/java/com/lorentzos/flingswipe/internal/SwipeOperatorTouchTest.java
index b28ee7de72..7fe21a4c35 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/SwipeOperatorTouchTest.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/SwipeOperatorTouchTest.java
@@ -82,6 +82,12 @@ public void testRecenter() throws Exception {
 		MotionEvent upEvent = MotionEventFactory.upEvent(10, 10);
 
 		swipeOperator = new SwipeOperator(new TestCardEventListener(scrollLatch) {
+
+			@Override
+			public void onCardExited(View view, @Direction int direction) {
+				super.onCardExited(view, direction);
+			}
+
 			@Override
 			public void onRecenter(View view) {
 				recenterLatch.countDown();
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/TestCardEventListener.java b/library/src/test/java/com/lorentzos/flingswipe/internal/TestCardEventListener.java
index 4388dca23e..3f4eaab1e1 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/TestCardEventListener.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/TestCardEventListener.java
@@ -25,7 +25,7 @@ public void onCardExited(View view, @Direction int direction) {
 	}
 
 	@Override
-	public void onScroll(View view, float scrollProgressPercent) {
+	public void onScroll(View view, float scrollProgressPercent, @Direction int direction) {
 		if (scrollLatch != null) {
 			scrollLatch.countDown();
 		}
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/TopTouchEventTest.java b/library/src/test/java/com/lorentzos/flingswipe/internal/TopTouchEventTest.java
index e1b58cc022..92c06f500e 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/TopTouchEventTest.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/TopTouchEventTest.java
@@ -38,11 +38,11 @@ public void topLeftOutside() throws Exception {
 		PointF topLeftTouch = new PointF(10f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topLeftTouch);
+		ScrollProgress progress = touchEvent.moveView(topLeftTouch);
 
 		// Then
 		verifyLeft(topLeftTouch);
-		verifyNegativeEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -51,11 +51,11 @@ public void bottomLeftOutside() throws Exception {
 		PointF bottomLeftTouch = new PointF(10f, 200f);
 
 		// When
-		float progress = touchEvent.moveView(bottomLeftTouch);
+		ScrollProgress  progress = touchEvent.moveView(bottomLeftTouch);
 
 		// Then
 		verifyLeft(bottomLeftTouch);
-		verifyNegativeEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -64,11 +64,11 @@ public void topRightOutside() throws Exception {
 		PointF topRightTouch = new PointF(330f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topRightTouch);
+		ScrollProgress  progress = touchEvent.moveView(topRightTouch);
 
 		// Then
 		verifyRight(topRightTouch);
-		verifyPositiveEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -77,11 +77,11 @@ public void bottomRightOutside() throws Exception {
 		PointF bottomRightTouch = new PointF(330f, 330f);
 
 		// When
-		float progress = touchEvent.moveView(bottomRightTouch);
+		ScrollProgress  progress = touchEvent.moveView(bottomRightTouch);
 
 		// Then
 		verifyRight(bottomRightTouch);
-		verifyPositiveEndingProgress(progress);
+		verifyPositiveEndingProgress(progress.progress);
 	}
 
 	@Test
@@ -90,11 +90,11 @@ public void topLeftInside() throws Exception {
 		PointF topLeftTouch = new PointF(110f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topLeftTouch);
+		ScrollProgress  progress = touchEvent.moveView(topLeftTouch);
 
 		// Then
 		verifyLeft(topLeftTouch);
-		verifyNegativeProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -103,11 +103,11 @@ public void bottomLeftInside() throws Exception {
 		PointF bottomLeftTouch = new PointF(110f, 200f);
 
 		// When
-		float progress = touchEvent.moveView(bottomLeftTouch);
+		ScrollProgress  progress = touchEvent.moveView(bottomLeftTouch);
 
 		// Then
 		verifyLeft(bottomLeftTouch);
-		verifyNegativeProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -116,11 +116,11 @@ public void topRightInside() throws Exception {
 		PointF topRightTouch = new PointF(290f, 10f);
 
 		// When
-		float progress = touchEvent.moveView(topRightTouch);
+		ScrollProgress  progress = touchEvent.moveView(topRightTouch);
 
 		// Then
 		verifyRight(topRightTouch);
-		verifyPositiveProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -129,11 +129,11 @@ public void bottomRightInside() throws Exception {
 		PointF bottomRightTouch = new PointF(230f, 160f);
 
 		// When
-		float progress = touchEvent.moveView(bottomRightTouch);
+		ScrollProgress progress = touchEvent.moveView(bottomRightTouch);
 
 		// Then
 		verifyRight(bottomRightTouch);
-		verifyPositiveProgress(progress);
+		verifyPositiveProgress(progress.progress);
 	}
 
 	@Test
@@ -142,13 +142,13 @@ public void onlyVerticalMove() throws Exception {
 		PointF verticalTouch = new PointF(120f, 160f);
 
 		// When
-		float progress = touchEvent.moveView(verticalTouch);
+		ScrollProgress progress = touchEvent.moveView(verticalTouch);
 
 		// Then
 		verify(mockView).setX(INITIAL_VIEW_X);
 		verify(mockView).setY(verticalTouch.y - initialTouch.y + INITIAL_VIEW_Y);
 		verify(mockView).setRotation(0);
-		Truth.assertThat(progress).isWithin(0);
+		Truth.assertThat(progress.progress).isWithin(0);
 	}
 
 	private void verifyLeft(PointF moveTouch) {
diff --git a/library/src/test/java/com/lorentzos/flingswipe/internal/TouchEventTest.java b/library/src/test/java/com/lorentzos/flingswipe/internal/TouchEventTest.java
index 88209631eb..9d6612d635 100644
--- a/library/src/test/java/com/lorentzos/flingswipe/internal/TouchEventTest.java
+++ b/library/src/test/java/com/lorentzos/flingswipe/internal/TouchEventTest.java
@@ -12,15 +12,8 @@ static void verifyPositiveEndingProgress(float progress) {
 		Truth.assertThat(progress).isWithin(1f);
 	}
 
-	static void verifyNegativeEndingProgress(float progress) {
-		Truth.assertThat(progress).isWithin(-1f);
-	}
-
 	static void verifyPositiveProgress(float progress) {
-		Truth.assertThat(progress).isIn(Range.closed(0f, 1f));
+		Truth.assertThat(progress).isIn(Range.greaterThan(0f));
 	}
 
-	static void verifyNegativeProgress(float progress) {
-		Truth.assertThat(progress).isIn(Range.closed(-1f, 0f));
-	}
 }