From 40c8b8ef1203a3e8e5ffd97821a88db67263f4a1 Mon Sep 17 00:00:00 2001
From: baoyz <baoyz@live.com>
Date: Fri, 5 Sep 2014 16:06:50 +0800
Subject: [PATCH] add OnSwipeListener

---
 .../swipemenulistview/SwipeMenuListView.java  | 50 ++++++++++++-------
 sample/AndroidManifest.xml                    |  2 +-
 .../swipemenulistviewsample/MainActivity.java | 17 ++++++-
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/library/src/com/baoyz/swipemenulistview/SwipeMenuListView.java b/library/src/com/baoyz/swipemenulistview/SwipeMenuListView.java
index 13b1b52..6af690a 100644
--- a/library/src/com/baoyz/swipemenulistview/SwipeMenuListView.java
+++ b/library/src/com/baoyz/swipemenulistview/SwipeMenuListView.java
@@ -31,6 +31,7 @@ public class SwipeMenuListView extends ListView {
 	private int mTouchState;
 	private int mTouchPosition;
 	private SwipeMenuLayout mTouchView;
+	private OnSwipeListener mOnSwipeListener;
 
 	private SwipeMenuCreator mMenuCreator;
 	private OnMenuItemClickListener mOnMenuItemClickListener;
@@ -81,23 +82,23 @@ public void onItemClick(SwipeMenuView view, SwipeMenu menu,
 			}
 		});
 	}
-	
-	public void setCloseInterpolator(Interpolator interpolator){
+
+	public void setCloseInterpolator(Interpolator interpolator) {
 		mCloseInterpolator = interpolator;
 	}
-	
-	public void setOpenInterpolator(Interpolator interpolator){
+
+	public void setOpenInterpolator(Interpolator interpolator) {
 		mOpenInterpolator = interpolator;
 	}
-	
-	public Interpolator getOpenInterpolator(){
+
+	public Interpolator getOpenInterpolator() {
 		return mOpenInterpolator;
 	}
-	
-	public Interpolator getCloseInterpolator(){
+
+	public Interpolator getCloseInterpolator() {
 		return mCloseInterpolator;
 	}
-	
+
 	@Override
 	public boolean onInterceptTouchEvent(MotionEvent ev) {
 		return super.onInterceptTouchEvent(ev);
@@ -105,9 +106,9 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 
 	@Override
 	public boolean onTouchEvent(MotionEvent ev) {
-		if(ev.getAction() != MotionEvent.ACTION_DOWN && mTouchView == null)
+		if (ev.getAction() != MotionEvent.ACTION_DOWN && mTouchView == null)
 			return super.onTouchEvent(ev);
-		int action = MotionEventCompat.getActionMasked(ev); 
+		int action = MotionEventCompat.getActionMasked(ev);
 		action = ev.getAction();
 		switch (action) {
 		case MotionEvent.ACTION_DOWN:
@@ -117,7 +118,7 @@ public boolean onTouchEvent(MotionEvent ev) {
 
 			mTouchPosition = pointToPosition((int) ev.getX(), (int) ev.getY());
 			View view = getChildAt(mTouchPosition - getFirstVisiblePosition());
-			
+
 			if (mTouchView != null && mTouchView.isOpen()) {
 				mTouchView.smoothCloseMenu();
 				mTouchView = null;
@@ -141,14 +142,14 @@ public boolean onTouchEvent(MotionEvent ev) {
 				ev.setAction(MotionEvent.ACTION_CANCEL);
 				super.onTouchEvent(ev);
 				return true;
-			} else {
-				// Log.i("byz", "state = " + mTouchState + ", dx = " + dx
-				// + ", max = " + MAX_X);
-				if (mTouchState != TOUCH_STATE_X && Math.abs(dy) > MAX_Y) {
+			} else if (mTouchState == TOUCH_STATE_NONE) {
+				if (Math.abs(dy) > MAX_Y) {
 					mTouchState = TOUCH_STATE_Y;
-				}
-				if (mTouchState != TOUCH_STATE_Y && dx > MAX_X) {
+				} else if (dx > MAX_X) {
 					mTouchState = TOUCH_STATE_X;
+					if (mOnSwipeListener != null) {
+						mOnSwipeListener.onSwipeStart(mTouchPosition);
+					}
 				}
 			}
 			break;
@@ -157,6 +158,9 @@ public boolean onTouchEvent(MotionEvent ev) {
 				if (mTouchView != null) {
 					mTouchView.onSwipe(ev);
 				}
+				if (mOnSwipeListener != null) {
+					mOnSwipeListener.onSwipeEnd(mTouchPosition);
+				}
 				ev.setAction(MotionEvent.ACTION_CANCEL);
 				super.onTouchEvent(ev);
 				return true;
@@ -180,7 +184,17 @@ public void setOnMenuItemClickListener(
 		this.mOnMenuItemClickListener = onMenuItemClickListener;
 	}
 
+	public void setOnSwipeListener(OnSwipeListener onSwipeListener) {
+		this.mOnSwipeListener = onSwipeListener;
+	}
+
 	public static interface OnMenuItemClickListener {
 		void onMenuItemClick(int position, SwipeMenu menu, int index);
 	}
+
+	public static interface OnSwipeListener {
+		void onSwipeStart(int position);
+
+		void onSwipeEnd(int position);
+	}
 }
diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
index 805bc2a..016251b 100644
--- a/sample/AndroidManifest.xml
+++ b/sample/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="21" />
-
+    
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
diff --git a/sample/src/com/baoyz/swipemenulistviewsample/MainActivity.java b/sample/src/com/baoyz/swipemenulistviewsample/MainActivity.java
index 899ec44..844a11c 100644
--- a/sample/src/com/baoyz/swipemenulistviewsample/MainActivity.java
+++ b/sample/src/com/baoyz/swipemenulistviewsample/MainActivity.java
@@ -14,9 +14,7 @@
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.BounceInterpolator;
 import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -28,6 +26,7 @@
 import com.baoyz.swipemenulistview.SwipeMenuItem;
 import com.baoyz.swipemenulistview.SwipeMenuListView;
 import com.baoyz.swipemenulistview.SwipeMenuListView.OnMenuItemClickListener;
+import com.baoyz.swipemenulistview.SwipeMenuListView.OnSwipeListener;
 
 public class MainActivity extends Activity {
 
@@ -103,6 +102,20 @@ public void onMenuItemClick(int position, SwipeMenu menu, int index) {
 				}
 			}
 		});
+		
+		// set SwipeListener
+		listView.setOnSwipeListener(new OnSwipeListener() {
+			
+			@Override
+			public void onSwipeStart(int position) {
+				// swipe start
+			}
+			
+			@Override
+			public void onSwipeEnd(int position) {
+				// swipe end
+			}
+		});
 
 		// other setting
 //		listView.setCloseInterpolator(new BounceInterpolator());