Update

Leaqi · Jun 22, 2022 · cfe80d6 · cfe80d6
1 parent ef80ef9
commit cfe80d6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Android SwipeDrawer滑动抽屉库，可同时添加上下左右四个方向抽
 
     dependencies {
         ...
-        implementation 'cn.Leaqi:SwipeDrawer:1.0'
+        implementation 'cn.Leaqi:SwipeDrawer:1.1'
     }
 
 在布局文件中加入 `SwipeDrawer` ：

diff --git a/README_en.md b/README_en.md
@@ -22,7 +22,7 @@ Add `SwipeDrawer` dependencies：
 
     dependencies {
         ...
-        implementation 'cn.Leaqi:SwipeDrawer:1.0'
+        implementation 'cn.Leaqi:SwipeDrawer:1.1'
     }
 
 Add `SwipeDrawer` to the layout file ：

diff --git a/drawer/src/main/java/cn/leaqi/drawer/SwipeDrawer.java b/drawer/src/main/java/cn/leaqi/drawer/SwipeDrawer.java
@@ -107,6 +107,7 @@ public class SwipeDrawer extends ViewGroup {
     private float shrinkRange = 5;
     private int dragDamping = 10;
     private int dragRange = 0;
+    private int dragSlop = 5;
     private int maxDragSize = 0;
     private int duration = 200;
     private int maskColor = -2147483648;
@@ -178,6 +179,7 @@ private void attrInit(Context context, AttributeSet attr) {
             float getShrinkRange = attrArr.getFloat(R.styleable.SwipeDrawer_shrinkRange, shrinkRange);
             int getDragDamping = attrArr.getInteger(R.styleable.SwipeDrawer_dragDamping, dragDamping);
             int getDragRange = attrArr.getDimensionPixelSize(R.styleable.SwipeDrawer_dragRange, dragRange);
+            int getDragSlop = attrArr.getDimensionPixelSize(R.styleable.SwipeDrawer_dragSlop, dragSlop);
             int getMaxDragSize = attrArr.getDimensionPixelSize(R.styleable.SwipeDrawer_maxDragSize, maxDragSize);
             int getDuration = attrArr.getInteger(R.styleable.SwipeDrawer_duration, duration);
             int getMaskColor = attrArr.getColor(R.styleable.SwipeDrawer_maskColor, maskColor);
@@ -217,6 +219,7 @@ private void attrInit(Context context, AttributeSet attr) {
             setShrinkRange(getShrinkRange);
             setDragDamping(getDragDamping);
             setDragRange(getDragRange);
+            setDragSlop(getDragSlop);
             setMaxDragSize(getMaxDragSize);
             setMaskColor(getMaskColor);
             setDuration(getDuration);
@@ -331,6 +334,11 @@ public void setDragRange(int num) {
         dragRange = num;
     }
 
+    public void setDragSlop(int num) {
+        if (num < 0) num = 0;
+        dragSlop = num;
+    }
+
     public void setMaxDragSize(int num) {
         if (num < 0) num = 0;
         maxDragSize = num;
@@ -685,6 +693,10 @@ public int getDragRange() {
         return dragRange;
     }
 
+    public int getDragSlop() {
+        return dragSlop;
+    }
+
     public int getMaxDragSize() {
         return maxDragSize;
     }
@@ -1246,6 +1258,9 @@ private boolean checkIntercept(MotionEvent ev) {
         int getY = (int) ev.getY();
         int shiftX = getX - downX;
         int shiftY = getY - downY;
+        if (dragSlop > 0 && Math.abs(shiftX) < dragSlop && Math.abs(shiftY) < dragSlop){
+            return false;
+        }
         ViewUtils viewUtils = getIntercept(shiftX, shiftY);
         if (isShow && (mainOpen == MAIN_OPEN_CLICK || mainOpen == MAIN_OPEN_INTERCEPT)) {
             ViewUtils showUtils = getViewUtils(inDirection);
@@ -1416,7 +1431,7 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
             case MotionEvent.ACTION_CANCEL:
                 int getMoveX = Math.abs(getX - downX);
                 int getMoveY = Math.abs(getY - downY);
-                if (!isIntercept && (getMs - downMs) < ViewConfiguration.getLongPressTimeout() && getMoveX < 3 && getMoveY < 3){
+                if (!isIntercept && ((getMoveX == 0 && getMoveY == 0) || (getMs - downMs) < ViewConfiguration.getLongPressTimeout()) && (dragSlop == 0 || (getMoveX < dragSlop && getMoveY < dragSlop))){
                     boolean isClose = false;
                     if (isShow && maskClose && maskView != null) {
                         ViewUtils showUtils = getViewUtils(inDirection);
@@ -1546,7 +1561,8 @@ public boolean onTouchEvent(MotionEvent ev) {
                 } else {
                     int getMoveX = Math.abs(getX - downX);
                     int getMoveY = Math.abs(getY - downY);
-                    if ((getMs - downMs) < ViewConfiguration.getLongPressTimeout() && getMoveX < 3 && getMoveY < 3) performClick();
+                    if (((getMoveX == 0 && getMoveY == 0) || (getMs - downMs) < ViewConfiguration.getLongPressTimeout()) && (dragSlop == 0 || (getMoveX < dragSlop && getMoveY < dragSlop))) performClick();
+                    //return super.onTouchEvent(ev);
                 }
                 break;
         }

diff --git a/drawer/src/main/res/values/attrs.xml b/drawer/src/main/res/values/attrs.xml
@@ -91,6 +91,7 @@
         <attr name="shrinkRange" format="float" />
         <attr name="dragDamping" format="integer" />
         <attr name="dragRange" format="dimension" />
+        <attr name="dragSlop" format="dimension" />
         <attr name="maxDragSize" format="dimension" />
         <attr name="duration" format="integer" />
         <attr name="interpolator" format="reference" />