From 41b5524caede655a0afc1c95efad853868cca7d1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 17 Apr 2016 16:07:09 -0400 Subject: [PATCH] Fix edge detection for swipe back --- .../com/moez/QKSMS/ui/SwipeBackLayout.java | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java index 8d8f88b6..26f9ad46 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/SwipeBackLayout.java @@ -94,7 +94,7 @@ public class SwipeBackLayout extends FrameLayout { public SwipeBackLayout(Context context, AttributeSet attrs, int defStyle) { super(context, attrs); - mDragHelper = ViewDragHelper.create(this, 1.0f, new ViewDragCallback()); + mDragHelper = ViewDragHelper.create(this, 0.2f, new ViewDragCallback()); int shadowLeft = R.drawable.shadow_left; int shadowBottom = R.drawable.shadow_bottom; @@ -317,8 +317,7 @@ public class SwipeBackLayout extends FrameLayout { final boolean drawContent = child == mContentView; boolean ret = super.drawChild(canvas, child, drawingTime); - if (mScrimOpacity > 0 && drawContent - && mDragHelper.getViewDragState() != ViewDragHelper.STATE_IDLE) { + if (mScrimOpacity > 0 && drawContent && mDragHelper.getViewDragState() != ViewDragHelper.STATE_IDLE) { drawShadow(canvas, child); drawScrim(canvas, child); } @@ -392,30 +391,22 @@ public class SwipeBackLayout extends FrameLayout { @Override public boolean tryCaptureView(View view, int i) { - boolean ret = mDragHelper.isEdgeTouched(mEdgeFlag, i); - if (ret) { - if (mDragHelper.isEdgeTouched(EDGE_LEFT, i)) { - mTrackingEdge = EDGE_LEFT; - } else if (mDragHelper.isEdgeTouched(EDGE_BOTTOM, i)) { - mTrackingEdge = EDGE_BOTTOM; + mTrackingEdge = EDGE_LEFT; + if (mListeners != null && !mListeners.isEmpty()) { + for (SwipeListener listener : mListeners) { + listener.onEdgeTouch(mTrackingEdge); } - if (mListeners != null && !mListeners.isEmpty()) { - for (SwipeListener listener : mListeners) { - listener.onEdgeTouch(mTrackingEdge); - } - } - mIsScrollOverValid = true; } + mIsScrollOverValid = true; boolean directionCheck = false; if (mEdgeFlag == EDGE_LEFT) { directionCheck = !mDragHelper.checkTouchSlop(ViewDragHelper.DIRECTION_VERTICAL, i); } else if (mEdgeFlag == EDGE_BOTTOM) { - directionCheck = !mDragHelper - .checkTouchSlop(ViewDragHelper.DIRECTION_HORIZONTAL, i); + directionCheck = !mDragHelper.checkTouchSlop(ViewDragHelper.DIRECTION_HORIZONTAL, i); } else if (mEdgeFlag == EDGE_ALL) { directionCheck = true; } - return ret & directionCheck; + return directionCheck; } @Override