From dee951d85d6246c35ec457a34de39ea5205eb29f Mon Sep 17 00:00:00 2001 From: Rahul Raja Date: Fri, 12 Dec 2014 16:44:48 +0530 Subject: [PATCH 1/2] Added horizontal and vertical offset for swiping --- demo/src/main/res/layout/listview_item.xml | 2 ++ .../src/main/java/com/daimajia/swipe/SwipeLayout.java | 9 +++++++-- library/src/main/res/values/attrs.xml | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/demo/src/main/res/layout/listview_item.xml b/demo/src/main/res/layout/listview_item.xml index 54cc383..db12e97 100644 --- a/demo/src/main/res/layout/listview_item.xml +++ b/demo/src/main/res/layout/listview_item.xml @@ -3,9 +3,11 @@ android:layout_width="match_parent" android:layout_height="match_parent"> mSwipeListeners = new ArrayList(); private List mSwipeDeniers = new ArrayList(); private Map> mRevealListeners = new HashMap>(); @@ -65,6 +68,8 @@ public class SwipeLayout extends FrameLayout { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwipeLayout); int ordinal = a.getInt(R.styleable.SwipeLayout_drag_edge, DragEdge.Right.ordinal()); + horizontalSwipeOffset =a.getDimension(R.styleable.SwipeLayout_horizontalSwipeOffset,0); + verticalSwipeOffset =a.getDimension(R.styleable.SwipeLayout_verticalSwipeOffset,0); mDragEdge = DragEdge.values()[ordinal]; ordinal = a.getInt(R.styleable.SwipeLayout_show_mode, ShowMode.PullOut.ordinal()); mShowMode = ShowMode.values()[ordinal]; @@ -657,9 +662,9 @@ public class SwipeLayout extends FrameLayout { super.onMeasure(widthMeasureSpec, heightMeasureSpec); if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right) - mDragDistance = getBottomView().getMeasuredWidth(); + mDragDistance = getBottomView().getMeasuredWidth()-dp2px(horizontalSwipeOffset); else - mDragDistance = getBottomView().getMeasuredHeight(); + mDragDistance = getBottomView().getMeasuredHeight()-dp2px(verticalSwipeOffset); } private boolean mTouchConsumedByChild = false; diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index c574ff7..9f69031 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -7,6 +7,8 @@ + + From ce1eb70c86b74ee8dce056840eb6e42612c01bd6 Mon Sep 17 00:00:00 2001 From: RAHUL RAJA Date: Fri, 12 Dec 2014 23:04:15 +0530 Subject: [PATCH 2/2] Update SwipeLayout.java Changed Variable names --- .../main/java/com/daimajia/swipe/SwipeLayout.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java index d87144c..b125c02 100644 --- a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java +++ b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java @@ -30,8 +30,8 @@ public class SwipeLayout extends FrameLayout { private DragEdge mDragEdge; private ShowMode mShowMode; - private float horizontalSwipeOffset; - private float verticalSwipeOffset; + private float mHorizontalSwipeOffset; + private float mVerticalSwipeOffset; private List mSwipeListeners = new ArrayList(); private List mSwipeDeniers = new ArrayList(); @@ -68,8 +68,8 @@ public class SwipeLayout extends FrameLayout { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwipeLayout); int ordinal = a.getInt(R.styleable.SwipeLayout_drag_edge, DragEdge.Right.ordinal()); - horizontalSwipeOffset =a.getDimension(R.styleable.SwipeLayout_horizontalSwipeOffset,0); - verticalSwipeOffset =a.getDimension(R.styleable.SwipeLayout_verticalSwipeOffset,0); + mHorizontalSwipeOffset =a.getDimension(R.styleable.SwipeLayout_horizontalSwipeOffset,0); + mVerticalSwipeOffset =a.getDimension(R.styleable.SwipeLayout_verticalSwipeOffset,0); mDragEdge = DragEdge.values()[ordinal]; ordinal = a.getInt(R.styleable.SwipeLayout_show_mode, ShowMode.PullOut.ordinal()); mShowMode = ShowMode.values()[ordinal]; @@ -662,9 +662,9 @@ public class SwipeLayout extends FrameLayout { super.onMeasure(widthMeasureSpec, heightMeasureSpec); if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right) - mDragDistance = getBottomView().getMeasuredWidth()-dp2px(horizontalSwipeOffset); + mDragDistance = getBottomView().getMeasuredWidth()-dp2px(mHorizontalSwipeOffset); else - mDragDistance = getBottomView().getMeasuredHeight()-dp2px(verticalSwipeOffset); + mDragDistance = getBottomView().getMeasuredHeight()-dp2px(mVerticalSwipeOffset); } private boolean mTouchConsumedByChild = false;