a better auto-close SwipeAdapter(sigle item mode)

daimajia · daimajia · commit 7db7da3f5872 · 2014-09-17T12:10:31.000+08:00
diff --git a/demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java b/demo/src/main/java/com/daimajia/swipedemo/adapter/ListViewAdapter.java
@@ -8,6 +8,7 @@
 
 import com.daimajia.androidanimations.library.Techniques;
 import com.daimajia.androidanimations.library.YoYo;
+import com.daimajia.swipe.SimpleSwipeListener;
 import com.daimajia.swipe.SwipeAdapter;
 import com.daimajia.swipe.SwipeLayout;
 import com.daimajia.swipedemo.R;
@@ -29,26 +30,11 @@ public int getSwipeLayoutResourceId(int position) {
     public View generateView(int position, ViewGroup parent) {
         View v = LayoutInflater.from(mContext).inflate(R.layout.listview_item, null);
         SwipeLayout swipeLayout = (SwipeLayout)v.findViewById(getSwipeLayoutResourceId(position));
-        swipeLayout.addSwipeListener(new SwipeLayout.SwipeListener() {
-            @Override
-            public void onClose(SwipeLayout layout) {
-
-            }
-
-            @Override
-            public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {
-
-            }
-
+        swipeLayout.addSwipeListener(new SimpleSwipeListener() {
             @Override
             public void onOpen(SwipeLayout layout) {
                 YoYo.with(Techniques.Tada).duration(500).delay(100).playOn(layout.findViewById(R.id.trash));
             }
-
-            @Override
-            public void onHandRelease(SwipeLayout layout, float xvel, float yvel) {
-
-            }
         });
         return v;
     }
diff --git a/library/src/main/java/com/daimajia/swipe/SimpleSwipeListener.java b/library/src/main/java/com/daimajia/swipe/SimpleSwipeListener.java
@@ -1,21 +1,25 @@
 package com.daimajia.swipe;
 
-/**
- * Created by sbaiget on 29/08/2014.
- */
 public class SimpleSwipeListener implements SwipeLayout.SwipeListener {
 
+    @Override
+    public void onStartOpen(SwipeLayout layout) {
+    }
 
     @Override
-    public void onClose(SwipeLayout layout) {
+    public void onOpen(SwipeLayout layout) {
     }
 
     @Override
-    public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {
+    public void onStartClose(SwipeLayout layout) {
     }
 
     @Override
-    public void onOpen(SwipeLayout layout) {
+    public void onClose(SwipeLayout layout) {
+    }
+
+    @Override
+    public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {
     }
 
     @Override
diff --git a/library/src/main/java/com/daimajia/swipe/SwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/SwipeAdapter.java
@@ -149,21 +149,22 @@ public void setPosition(int position){
         public void onLayout(SwipeLayout v) {
             if(mode == Mode.Multiple){
                 if(mOpenPositions.contains(position))
-                    v.open(false);
+                    v.open(false, false);
                 else{
-                    v.close(false);
+                    v.close(false, false);
                 }
             }else{
                 if(mOpenPosition == position){
-                    v.open(false);
+                    v.open(false, false);
                 }else{
-                    v.close(false);
+                    v.close(false, false);
                 }
             }
         }
+
     }
 
-    class SwipeMemory implements SwipeLayout.SwipeListener {
+    class SwipeMemory extends SimpleSwipeListener{
 
         private int position;
 
@@ -176,25 +177,16 @@ public void onClose(SwipeLayout layout) {
             if(mode == Mode.Multiple)
                 mOpenPositions.remove(position);
             else{
-                if(position == mOpenPosition){
+                if (position == mOpenPosition) {
                     mOpenPosition = INVALID_POSITION;
                     mPrevious = null;
                 }
-
             }
         }
 
-
         @Override
-        public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {
-
-        }
-
-        @Override
-        public void onOpen(SwipeLayout layout) {
-            if(mode == Mode.Multiple)
-                mOpenPositions.add(position);
-            else{
+        public void onStartOpen(SwipeLayout layout) {
+            if(mode == Mode.Single) {
                 if(mOpenPosition != position){
                     if(mPrevious != null)
                         mPrevious.close();
@@ -205,15 +197,14 @@ public void onOpen(SwipeLayout layout) {
         }
 
         @Override
-        public void onHandRelease(SwipeLayout layout, float xvel, float yvel) {
-
+        public void onOpen(SwipeLayout layout) {
+            if(mode == Mode.Multiple)
+                mOpenPositions.add(position);
         }
 
         public void setPosition(int position){
             this.position = position;
         }
     }
 
-
-
 }
diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java
@@ -70,9 +70,11 @@ public SwipeLayout(Context context, AttributeSet attrs, int defStyle) {
 
 
     public interface SwipeListener{
+        public void onStartOpen(SwipeLayout layout);
+        public void onOpen(SwipeLayout layout);
+        public void onStartClose(SwipeLayout layout);
         public void onClose(SwipeLayout layout);
         public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset);
-        public void onOpen(SwipeLayout layout);
         public void onHandRelease(SwipeLayout layout, float xvel, float yvel);
     }
 
@@ -324,13 +326,11 @@ public void onViewPositionChanged(View changedView, int left, int top, int dx, i
 
                     getSurfaceView().layout(newLeft, newTop, newLeft + getMeasuredWidth(), newTop + getMeasuredHeight());
                 }
-
-
             }
 
             dispatchRevealEvent(evLeft, evTop, evRight, evBottom);
 
-            dispatchSwipeEvent(evLeft, evTop);
+            dispatchSwipeEvent(evLeft, evTop, dx, dy);
 
             invalidate();
         }
@@ -441,29 +441,54 @@ protected Rect getRelativePosition(View child){
         return r;
     }
 
-    /**
-     * dispatch swipe event.
-     * @param surfaceLeft
-     * @param surfaceTop
-     */
-    protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop){
+    private int mEventCounter = 0;
+
+    protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop, int dx, int dy){
+        DragEdge edge = getDragEdge();
+        boolean open = true;
+        if(edge == DragEdge.Left){
+            if(dx < 0)  open = false;
+        }else if(edge == DragEdge.Right){
+            if(dx > 0)  open = false;
+        }else if(edge == DragEdge.Top){
+            if(dy < 0)  open = false;
+        }else if(edge == DragEdge.Bottom){
+            if(dy > 0)  open = false;
+        }
+
+        dispatchSwipeEvent(surfaceLeft, surfaceTop, open);
+    }
 
+    protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop, boolean open){
         safeBottomView();
+        Status status = getOpenStatus();
 
-        if(mSwipeListeners.isEmpty() == false){
+        if(!mSwipeListeners.isEmpty()){
+            mEventCounter++;
             for(SwipeListener l : mSwipeListeners){
+                if(mEventCounter == 1){
+                    if(open){
+                        l.onStartOpen(this);
+                    }else{
+                        l.onStartClose(this);
+                    }
+                }
                 l.onUpdate(SwipeLayout.this, surfaceLeft - getPaddingLeft(), surfaceTop - getPaddingTop());
             }
 
-            if(getOpenStatus() == Status.Close){
-                for(SwipeListener l : mSwipeListeners)
+            if(status == Status.Close){
+                for(SwipeListener l : mSwipeListeners){
                     l.onClose(SwipeLayout.this);
+                }
+                mEventCounter = 0;
             }
 
-            if(getOpenStatus() == Status.Open){
+            if(status == Status.Open){
                 getBottomView().setEnabled(true);
-                for(SwipeListener l : mSwipeListeners)
+                for(SwipeListener l : mSwipeListeners){
                     l.onOpen(SwipeLayout.this);
+                }
+                mEventCounter = 0;
             }
         }
     }
@@ -1082,22 +1107,34 @@ private void processBottomLayDownMode(float xvel, float yvel){
      * smoothly open surface.
      */
     public void open(){
-        open(true);
+        open(true, true);
     }
 
     public void open(boolean smooth){
+        open(smooth, true);
+    }
+
+    public void open(boolean smooth, boolean notify){
+        ViewGroup surface = getSurfaceView(), bottom = getBottomView();
+        int dx,dy;
         Rect rect = computeSurfaceLayoutArea(true);
         if(smooth) {
             mDragHelper.smoothSlideViewTo(getSurfaceView(), rect.left, rect.top);
         }
         else{
-            getSurfaceView().layout(rect.left, rect.top, rect.right, rect.bottom);
+            dx = rect.left - surface.getLeft();
+            dy = rect.top - surface.getTop();
+            surface.layout(rect.left, rect.top, rect.right, rect.bottom);
             if(getShowMode() == ShowMode.PullOut){
                 Rect bRect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, rect);
-                getBottomView().layout(bRect.left, bRect.top, bRect.right, bRect.bottom);
+                bottom.layout(bRect.left, bRect.top, bRect.right, bRect.bottom);
+            }
+            if(notify) {
+                dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom);
+                dispatchSwipeEvent(rect.left, rect.top, dx, dy);
+            }else{
+                safeBottomView();
             }
-            dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom);
-            dispatchSwipeEvent(rect.left, rect.top);
         }
         invalidate();
     }
@@ -1106,27 +1143,38 @@ public void open(boolean smooth){
      * smoothly close surface.
      */
     public void close(){
-        close(true);
+        close(true, true);
+    }
+
+    public void close(boolean smooth){
+        close(smooth, true);
     }
 
     /**
      * close surface
      * @param smooth smoothly or not.
+     * @param notify if notify all the listeners.
      */
-    public void close(boolean smooth){
+    public void close(boolean smooth, boolean notify){
+        ViewGroup surface = getSurfaceView();
+        int dx, dy;
         if(smooth)
             mDragHelper.smoothSlideViewTo(getSurfaceView(), getPaddingLeft(), getPaddingTop());
         else {
             Rect rect = computeSurfaceLayoutArea(false);
-            getSurfaceView().layout(rect.left, rect.top, rect.right, rect.bottom);
-            dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom);
-            dispatchSwipeEvent(rect.left, rect.top);
+            dx = rect.left - surface.getLeft();
+            dy = rect.top - surface.getTop();
+            surface.layout(rect.left, rect.top, rect.right, rect.bottom);
+            if(notify) {
+                dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom);
+                dispatchSwipeEvent(rect.left, rect.top, dx, dy);
+            }else{
+                safeBottomView();
+            }
         }
         invalidate();
     }
 
-
-
     public void toggle(){
         toggle(true);
     }

Original file line number	Diff line number	Diff line change
`@@ -149,21 +149,22 @@ public void setPosition(int position){`
`149`	`149`	`public void onLayout(SwipeLayout v) {`
`150`	`150`	`if(mode == Mode.Multiple){`
`151`	`151`	`if(mOpenPositions.contains(position))`
`152`		`- v.open(false);`
	`152`	`+ v.open(false, false);`
`153`	`153`	`else{`
`154`		`- v.close(false);`
	`154`	`+ v.close(false, false);`
`155`	`155`	`}`
`156`	`156`	`}else{`
`157`	`157`	`if(mOpenPosition == position){`
`158`		`- v.open(false);`
	`158`	`+ v.open(false, false);`
`159`	`159`	`}else{`
`160`		`- v.close(false);`
	`160`	`+ v.close(false, false);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`}`
	`164`	`+`
`164`	`165`	`}`
`165`	`166`
`166`		`- class SwipeMemory implements SwipeLayout.SwipeListener {`
	`167`	`+ class SwipeMemory extends SimpleSwipeListener{`
`167`	`168`
`168`	`169`	`private int position;`
`169`	`170`
`@@ -176,25 +177,16 @@ public void onClose(SwipeLayout layout) {`
`176`	`177`	`if(mode == Mode.Multiple)`
`177`	`178`	`mOpenPositions.remove(position);`
`178`	`179`	`else{`
`179`		`- if(position == mOpenPosition){`
	`180`	`+ if (position == mOpenPosition) {`
`180`	`181`	`mOpenPosition = INVALID_POSITION;`
`181`	`182`	`mPrevious = null;`
`182`	`183`	`}`
`183`		`-`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`-`
`188`	`187`	`@Override`
`189`		`- public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {`
`190`		`-`
`191`		`- }`
`192`		`-`
`193`		`- @Override`
`194`		`- public void onOpen(SwipeLayout layout) {`
`195`		`- if(mode == Mode.Multiple)`
`196`		`- mOpenPositions.add(position);`
`197`		`- else{`
	`188`	`+ public void onStartOpen(SwipeLayout layout) {`
	`189`	`+ if(mode == Mode.Single) {`
`198`	`190`	`if(mOpenPosition != position){`
`199`	`191`	`if(mPrevious != null)`
`200`	`192`	`mPrevious.close();`
`@@ -205,15 +197,14 @@ public void onOpen(SwipeLayout layout) {`
`205`	`197`	`}`
`206`	`198`
`207`	`199`	`@Override`
`208`		`- public void onHandRelease(SwipeLayout layout, float xvel, float yvel) {`
`209`		`-`
	`200`	`+ public void onOpen(SwipeLayout layout) {`
	`201`	`+ if(mode == Mode.Multiple)`
	`202`	`+ mOpenPositions.add(position);`
`210`	`203`	`}`
`211`	`204`
`212`	`205`	`public void setPosition(int position){`
`213`	`206`	`this.position = position;`
`214`	`207`	`}`
`215`	`208`	`}`
`216`	`209`
`217`		`-`
`218`		`-`
`219`	`210`	`}`