From 2bb3fc3defd7873bbe823442865ef7a69f63ddb5 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 6 Sep 2016 19:31:26 +0100 Subject: [PATCH] Fix #125 Fixed swiping issues --- .../materialintro/view/SwipeBlockableViewPager.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/library/src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java b/library/src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java index 90c2d1d..a72549c 100644 --- a/library/src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java +++ b/library/src/main/java/com/heinrichreimersoftware/materialintro/view/SwipeBlockableViewPager.java @@ -2,7 +2,6 @@ import android.content.Context; import android.support.annotation.IntDef; -import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; @@ -61,15 +60,15 @@ public boolean onInterceptTouchEvent(MotionEvent event) { private boolean handleTouchEvent(MotionEvent event) { if (getSwipeDirection(event) == SWIPE_DIRECTION_RIGHT && !swipeRightEnabled) { if (!locked) { - updatePosition(); locked = true; + updatePosition(); } return false; } else if (getSwipeDirection(event) == SWIPE_DIRECTION_LEFT && !swipeLeftEnabled) { if (!locked) { - updatePosition(); locked = true; + updatePosition(); } return false; } @@ -80,10 +79,6 @@ else if (getSwipeDirection(event) == SWIPE_DIRECTION_LEFT && !swipeLeftEnabled) private void updatePosition() { int currentItem = getCurrentItem(); scrollTo(currentItem * getWidth(), getScrollY()); - PagerAdapter adapter = getAdapter(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } setCurrentItem(currentItem); } @@ -103,7 +98,7 @@ public int getSwipeDirection(MotionEvent event) { } if (distanceX > 0) { return SWIPE_DIRECTION_RIGHT; - } else { + } else if (distanceX < 0) { return SWIPE_DIRECTION_LEFT; } }