diff --git a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java index 18fb36f..7548343 100644 --- a/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java +++ b/demo/src/main/java/com/daimajia/swipedemo/MyActivity.java @@ -28,7 +28,8 @@ public class MyActivity extends Activity { sample1 = (SwipeLayout) findViewById(R.id.sample1); sample1.setShowMode(SwipeLayout.ShowMode.LayDown); - sample1.setDragEdge(SwipeLayout.DragEdge.Left); + sample1.setDragEdges(SwipeLayout.DragEdge.Left, SwipeLayout.DragEdge.Right); + Toast.makeText(this, sample1.getDragEdge() + " is the drag edge", Toast.LENGTH_LONG).show(); sample1.addRevealListener(R.id.delete, new SwipeLayout.OnRevealListener() { @Override public void onReveal(View child, SwipeLayout.DragEdge edge, float fraction, int distance) { @@ -36,10 +37,32 @@ public class MyActivity extends Activity { } }); + sample1.findViewById(R.id.star2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(MyActivity.this, "Star", Toast.LENGTH_SHORT).show(); + } + }); + + sample1.findViewById(R.id.trash2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(MyActivity.this, "Trash Bin", Toast.LENGTH_SHORT).show(); + } + }); + + sample1.findViewById(R.id.magnifier2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(MyActivity.this, "Magnifier", Toast.LENGTH_SHORT).show(); + } + }); + //sample2 sample2 = (SwipeLayout) findViewById(R.id.sample2); sample2.setShowMode(SwipeLayout.ShowMode.LayDown); + sample2.setDragEdge(SwipeLayout.DragEdge.Right); // sample2.setShowMode(SwipeLayout.ShowMode.PullOut); sample2.findViewById(R.id.star).setOnClickListener(new View.OnClickListener() { @Override diff --git a/demo/src/main/res/layout/listview_item.xml b/demo/src/main/res/layout/listview_item.xml index db12e97..e88954f 100644 --- a/demo/src/main/res/layout/listview_item.xml +++ b/demo/src/main/res/layout/listview_item.xml @@ -7,7 +7,8 @@ android:id="@+id/swipe" android:layout_width="match_parent" android:layout_height="wrap_content" - swipe:horizontalSwipeOffset="25dp" + swipe:leftEdgeSwipeOffset="25dp" + swipe:rightEdgeSwipeOffset="25dp" > + + + + + + + diff --git a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java index 5d6cdc3..014d8fa 100644 --- a/library/src/main/java/com/daimajia/swipe/SwipeLayout.java +++ b/library/src/main/java/com/daimajia/swipe/SwipeLayout.java @@ -6,6 +6,7 @@ import android.graphics.Rect; import android.support.v4.view.ViewCompat; import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; +import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; @@ -22,16 +23,30 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class SwipeLayout extends FrameLayout { +public class SwipeLayout extends FrameLayout +{ + private static final int DRAG_LEFT = 1; + private static final int DRAG_RIGHT = 2; + private static final int DRAG_TOP = 4; + private static final int DRAG_BOTTOM = 8; + + private int mLeftIndex; + private int mRightIndex; + private int mTopIndex; + private int mBottomIndex; + + private int currentDirectionIndex = 0; private ViewDragHelper mDragHelper; private int mDragDistance = 0; - private DragEdge mDragEdge; + private List mDragEdges; private ShowMode mShowMode; - private float mHorizontalSwipeOffset; - private float mVerticalSwipeOffset; + private float mLeftEdgeSwipeOffset; + private float mRightEdgeSwipeOffset; + private float mTopEdgeSwipeOffset; + private float mBottomEdgeSwipeOffset; private List mSwipeListeners = new ArrayList(); private List mSwipeDeniers = new ArrayList(); @@ -42,130 +57,171 @@ public class SwipeLayout extends FrameLayout { private boolean mSwipeEnabled = true; - public static enum DragEdge { + public static enum DragEdge + { Left, Right, Top, Bottom; }; - public static enum ShowMode { - LayDown, PullOut + public static enum ShowMode + { + LayDown, + PullOut } - - public SwipeLayout(Context context) { + public SwipeLayout(Context context) + { this(context, null); } - public SwipeLayout(Context context, AttributeSet attrs) { + public SwipeLayout(Context context, AttributeSet attrs) + { this(context, attrs, 0); } - public SwipeLayout(Context context, AttributeSet attrs, int defStyle) { + public SwipeLayout(Context context, AttributeSet attrs, int defStyle) + { super(context, attrs, defStyle); mDragHelper = ViewDragHelper.create(this, mDragHelperCallback); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwipeLayout); - int ordinal = a.getInt(R.styleable.SwipeLayout_drag_edge, DragEdge.Right.ordinal()); - 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()); + int dragEdgeChoices = a.getInt(R.styleable.SwipeLayout_drag_edge, DragEdge.Right.ordinal()); + mLeftEdgeSwipeOffset = a.getDimension(R.styleable.SwipeLayout_leftEdgeSwipeOffset, 0); + mRightEdgeSwipeOffset = a.getDimension(R.styleable.SwipeLayout_rightEdgeSwipeOffset, 0); + mTopEdgeSwipeOffset = a.getDimension(R.styleable.SwipeLayout_topEdgeSwipeOffset, 0); + mBottomEdgeSwipeOffset = a.getDimension(R.styleable.SwipeLayout_bottomEdgeSwipeOffset, 0); + + mDragEdges = new ArrayList(); + if ((dragEdgeChoices & DRAG_LEFT) == DRAG_LEFT) { + mDragEdges.add(DragEdge.Left); + } + if ((dragEdgeChoices & DRAG_RIGHT) == DRAG_RIGHT) { + mDragEdges.add(DragEdge.Right); + } + if ((dragEdgeChoices & DRAG_TOP) == DRAG_TOP) { + mDragEdges.add(DragEdge.Top); + } + if ((dragEdgeChoices & DRAG_BOTTOM) == DRAG_BOTTOM) { + mDragEdges.add(DragEdge.Bottom); + } + populateIndexes(); + int ordinal = a.getInt(R.styleable.SwipeLayout_show_mode, ShowMode.PullOut.ordinal()); mShowMode = ShowMode.values()[ordinal]; } - - public interface SwipeListener{ + 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 onHandRelease(SwipeLayout layout, float xvel, float yvel); } - public void addSwipeListener(SwipeListener l){ + public void addSwipeListener(SwipeListener l) + { mSwipeListeners.add(l); } - public void removeSwipeListener(SwipeListener l){ + public void removeSwipeListener(SwipeListener l) + { mSwipeListeners.remove(l); } - public static interface SwipeDenier { - /* - * Called in onInterceptTouchEvent - * Determines if this swipe event should be denied - * Implement this interface if you are using views with swipe gestures - * As a child of SwipeLayout - * - * @return true deny - * false allow - */ + public static interface SwipeDenier + { + /* + * Called in onInterceptTouchEvent Determines if this swipe event should + * be denied Implement this interface if you are using views with swipe + * gestures As a child of SwipeLayout + * + * @return true deny false allow + */ public boolean shouldDenySwipe(MotionEvent ev); } - public void addSwipeDenier(SwipeDenier denier) { + public void addSwipeDenier(SwipeDenier denier) + { mSwipeDeniers.add(denier); } - public void removeSwipeDenier(SwipeDenier denier) { + public void removeSwipeDenier(SwipeDenier denier) + { mSwipeDeniers.remove(denier); } - public void removeAllSwipeDeniers() { + public void removeAllSwipeDeniers() + { mSwipeDeniers.clear(); } - public interface OnRevealListener { + public interface OnRevealListener + { public void onReveal(View child, DragEdge edge, float fraction, int distance); } /** - * bind a view with a specific {@link com.daimajia.swipe.SwipeLayout.OnRevealListener} - * @param childId the view id. - * @param l the target {@link com.daimajia.swipe.SwipeLayout.OnRevealListener} + * bind a view with a specific + * {@link com.daimajia.swipe.SwipeLayout.OnRevealListener} + * + * @param childId + * the view id. + * @param l + * the target + * {@link com.daimajia.swipe.SwipeLayout.OnRevealListener} */ - public void addRevealListener(int childId, OnRevealListener l){ - View child = findViewById(childId); - if(child == null){ + public void addRevealListener(int childId, OnRevealListener l) + { + View child = findViewById(childId); + if (child == null) { throw new IllegalArgumentException("Child does not belong to SwipeListener."); } - if(!mShowEntirely.containsKey(child)){ + if (!mShowEntirely.containsKey(child)) { mShowEntirely.put(child, false); } - if(mRevealListeners.get(child) == null) - mRevealListeners.put(child, new ArrayList()); + if (mRevealListeners.get(child) == null) mRevealListeners.put(child, new ArrayList()); mRevealListeners.get(child).add(l); } /** - * bind multiple views with an {@link com.daimajia.swipe.SwipeLayout.OnRevealListener}. - * @param childIds the view id. - * @param l the {@link com.daimajia.swipe.SwipeLayout.OnRevealListener} + * bind multiple views with an + * {@link com.daimajia.swipe.SwipeLayout.OnRevealListener}. + * + * @param childIds + * the view id. + * @param l + * the {@link com.daimajia.swipe.SwipeLayout.OnRevealListener} */ - public void addRevealListener(int[] childIds, OnRevealListener l){ - for(int i : childIds) + public void addRevealListener(int[] childIds, OnRevealListener l) + { + for (int i : childIds) addRevealListener(i, l); } - public void removeRevealListener(int childId, OnRevealListener l){ + public void removeRevealListener(int childId, OnRevealListener l) + { View child = findViewById(childId); - if(child == null) - return; + if (child == null) return; mShowEntirely.remove(child); - if(mRevealListeners.containsKey(child)) - mRevealListeners.get(child).remove(l); + if (mRevealListeners.containsKey(child)) mRevealListeners.get(child).remove(l); } - public void removeAllRevealListeners(int childId){ + public void removeAllRevealListeners(int childId) + { View child = findViewById(childId); - if(child != null){ + if (child != null) { mRevealListeners.remove(child); mShowEntirely.remove(child); } @@ -174,127 +230,132 @@ public class SwipeLayout extends FrameLayout { private ViewDragHelper.Callback mDragHelperCallback = new ViewDragHelper.Callback() { @Override - public int clampViewPositionHorizontal(View child, int left, int dx) { - if(child == getSurfaceView()){ - switch (mDragEdge){ - case Top: - case Bottom: - return getPaddingLeft(); - case Left: - if(left < getPaddingLeft()) - return getPaddingLeft(); - if(left > getPaddingLeft() + mDragDistance) - return getPaddingLeft() + mDragDistance; - break; - case Right: - if(left > getPaddingLeft()) - return getPaddingLeft(); - if(left < getPaddingLeft() - mDragDistance) - return getPaddingLeft() - mDragDistance; - break; + public int clampViewPositionHorizontal(View child, int left, int dx) + { + if (child == getSurfaceView()) { + switch (mDragEdges.get(currentDirectionIndex)) + { + case Top: + case Bottom: + return getPaddingLeft(); + case Left: + if (left < getPaddingLeft()) return getPaddingLeft(); + if (left > getPaddingLeft() + mDragDistance) return getPaddingLeft() + mDragDistance; + break; + case Right: + if (left > getPaddingLeft()) return getPaddingLeft(); + if (left < getPaddingLeft() - mDragDistance) return getPaddingLeft() - mDragDistance; + break; } - }else if(child == getBottomView()){ + } + else if (getBottomViews().get(currentDirectionIndex) == child) { - switch (mDragEdge){ - case Top: - case Bottom: - return getPaddingLeft(); - case Left: - if(mShowMode == ShowMode.PullOut){ - if(left > getPaddingLeft()) - return getPaddingLeft(); + switch (mDragEdges.get(currentDirectionIndex)) + { + case Top: + case Bottom: + return getPaddingLeft(); + case Left: + if (mShowMode == ShowMode.PullOut) { + if (left > getPaddingLeft()) return getPaddingLeft(); + } + break; + case Right: + if (mShowMode == ShowMode.PullOut) { + if (left < getMeasuredWidth() - mDragDistance) { + return getMeasuredWidth() - mDragDistance; } - break; - case Right: - if(mShowMode == ShowMode.PullOut){ - if(left < getMeasuredWidth() - mDragDistance){ - return getMeasuredWidth() - mDragDistance; - } - } - break; + } + break; } } return left; } @Override - public int clampViewPositionVertical(View child, int top, int dy) { - if(child == getSurfaceView()){ - switch (mDragEdge){ - case Left: - case Right: + public int clampViewPositionVertical(View child, int top, int dy) + { + if (child == getSurfaceView()) { + switch (mDragEdges.get(currentDirectionIndex)) + { + case Left: + case Right: + return getPaddingTop(); + case Top: + if (top < getPaddingTop()) return getPaddingTop(); + if (top > getPaddingTop() + mDragDistance) return getPaddingTop() + mDragDistance; + break; + case Bottom: + if (top < getPaddingTop() - mDragDistance) { + return getPaddingTop() - mDragDistance; + } + if (top > getPaddingTop()) { return getPaddingTop(); - case Top: - if(top < getPaddingTop()) - return getPaddingTop(); - if(top > getPaddingTop() + mDragDistance) - return getPaddingTop() + mDragDistance; - break; - case Bottom: - if(top < getPaddingTop() - mDragDistance){ - return getPaddingTop() - mDragDistance; - } - if(top > getPaddingTop()){ - return getPaddingTop(); - } + } } - }else{ - switch (mDragEdge){ - case Left: - case Right: - return getPaddingTop(); - case Top: - if(mShowMode == ShowMode.PullOut){ - if(top > getPaddingTop()) - return getPaddingTop(); - }else{ - if(getSurfaceView().getTop() + dy < getPaddingTop()) - return getPaddingTop(); - if(getSurfaceView().getTop() + dy > getPaddingTop() + mDragDistance) - return getPaddingTop() + mDragDistance; - } - break; - case Bottom: - if(mShowMode == ShowMode.PullOut){ - if(top < getMeasuredHeight() - mDragDistance) - return getMeasuredHeight() - mDragDistance; - }else{ - if(getSurfaceView().getTop() + dy >= getPaddingTop()) - return getPaddingTop(); - if(getSurfaceView().getTop() + dy <= getPaddingTop() - mDragDistance) - return getPaddingTop() - mDragDistance; - } + } + else { + switch (mDragEdges.get(currentDirectionIndex)) + { + case Left: + case Right: + return getPaddingTop(); + case Top: + if (mShowMode == ShowMode.PullOut) { + if (top > getPaddingTop()) return getPaddingTop(); + } + else { + if (getSurfaceView().getTop() + dy < getPaddingTop()) return getPaddingTop(); + if (getSurfaceView().getTop() + dy > getPaddingTop() + mDragDistance) + return getPaddingTop() + mDragDistance; + } + break; + case Bottom: + if (mShowMode == ShowMode.PullOut) { + if (top < getMeasuredHeight() - mDragDistance) return getMeasuredHeight() - mDragDistance; + } + else { + if (getSurfaceView().getTop() + dy >= getPaddingTop()) return getPaddingTop(); + if (getSurfaceView().getTop() + dy <= getPaddingTop() - mDragDistance) + return getPaddingTop() - mDragDistance; + } } } return top; } @Override - public boolean tryCaptureView(View child, int pointerId) { - return child == getSurfaceView() || child == getBottomView(); + public boolean tryCaptureView(View child, int pointerId) + { + return child == getSurfaceView() || getBottomViews().contains(child); } @Override - public int getViewHorizontalDragRange(View child) { + public int getViewHorizontalDragRange(View child) + { return mDragDistance; } @Override - public int getViewVerticalDragRange(View child) { + public int getViewVerticalDragRange(View child) + { return mDragDistance; } @Override - public void onViewReleased(View releasedChild, float xvel, float yvel) { + public void onViewReleased(View releasedChild, float xvel, float yvel) + { super.onViewReleased(releasedChild, xvel, yvel); - for(SwipeListener l : mSwipeListeners) + for (SwipeListener l : mSwipeListeners) l.onHandRelease(SwipeLayout.this, xvel, yvel); - if(releasedChild == getSurfaceView()){ + if (releasedChild == getSurfaceView()) { processSurfaceRelease(xvel, yvel); - }else if(releasedChild == getBottomView()){ - if(getShowMode() == ShowMode.PullOut){ + } + else if (getBottomViews().contains(releasedChild)) { + if (getShowMode() == ShowMode.PullOut) { processBottomPullOutRelease(xvel, yvel); - }else if(getShowMode() == ShowMode.LayDown){ + } + else if (getShowMode() == ShowMode.LayDown) { processBottomLayDownMode(xvel, yvel); } } @@ -303,35 +364,43 @@ public class SwipeLayout extends FrameLayout { } @Override - public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) { - int evLeft = getSurfaceView().getLeft(), evRight = getSurfaceView().getRight(), - evTop = getSurfaceView().getTop(),evBottom = getSurfaceView().getBottom(); - if(changedView == getSurfaceView()){ + public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) + { + int evLeft = getSurfaceView().getLeft(), evRight = getSurfaceView().getRight(), evTop = getSurfaceView() + .getTop(), evBottom = getSurfaceView().getBottom(); + if (changedView == getSurfaceView()) { - if(mShowMode == ShowMode.PullOut){ - if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right) - getBottomView().offsetLeftAndRight(dx); - else - getBottomView().offsetTopAndBottom(dy); + if (mShowMode == ShowMode.PullOut) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left + || mDragEdges.get(currentDirectionIndex) == DragEdge.Right) + getBottomViews().get(currentDirectionIndex).offsetLeftAndRight(dx); + else getBottomViews().get(currentDirectionIndex).offsetTopAndBottom(dy); } - }else if(changedView == getBottomView()){ + } + else if (getBottomViews().contains(changedView)) { - if(mShowMode == ShowMode.PullOut){ + if (mShowMode == ShowMode.PullOut) { getSurfaceView().offsetLeftAndRight(dx); getSurfaceView().offsetTopAndBottom(dy); - }else{ - Rect rect = computeBottomLayDown(mDragEdge); - getBottomView().layout(rect.left, rect.top, rect.right, rect.bottom); + } + else { + Rect rect = computeBottomLayDown(mDragEdges.get(currentDirectionIndex)); + getBottomViews().get(currentDirectionIndex).layout(rect.left, rect.top, rect.right, rect.bottom); int newLeft = getSurfaceView().getLeft() + dx, newTop = getSurfaceView().getTop() + dy; - if(mDragEdge == DragEdge.Left && newLeft < getPaddingLeft()) newLeft = getPaddingLeft(); - else if(mDragEdge == DragEdge.Right && newLeft > getPaddingLeft()) newLeft = getPaddingLeft(); - else if(mDragEdge == DragEdge.Top && newTop < getPaddingTop()) newTop = getPaddingTop(); - else if(mDragEdge == DragEdge.Bottom && newTop > getPaddingTop()) newTop = getPaddingTop(); + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left && newLeft < getPaddingLeft()) + newLeft = getPaddingLeft(); + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Right && newLeft > getPaddingLeft()) + newLeft = getPaddingLeft(); + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top && newTop < getPaddingTop()) + newTop = getPaddingTop(); + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Bottom && newTop > getPaddingTop()) + newTop = getPaddingTop(); - getSurfaceView().layout(newLeft, newTop, newLeft + getMeasuredWidth(), newTop + getMeasuredHeight()); + getSurfaceView() + .layout(newLeft, newTop, newLeft + getMeasuredWidth(), newTop + getMeasuredHeight()); } } @@ -344,8 +413,10 @@ public class SwipeLayout extends FrameLayout { }; /** - * the dispatchRevealEvent method may not always get accurate position, it makes the view may not always get the event when the view is - * totally show( fraction = 1), so , we need to calculate every time. + * the dispatchRevealEvent method may not always get accurate position, it + * makes the view may not always get the event when the view is totally + * show( fraction = 1), so , we need to calculate every time. + * * @param child * @param relativePosition * @param edge @@ -355,91 +426,89 @@ public class SwipeLayout extends FrameLayout { * @param surfaceBottom * @return */ - protected boolean isViewTotallyFirstShowed(View child, Rect relativePosition, DragEdge edge, int surfaceLeft, int surfaceTop, int surfaceRight, int surfaceBottom){ - if(mShowEntirely.get(child)) - return false; + protected boolean isViewTotallyFirstShowed(View child, Rect relativePosition, DragEdge edge, int surfaceLeft, + int surfaceTop, int surfaceRight, int surfaceBottom) + { + if (mShowEntirely.get(child)) return false; int childLeft = relativePosition.left; int childRight = relativePosition.right; int childTop = relativePosition.top; int childBottom = relativePosition.bottom; boolean r = false; - if(getShowMode() == ShowMode.LayDown) { - if((edge == DragEdge.Right && surfaceRight <= childLeft) - || (edge == DragEdge.Left && surfaceLeft >= childRight) - || (edge == DragEdge.Top && surfaceTop >= childBottom) - || (edge == DragEdge.Bottom && surfaceBottom <= childTop)) - r = true; + if (getShowMode() == ShowMode.LayDown) { + if ((edge == DragEdge.Right && surfaceRight <= childLeft) + || (edge == DragEdge.Left && surfaceLeft >= childRight) + || (edge == DragEdge.Top && surfaceTop >= childBottom) + || (edge == DragEdge.Bottom && surfaceBottom <= childTop)) r = true; } - else if(getShowMode() == ShowMode.PullOut){ - if((edge == DragEdge.Right && childRight <= getWidth()) - || (edge == DragEdge.Left && childLeft >= getPaddingLeft()) - || (edge == DragEdge.Top && childTop >= getPaddingTop()) - || (edge == DragEdge.Bottom && childBottom <= getHeight())) - r = true; + else if (getShowMode() == ShowMode.PullOut) { + if ((edge == DragEdge.Right && childRight <= getWidth()) + || (edge == DragEdge.Left && childLeft >= getPaddingLeft()) + || (edge == DragEdge.Top && childTop >= getPaddingTop()) + || (edge == DragEdge.Bottom && childBottom <= getHeight())) r = true; } return r; } - protected boolean isViewShowing(View child, Rect relativePosition, DragEdge availableEdge, int surfaceLeft, int surfaceTop, int surfaceRight, int surfaceBottom){ + protected boolean isViewShowing(View child, Rect relativePosition, DragEdge availableEdge, int surfaceLeft, + int surfaceTop, int surfaceRight, int surfaceBottom) + { int childLeft = relativePosition.left; int childRight = relativePosition.right; int childTop = relativePosition.top; int childBottom = relativePosition.bottom; - if(getShowMode() == ShowMode.LayDown){ - switch (availableEdge){ - case Right: - if(surfaceRight > childLeft && surfaceRight <= childRight){ - return true; - } - break; - case Left: - if(surfaceLeft < childRight && surfaceLeft >= childLeft){ - return true; - } - break; - case Top: - if(surfaceTop >= childTop && surfaceTop < childBottom){ - return true; - } - break; - case Bottom: - if(surfaceBottom > childTop && surfaceBottom <= childBottom){ - return true; - } - break; + if (getShowMode() == ShowMode.LayDown) { + switch (availableEdge) + { + case Right: + if (surfaceRight > childLeft && surfaceRight <= childRight) { + return true; + } + break; + case Left: + if (surfaceLeft < childRight && surfaceLeft >= childLeft) { + return true; + } + break; + case Top: + if (surfaceTop >= childTop && surfaceTop < childBottom) { + return true; + } + break; + case Bottom: + if (surfaceBottom > childTop && surfaceBottom <= childBottom) { + return true; + } + break; } - }else if(getShowMode() == ShowMode.PullOut){ - switch (availableEdge){ - case Right: - if(childLeft <= getWidth() && childRight > getWidth()) - return true; - break; - case Left: - if(childRight >= getPaddingLeft() && childLeft < getPaddingLeft()) - return true; - break; - case Top: - if(childTop < getPaddingTop() && childBottom >= getPaddingTop()) - return true; - break; - case Bottom: - if(childTop < getHeight() && childTop >= getPaddingTop()) - return true; - break; + } + else if (getShowMode() == ShowMode.PullOut) { + switch (availableEdge) + { + case Right: + if (childLeft <= getWidth() && childRight > getWidth()) return true; + break; + case Left: + if (childRight >= getPaddingLeft() && childLeft < getPaddingLeft()) return true; + break; + case Top: + if (childTop < getPaddingTop() && childBottom >= getPaddingTop()) return true; + break; + case Bottom: + if (childTop < getHeight() && childTop >= getPaddingTop()) return true; + break; } } return false; } - - - protected Rect getRelativePosition(View child){ + protected Rect getRelativePosition(View child) + { View t = child; - Rect r = new Rect(t.getLeft(), t.getTop(), 0 , 0); - while(t.getParent() != null && t != getRootView()){ - t = (View)t.getParent(); - if(t == this) - break; + Rect r = new Rect(t.getLeft(), t.getTop(), 0, 0); + while (t.getParent() != null && t != getRootView()) { + t = (View) t.getParent(); + if (t == this) break; r.left += t.getLeft(); r.top += t.getTop(); } @@ -450,49 +519,55 @@ public class SwipeLayout extends FrameLayout { private int mEventCounter = 0; - protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop, int dx, int dy){ + 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; + 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){ + protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop, boolean open) + { safeBottomView(); Status status = getOpenStatus(); - if(!mSwipeListeners.isEmpty()){ + if (!mSwipeListeners.isEmpty()) { mEventCounter++; - for(SwipeListener l : mSwipeListeners){ - if(mEventCounter == 1){ - if(open){ + for (SwipeListener l : mSwipeListeners) { + if (mEventCounter == 1) { + if (open) { l.onStartOpen(this); - }else{ + } + else { l.onStartClose(this); } } l.onUpdate(SwipeLayout.this, surfaceLeft - getPaddingLeft(), surfaceTop - getPaddingTop()); } - if(status == Status.Close){ - for(SwipeListener l : mSwipeListeners){ + if (status == Status.Close) { + for (SwipeListener l : mSwipeListeners) { l.onClose(SwipeLayout.this); } mEventCounter = 0; } - if(status == Status.Open){ - getBottomView().setEnabled(true); - for(SwipeListener l : mSwipeListeners){ + if (status == Status.Open) { + getBottomViews().get(currentDirectionIndex).setEnabled(true); + for (SwipeListener l : mSwipeListeners) { l.onOpen(SwipeLayout.this); } mEventCounter = 0; @@ -503,84 +578,93 @@ public class SwipeLayout extends FrameLayout { /** * prevent bottom view get any touch event. Especially in LayDown mode. */ - private void safeBottomView(){ + private void safeBottomView() + { Status status = getOpenStatus(); - ViewGroup bottom = getBottomView(); + List bottoms = getBottomViews(); - if(status == Status.Close){ - if(bottom.getVisibility() != INVISIBLE) - bottom.setVisibility(INVISIBLE); - }else { - if(bottom.getVisibility() != VISIBLE) - bottom.setVisibility(VISIBLE); + if (status == Status.Close) { + for (ViewGroup bottom : bottoms) { + if (bottom.getVisibility() != INVISIBLE) bottom.setVisibility(INVISIBLE); + } + } + else { + if (bottoms.get(currentDirectionIndex).getVisibility() != VISIBLE) + bottoms.get(currentDirectionIndex).setVisibility(VISIBLE); } } - - protected void dispatchRevealEvent(final int surfaceLeft, final int surfaceTop, final int surfaceRight, final int surfaceBottom){ - if(mRevealListeners.isEmpty()) return; - for(Map.Entry> entry : mRevealListeners.entrySet()){ + protected void dispatchRevealEvent(final int surfaceLeft, final int surfaceTop, final int surfaceRight, + final int surfaceBottom) + { + if (mRevealListeners.isEmpty()) return; + for (Map.Entry> entry : mRevealListeners.entrySet()) { View child = entry.getKey(); Rect rect = getRelativePosition(child); - if(isViewShowing(child,rect, mDragEdge, surfaceLeft, surfaceTop, surfaceRight, surfaceBottom)){ + if (isViewShowing(child, rect, mDragEdges.get(currentDirectionIndex), surfaceLeft, surfaceTop, + surfaceRight, surfaceBottom)) { mShowEntirely.put(child, false); int distance = 0; float fraction = 0f; - if(getShowMode() == ShowMode.LayDown){ - switch (mDragEdge){ - case Left: - distance = rect.left - surfaceLeft; - fraction = distance/(float)child.getWidth(); - break; - case Right: - distance = rect.right - surfaceRight; - fraction = distance/(float)child.getWidth(); - break; - case Top: - distance = rect.top - surfaceTop; - fraction = distance/(float)child.getHeight(); - break; - case Bottom: - distance = rect.bottom - surfaceBottom; - fraction = distance/(float)child.getHeight(); - break; + if (getShowMode() == ShowMode.LayDown) { + switch (mDragEdges.get(currentDirectionIndex)) + { + case Left: + distance = rect.left - surfaceLeft; + fraction = distance / (float) child.getWidth(); + break; + case Right: + distance = rect.right - surfaceRight; + fraction = distance / (float) child.getWidth(); + break; + case Top: + distance = rect.top - surfaceTop; + fraction = distance / (float) child.getHeight(); + break; + case Bottom: + distance = rect.bottom - surfaceBottom; + fraction = distance / (float) child.getHeight(); + break; } - }else if(getShowMode() == ShowMode.PullOut){ - switch (mDragEdge){ - case Left: - distance = rect.right - getPaddingLeft(); - fraction = distance / (float)child.getWidth(); - break; - case Right: - distance = rect.left - getWidth(); - fraction = distance / (float)child.getWidth(); - break; - case Top: - distance = rect.bottom - getPaddingTop(); - fraction = distance/(float)child.getHeight(); - break; - case Bottom: - distance = rect.top - getHeight(); - fraction = distance/(float)child.getHeight(); - break; + } + else if (getShowMode() == ShowMode.PullOut) { + switch (mDragEdges.get(currentDirectionIndex)) + { + case Left: + distance = rect.right - getPaddingLeft(); + fraction = distance / (float) child.getWidth(); + break; + case Right: + distance = rect.left - getWidth(); + fraction = distance / (float) child.getWidth(); + break; + case Top: + distance = rect.bottom - getPaddingTop(); + fraction = distance / (float) child.getHeight(); + break; + case Bottom: + distance = rect.top - getHeight(); + fraction = distance / (float) child.getHeight(); + break; } } - for(OnRevealListener l : entry.getValue()){ - l.onReveal(child, mDragEdge, Math.abs(fraction), distance); - if(Math.abs(fraction) == 1){ + for (OnRevealListener l : entry.getValue()) { + l.onReveal(child, mDragEdges.get(currentDirectionIndex), Math.abs(fraction), distance); + if (Math.abs(fraction) == 1) { mShowEntirely.put(child, true); } } } - if(isViewTotallyFirstShowed(child, rect, mDragEdge, surfaceLeft, surfaceTop, surfaceRight, surfaceBottom)){ + if (isViewTotallyFirstShowed(child, rect, mDragEdges.get(currentDirectionIndex), surfaceLeft, surfaceTop, + surfaceRight, surfaceBottom)) { mShowEntirely.put(child, true); - for(OnRevealListener l : entry.getValue()){ - if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right) - l.onReveal(child, mDragEdge, 1, child.getWidth()); - else - l.onReveal(child, mDragEdge, 1, child.getHeight()); + for (OnRevealListener l : entry.getValue()) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left + || mDragEdges.get(currentDirectionIndex) == DragEdge.Right) + l.onReveal(child, mDragEdges.get(currentDirectionIndex), 1, child.getWidth()); + else l.onReveal(child, mDragEdges.get(currentDirectionIndex), 1, child.getHeight()); } } @@ -588,95 +672,103 @@ public class SwipeLayout extends FrameLayout { } @Override - public void computeScroll() { + public void computeScroll() + { super.computeScroll(); - if(mDragHelper.continueSettling(true)) { + if (mDragHelper.continueSettling(true)) { ViewCompat.postInvalidateOnAnimation(this); } } /** - * {@link android.view.View.OnLayoutChangeListener} added in API 11. - * I need to support it from API 8. + * {@link android.view.View.OnLayoutChangeListener} added in API 11. I need + * to support it from API 8. */ - public interface OnLayout{ + public interface OnLayout + { public void onLayout(SwipeLayout v); } private List mOnLayoutListeners; - public void addOnLayoutListener(OnLayout l){ - if(mOnLayoutListeners == null) - mOnLayoutListeners = new ArrayList(); + public void addOnLayoutListener(OnLayout l) + { + if (mOnLayoutListeners == null) mOnLayoutListeners = new ArrayList(); mOnLayoutListeners.add(l); } - public void removeOnLayoutListener(OnLayout l){ - if(mOnLayoutListeners != null) - mOnLayoutListeners.remove(l); + public void removeOnLayoutListener(OnLayout l) + { + if (mOnLayoutListeners != null) mOnLayoutListeners.remove(l); } @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { + protected void onLayout(boolean changed, int l, int t, int r, int b) + { int childCount = getChildCount(); - if(childCount != 2){ - throw new IllegalStateException("You need 2 views in SwipeLayout"); + if (childCount != 1 + mDragEdges.size()) { + throw new IllegalStateException("You need to have one surface view plus one view for each of your drag edges"); } - if(!(getChildAt(0) instanceof ViewGroup) || !(getChildAt(1) instanceof ViewGroup)){ - throw new IllegalArgumentException("The 2 children in SwipeLayout must be an instance of ViewGroup"); + for (int i = 0; i < childCount; i++) { + if (!(getChildAt(i) instanceof ViewGroup)) { + throw new IllegalArgumentException("All the children in SwipeLayout must be an instance of ViewGroup"); + } } - if(mShowMode == ShowMode.PullOut) + if (mShowMode == ShowMode.PullOut) layoutPullOut(); - else if(mShowMode == ShowMode.LayDown) - layoutLayDown(); + else if (mShowMode == ShowMode.LayDown) layoutLayDown(); safeBottomView(); - if(mOnLayoutListeners != null) - for(int i = 0; i < mOnLayoutListeners.size(); i++){ - mOnLayoutListeners.get(i).onLayout(this); - } + if (mOnLayoutListeners != null) for (int i = 0; i < mOnLayoutListeners.size(); i++) { + mOnLayoutListeners.get(i).onLayout(this); + } } - void layoutPullOut(){ + void layoutPullOut() + { Rect rect = computeSurfaceLayoutArea(false); getSurfaceView().layout(rect.left, rect.top, rect.right, rect.bottom); rect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, rect); - getBottomView().layout(rect.left, rect.top, rect.right, rect.bottom); + getBottomViews().get(currentDirectionIndex).layout(rect.left, rect.top, rect.right, rect.bottom); bringChildToFront(getSurfaceView()); } - void layoutLayDown(){ + void layoutLayDown() + { Rect rect = computeSurfaceLayoutArea(false); getSurfaceView().layout(rect.left, rect.top, rect.right, rect.bottom); rect = computeBottomLayoutAreaViaSurface(ShowMode.LayDown, rect); - getBottomView().layout(rect.left, rect.top, rect.right, rect.bottom); + getBottomViews().get(currentDirectionIndex).layout(rect.left, rect.top, rect.right, rect.bottom); bringChildToFront(getSurfaceView()); } - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) + { super.onMeasure(widthMeasureSpec, heightMeasureSpec); - if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right) - mDragDistance = getBottomView().getMeasuredWidth()-dp2px(mHorizontalSwipeOffset); - else - mDragDistance = getBottomView().getMeasuredHeight()-dp2px(mVerticalSwipeOffset); + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left + || mDragEdges.get(currentDirectionIndex) == DragEdge.Right) + mDragDistance = getBottomViews().get(currentDirectionIndex).getMeasuredWidth() + - dp2px(getCurrentOffset()); + else mDragDistance = getBottomViews().get(currentDirectionIndex).getMeasuredHeight() + - dp2px(getCurrentOffset()); } private boolean mTouchConsumedByChild = false; @Override - public boolean onInterceptTouchEvent(MotionEvent ev) { + public boolean onInterceptTouchEvent(MotionEvent ev) + { - if(!isEnabled() || !isEnabledInAdapterView()){ + if (!isEnabled() || !isEnabledInAdapterView()) { return true; } - if(!isSwipeEnabled()){ + if (!isSwipeEnabled()) { return false; } @@ -686,49 +778,51 @@ public class SwipeLayout extends FrameLayout { } } // - //if a child wants to handle the touch event, - //then let it do it. + // if a child wants to handle the touch event, + // then let it do it. // int action = ev.getActionMasked(); - switch (action){ - case MotionEvent.ACTION_DOWN: - Status status = getOpenStatus(); - if(status == Status.Close){ - mTouchConsumedByChild = childNeedHandleTouchEvent(getSurfaceView(), ev) != null; - }else if(status == Status.Open){ - mTouchConsumedByChild = childNeedHandleTouchEvent(getBottomView(), ev) != null; - } - break; - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_CANCEL: - mTouchConsumedByChild = false; + switch (action) + { + case MotionEvent.ACTION_DOWN: + Status status = getOpenStatus(); + if (status == Status.Close) { + mTouchConsumedByChild = childNeedHandleTouchEvent(getSurfaceView(), ev) != null; + } + else if (status == Status.Open) { + mTouchConsumedByChild = childNeedHandleTouchEvent(getBottomViews().get(currentDirectionIndex), ev) != null; + } + break; + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_CANCEL: + mTouchConsumedByChild = false; } - if(mTouchConsumedByChild) return false; + if (mTouchConsumedByChild) return false; return mDragHelper.shouldInterceptTouchEvent(ev); } /** * if the ViewGroup children want to handle this event. + * * @param v * @param event * @return */ - private View childNeedHandleTouchEvent(ViewGroup v, MotionEvent event){ - if(v == null) return null; - if(v.onTouchEvent(event)) - return v; + private View childNeedHandleTouchEvent(ViewGroup v, MotionEvent event) + { + if (v == null) return null; + if (v.onTouchEvent(event)) return v; int childCount = v.getChildCount(); - for(int i = childCount - 1; i >= 0; i--){ + for (int i = childCount - 1; i >= 0; i--) { View child = v.getChildAt(i); - if(child instanceof ViewGroup){ + if (child instanceof ViewGroup) { View grandChild = childNeedHandleTouchEvent((ViewGroup) child, event); - if(grandChild != null) - return grandChild; - }else{ - if(childNeedHandleTouchEvent(v.getChildAt(i), event)) - return v.getChildAt(i); + if (grandChild != null) return grandChild; + } + else { + if (childNeedHandleTouchEvent(v.getChildAt(i), event)) return v.getChildAt(i); } } return null; @@ -736,33 +830,35 @@ public class SwipeLayout extends FrameLayout { /** * if the view (v) wants to handle this event. + * * @param v * @param event * @return */ - private boolean childNeedHandleTouchEvent(View v, MotionEvent event){ - if(v == null) return false; + private boolean childNeedHandleTouchEvent(View v, MotionEvent event) + { + if (v == null) return false; int[] loc = new int[2]; v.getLocationOnScreen(loc); int left = loc[0], top = loc[1]; - if(event.getRawX() > left && event.getRawX() < left + v.getWidth() - && event.getRawY() > top && event.getRawY() < top + v.getHeight()){ + if (event.getRawX() > left && event.getRawX() < left + v.getWidth() && event.getRawY() > top + && event.getRawY() < top + v.getHeight()) { return v.onTouchEvent(event); } return false; } - private float sX = -1 , sY = -1; - @Override - public boolean onTouchEvent(MotionEvent event) { - if(!isEnabledInAdapterView() || !isEnabled()) - return true; + private float sX = -1, sY = -1; - if(!isSwipeEnabled()) - return super.onTouchEvent(event); + @Override + public boolean onTouchEvent(MotionEvent event) + { + if (!isEnabledInAdapterView() || !isEnabled()) return true; + + if (!isSwipeEnabled()) return super.onTouchEvent(event); int action = event.getActionMasked(); ViewParent parent = getParent(); @@ -770,123 +866,148 @@ public class SwipeLayout extends FrameLayout { gestureDetector.onTouchEvent(event); Status status = getOpenStatus(); ViewGroup touching = null; - if(status == Status.Close){ + if (status == Status.Close) { touching = getSurfaceView(); - }else if(status == Status.Open){ - touching = getBottomView(); + } + else if (status == Status.Open) { + touching = getBottomViews().get(currentDirectionIndex); } - switch (action){ - case MotionEvent.ACTION_DOWN: + switch (action) + { + case MotionEvent.ACTION_DOWN: + mDragHelper.processTouchEvent(event); + parent.requestDisallowInterceptTouchEvent(true); + + sX = event.getRawX(); + sY = event.getRawY(); + + if (touching != null) touching.setPressed(true); + + return true; + case MotionEvent.ACTION_MOVE: { + if (sX == -1 || sY == -1) { + // Trick: + // When in nested mode, we need to send a constructed + // ACTION_DOWN MotionEvent to mDragHelper, to help + // it initialize itself. + event.setAction(MotionEvent.ACTION_DOWN); mDragHelper.processTouchEvent(event); parent.requestDisallowInterceptTouchEvent(true); - sX = event.getRawX(); sY = event.getRawY(); - - if(touching != null) - touching.setPressed(true); - return true; - case MotionEvent.ACTION_MOVE:{ - if(sX == -1 || sY == -1){ - // Trick: - // When in nested mode, we need to send a constructed ACTION_DOWN MotionEvent to mDragHelper, to help - // it initialize itself. - event.setAction(MotionEvent.ACTION_DOWN); - mDragHelper.processTouchEvent(event); - parent.requestDisallowInterceptTouchEvent(true); - sX = event.getRawX(); - sY = event.getRawY(); - return true; - } - - float distanceX = event.getRawX() - sX; - float distanceY = event.getRawY() - sY; - float angle = Math.abs(distanceY / distanceX); - angle = (float)Math.toDegrees(Math.atan(angle)); - - boolean doNothing = false; - if(mDragEdge == DragEdge.Right){ - boolean suitable = (status == Status.Open && distanceX > 0) || (status == Status.Close && distanceX < 0); - suitable = suitable || (status == Status.Middle); - - if(angle > 30 || !suitable){ - doNothing = true; - } - } - - if(mDragEdge == DragEdge.Left){ - boolean suitable = (status == Status.Open && distanceX < 0 ) || (status == Status.Close && distanceX > 0); - suitable = suitable || status == Status.Middle; - - if(angle > 30 || ! suitable){ - doNothing = true; - } - } - - if(mDragEdge == DragEdge.Top){ - boolean suitable = (status == Status.Open && distanceY < 0 ) || (status == Status.Close && distanceY > 0); - suitable = suitable || status == Status.Middle; - - if(angle < 60 || ! suitable){ - doNothing = true; - } - } - - if(mDragEdge == DragEdge.Bottom){ - boolean suitable = (status == Status.Open && distanceY > 0 ) || (status == Status.Close && distanceY < 0); - suitable = suitable || status == Status.Middle; - - if(angle < 60 || ! suitable){ - doNothing = true; - } - } - - if(doNothing){ - parent.requestDisallowInterceptTouchEvent(false); - return false; - }else{ - if(touching != null){ - touching.setPressed(false); - } - parent.requestDisallowInterceptTouchEvent(true); - mDragHelper.processTouchEvent(event); - } - break; } - case MotionEvent.ACTION_UP: - case MotionEvent.ACTION_CANCEL: - { - sX = -1; - sY = -1; - if(touching != null){ + + float distanceX = event.getRawX() - sX; + float distanceY = event.getRawY() - sY; + float angle = Math.abs(distanceY / distanceX); + angle = (float) Math.toDegrees(Math.atan(angle)); + if (getOpenStatus() == Status.Close) { + if (angle < 45) { + if (mLeftIndex != -1 && distanceX > 0) { + currentDirectionIndex = mLeftIndex; + } else if (mRightIndex != -1) { + currentDirectionIndex = mRightIndex; + } + } else { + if (mTopIndex != -1 && distanceY < 0) { + currentDirectionIndex = mTopIndex; + } else if (mBottomIndex != -1) { + currentDirectionIndex = mBottomIndex; + } + } + updateBottomViews(); + } + + boolean doNothing = false; + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Right) { + boolean suitable = (status == Status.Open && distanceX > 0) + || (status == Status.Close && distanceX < 0); + suitable = suitable || (status == Status.Middle); + + if (angle > 30 || !suitable) { + doNothing = true; + } + } + + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) { + boolean suitable = (status == Status.Open && distanceX < 0) + || (status == Status.Close && distanceX > 0); + suitable = suitable || status == Status.Middle; + + if (angle > 30 || !suitable) { + doNothing = true; + } + } + + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) { + boolean suitable = (status == Status.Open && distanceY < 0) + || (status == Status.Close && distanceY > 0); + suitable = suitable || status == Status.Middle; + + if (angle < 60 || !suitable) { + doNothing = true; + } + } + + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Bottom) { + boolean suitable = (status == Status.Open && distanceY > 0) + || (status == Status.Close && distanceY < 0); + suitable = suitable || status == Status.Middle; + + if (angle < 60 || !suitable) { + doNothing = true; + } + } + + if (doNothing) { + parent.requestDisallowInterceptTouchEvent(false); + return false; + } + else { + if (touching != null) { touching.setPressed(false); } - } - default: parent.requestDisallowInterceptTouchEvent(true); mDragHelper.processTouchEvent(event); + } + break; + } + case MotionEvent.ACTION_UP: + case MotionEvent.ACTION_CANCEL: { + sX = -1; + sY = -1; + if (touching != null) { + touching.setPressed(false); + } + } + default: + parent.requestDisallowInterceptTouchEvent(true); + mDragHelper.processTouchEvent(event); } return true; } /** - * if working in {@link android.widget.AdapterView}, we should response {@link android.widget.Adapter} - * isEnable(int position). + * if working in {@link android.widget.AdapterView}, we should response + * {@link android.widget.Adapter} isEnable(int position). + * * @return true when item is enabled, else disabled. */ - private boolean isEnabledInAdapterView(){ + private boolean isEnabledInAdapterView() + { AdapterView adapterView = getAdapterView(); boolean enable = true; - if(adapterView != null){ + if (adapterView != null) { Adapter adapter = adapterView.getAdapter(); - if(adapter != null){ + if (adapter != null) { int p = adapterView.getPositionForView(SwipeLayout.this); - if(adapter instanceof BaseAdapter){ + if (adapter instanceof BaseAdapter) { enable = ((BaseAdapter) adapter).isEnabled(p); - }else if(adapter instanceof ListAdapter){ + } + else if (adapter instanceof ListAdapter) { enable = ((ListAdapter) adapter).isEnabled(p); } } @@ -894,91 +1015,107 @@ public class SwipeLayout extends FrameLayout { return enable; } - public void setSwipeEnabled(boolean enabled){ + public void setSwipeEnabled(boolean enabled) + { mSwipeEnabled = enabled; } - public boolean isSwipeEnabled(){ + public boolean isSwipeEnabled() + { return mSwipeEnabled; } - private boolean insideAdapterView(){ + private boolean insideAdapterView() + { return getAdapterView() != null; } - private AdapterView getAdapterView(){ + private AdapterView getAdapterView() + { ViewParent t = getParent(); - while(t != null){ - if(t instanceof AdapterView){ - return (AdapterView)t; + while (t != null) { + if (t instanceof AdapterView) { + return (AdapterView) t; } t = t.getParent(); } return null; } - private void performAdapterViewItemClick(MotionEvent e){ + private void performAdapterViewItemClick(MotionEvent e) + { ViewParent t = getParent(); - while(t != null) { - if(t instanceof AdapterView){ - AdapterView view = (AdapterView)t; + while (t != null) { + if (t instanceof AdapterView) { + AdapterView view = (AdapterView) t; int p = view.getPositionForView(SwipeLayout.this); - if( p != AdapterView.INVALID_POSITION && - view.performItemClick(view.getChildAt(p-view.getFirstVisiblePosition()), p, view.getAdapter().getItemId(p))) - return; - }else{ - if(t instanceof View && ((View) t).performClick()) - return; + if (p != AdapterView.INVALID_POSITION + && view.performItemClick(view.getChildAt(p - view.getFirstVisiblePosition()), p, view + .getAdapter().getItemId(p))) return; + } + else { + if (t instanceof View && ((View) t).performClick()) return; } t = t.getParent(); } } private GestureDetector gestureDetector = new GestureDetector(getContext(), new SwipeDetector()); - class SwipeDetector extends GestureDetector.SimpleOnGestureListener{ + + class SwipeDetector extends GestureDetector.SimpleOnGestureListener + { @Override - public boolean onDown(MotionEvent e) { + public boolean onDown(MotionEvent e) + { return true; } /** - * Simulate the touch event lifecycle. If you use SwipeLayout in {@link android.widget.AdapterView} - * ({@link android.widget.ListView}, {@link android.widget.GridView} etc.) It will manually call - * {@link android.widget.AdapterView}.performItemClick, performItemLongClick. + * Simulate the touch event lifecycle. If you use SwipeLayout in + * {@link android.widget.AdapterView} ({@link android.widget.ListView}, + * {@link android.widget.GridView} etc.) It will manually call + * {@link android.widget.AdapterView}.performItemClick, + * performItemLongClick. + * * @param e * @return */ @Override - public boolean onSingleTapUp(MotionEvent e) { - if(mDoubleClickListener == null){ + public boolean onSingleTapUp(MotionEvent e) + { + if (mDoubleClickListener == null) { performAdapterViewItemClick(e); } return true; } @Override - public boolean onSingleTapConfirmed(MotionEvent e) { - if(mDoubleClickListener != null){ + public boolean onSingleTapConfirmed(MotionEvent e) + { + if (mDoubleClickListener != null) { performAdapterViewItemClick(e); } return true; } @Override - public void onLongPress(MotionEvent e) { + public void onLongPress(MotionEvent e) + { performLongClick(); } @Override - public boolean onDoubleTap(MotionEvent e) { - if(mDoubleClickListener != null){ + public boolean onDoubleTap(MotionEvent e) + { + if (mDoubleClickListener != null) { View target; - ViewGroup bottom = getBottomView(); + ViewGroup bottom = getBottomViews().get(currentDirectionIndex); ViewGroup surface = getSurfaceView(); - if(e.getX() > bottom.getLeft() && e.getX() < bottom.getRight() - && e.getY() > bottom.getTop() && e.getY() < bottom.getBottom()){ + if (e.getX() > bottom.getLeft() && e.getX() < bottom.getRight() && e.getY() > bottom.getTop() + && e.getY() < bottom.getBottom()) { target = bottom; - }else{ + } + else { target = surface; } mDoubleClickListener.onDoubleClick(SwipeLayout.this, target == surface); @@ -987,68 +1124,91 @@ public class SwipeLayout extends FrameLayout { } } - public void setDragEdge(DragEdge dragEdge){ - mDragEdge = dragEdge; + public void setDragEdge(DragEdge dragEdge) + { + mDragEdges = new ArrayList(); + mDragEdges.add(dragEdge); + currentDirectionIndex = 0; + populateIndexes(); requestLayout(); + updateBottomViews(); } /** - * set the drag distance, it will force set the bottom view's width or height via this value. + * set the drag distance, it will force set the bottom view's width or + * height via this value. + * * @param max */ - public void setDragDistance(int max){ - if(max < 0) - throw new IllegalArgumentException("Drag distance can not be < 0"); + public void setDragDistance(int max) + { + if (max < 0) throw new IllegalArgumentException("Drag distance can not be < 0"); mDragDistance = dp2px(max); requestLayout(); } /** * There are 2 diffirent show mode. - * {@link com.daimajia.swipe.SwipeLayout.ShowMode}.PullOut and {@link com.daimajia.swipe.SwipeLayout.ShowMode}.LayDown. + * {@link com.daimajia.swipe.SwipeLayout.ShowMode}.PullOut and + * {@link com.daimajia.swipe.SwipeLayout.ShowMode}.LayDown. + * * @param mode */ - public void setShowMode(ShowMode mode){ + public void setShowMode(ShowMode mode) + { mShowMode = mode; requestLayout(); } - public DragEdge getDragEdge(){ - return mDragEdge; + public DragEdge getDragEdge() + { + return mDragEdges.get(currentDirectionIndex); } - public int getDragDistance(){ + public int getDragDistance() + { return mDragDistance; } - public ShowMode getShowMode(){ + public ShowMode getShowMode() + { return mShowMode; } - public ViewGroup getSurfaceView(){ - return (ViewGroup)getChildAt(1); + public ViewGroup getSurfaceView() + { + return (ViewGroup) getChildAt(getChildCount() - 1); } - public ViewGroup getBottomView(){ - return (ViewGroup)getChildAt(0); + public List getBottomViews() + { + List lvg = new ArrayList(); + for (int i = 0; i < (getChildCount() - 1); i++) { + lvg.add((ViewGroup) getChildAt(i)); + } + return lvg; } - public enum Status { - Middle , Open, Close + public enum Status + { + Middle, + Open, + Close } /** * get the open status. - * @return {@link com.daimajia.swipe.SwipeLayout.Status} - * Open , Close or Middle. + * + * @return {@link com.daimajia.swipe.SwipeLayout.Status} Open , Close or + * Middle. */ - public Status getOpenStatus(){ + public Status getOpenStatus() + { int surfaceLeft = getSurfaceView().getLeft(); int surfaceTop = getSurfaceView().getTop(); - if(surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop()) - return Status.Close; + if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop()) return Status.Close; - if(surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance) + if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance) || surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance)) return Status.Open; @@ -1057,29 +1217,36 @@ public class SwipeLayout extends FrameLayout { /** * Process the surface release event. + * * @param xvel * @param yvel */ - private void processSurfaceRelease(float xvel, float yvel){ - if(xvel == 0 && getOpenStatus() == Status.Middle) - close(); + private void processSurfaceRelease(float xvel, float yvel) + { + if (xvel == 0 && getOpenStatus() == Status.Middle) close(); - if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right){ - if(xvel > 0){ - if(mDragEdge == DragEdge.Left) open(); + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left + || mDragEdges.get(currentDirectionIndex) == DragEdge.Right) { + if (xvel > 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + open(); else close(); } - if(xvel < 0){ - if(mDragEdge == DragEdge.Left) close(); + if (xvel < 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + close(); else open(); } - }else{ - if(yvel > 0){ - if(mDragEdge == DragEdge.Top) open(); + } + else { + if (yvel > 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + open(); else close(); } - if(yvel < 0){ - if(mDragEdge == DragEdge.Top) close(); + if (yvel < 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + close(); else open(); } } @@ -1087,53 +1254,61 @@ public class SwipeLayout extends FrameLayout { /** * process bottom (PullOut mode) hand release event. + * * @param xvel * @param yvel */ - private void processBottomPullOutRelease(float xvel, float yvel){ + private void processBottomPullOutRelease(float xvel, float yvel) + { - if(xvel == 0 && getOpenStatus() == Status.Middle) - close(); + if (xvel == 0 && getOpenStatus() == Status.Middle) close(); - if(mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right){ - if(xvel > 0){ - if(mDragEdge == DragEdge.Left) open(); + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left + || mDragEdges.get(currentDirectionIndex) == DragEdge.Right) { + if (xvel > 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + open(); else close(); } - if(xvel < 0){ - if(mDragEdge == DragEdge.Left) close(); + if (xvel < 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + close(); else open(); } - }else{ - if(yvel > 0) { - if (mDragEdge == DragEdge.Top) open(); + } + else { + if (yvel > 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + open(); else close(); } - if(yvel < 0){ - if(mDragEdge == DragEdge.Top) close(); - else open(); + if (yvel < 0) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + close(); + else open(); } } } /** * process bottom (LayDown mode) hand release event. + * * @param xvel * @param yvel */ - private void processBottomLayDownMode(float xvel, float yvel){ + private void processBottomLayDownMode(float xvel, float yvel) + { - if(xvel == 0 && getOpenStatus() == Status.Middle) - close(); + if (xvel == 0 && getOpenStatus() == Status.Middle) close(); int l = getPaddingLeft(), t = getPaddingTop(); - if(xvel < 0 && mDragEdge == DragEdge.Right) l -= mDragDistance; - if(xvel > 0 && mDragEdge == DragEdge.Left) l += mDragDistance; + if (xvel < 0 && mDragEdges.get(currentDirectionIndex) == DragEdge.Right) l -= mDragDistance; + if (xvel > 0 && mDragEdges.get(currentDirectionIndex) == DragEdge.Left) l += mDragDistance; - if(yvel > 0 && mDragEdge == DragEdge.Top) t += mDragDistance; - if(yvel < 0 && mDragEdge == DragEdge.Bottom) t -= mDragDistance; + if (yvel > 0 && mDragEdges.get(currentDirectionIndex) == DragEdge.Top) t += mDragDistance; + if (yvel < 0 && mDragEdges.get(currentDirectionIndex) == DragEdge.Bottom) t -= mDragDistance; mDragHelper.smoothSlideViewTo(getSurfaceView(), l, t); invalidate(); @@ -1142,33 +1317,37 @@ public class SwipeLayout extends FrameLayout { /** * smoothly open surface. */ - public void open(){ + public void open() + { open(true, true); } - public void open(boolean smooth){ + public void open(boolean smooth) + { open(smooth, true); } - public void open(boolean smooth, boolean notify){ - ViewGroup surface = getSurfaceView(), bottom = getBottomView(); - int dx,dy; + public void open(boolean smooth, boolean notify) + { + ViewGroup surface = getSurfaceView(), bottom = getBottomViews().get(currentDirectionIndex); + int dx, dy; Rect rect = computeSurfaceLayoutArea(true); - if(smooth) { + if (smooth) { mDragHelper.smoothSlideViewTo(getSurfaceView(), rect.left, rect.top); } - else{ + else { dx = rect.left - surface.getLeft(); dy = rect.top - surface.getTop(); surface.layout(rect.left, rect.top, rect.right, rect.bottom); - if(getShowMode() == ShowMode.PullOut){ + if (getShowMode() == ShowMode.PullOut) { Rect bRect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, rect); bottom.layout(bRect.left, bRect.top, bRect.right, bRect.bottom); } - if(notify) { + if (notify) { dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom); dispatchSwipeEvent(rect.left, rect.top, dx, dy); - }else{ + } + else { safeBottomView(); } } @@ -1178,123 +1357,208 @@ public class SwipeLayout extends FrameLayout { /** * smoothly close surface. */ - public void close(){ + public void close() + { close(true, true); } - public void close(boolean smooth){ + public void close(boolean smooth) + { close(smooth, true); } /** * close surface - * @param smooth smoothly or not. - * @param notify if notify all the listeners. + * + * @param smooth + * smoothly or not. + * @param notify + * if notify all the listeners. */ - public void close(boolean smooth, boolean notify){ + public void close(boolean smooth, boolean notify) + { ViewGroup surface = getSurfaceView(); int dx, dy; - if(smooth) + if (smooth) mDragHelper.smoothSlideViewTo(getSurfaceView(), getPaddingLeft(), getPaddingTop()); else { Rect rect = computeSurfaceLayoutArea(false); dx = rect.left - surface.getLeft(); dy = rect.top - surface.getTop(); surface.layout(rect.left, rect.top, rect.right, rect.bottom); - if(notify) { + if (notify) { dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom); dispatchSwipeEvent(rect.left, rect.top, dx, dy); - }else{ + } + else { safeBottomView(); } } invalidate(); } - public void toggle(){ + public void toggle() + { toggle(true); } - public void toggle(boolean smooth){ - if(getOpenStatus() == Status.Open) + public void toggle(boolean smooth) + { + if (getOpenStatus() == Status.Open) close(smooth); - else if(getOpenStatus() == Status.Close) - open(smooth); + else if (getOpenStatus() == Status.Close) open(smooth); } /** * a helper function to compute the Rect area that surface will hold in. - * @param open open status or close status. + * + * @param open + * open status or close status. * @return */ - private Rect computeSurfaceLayoutArea(boolean open){ + private Rect computeSurfaceLayoutArea(boolean open) + { int l = getPaddingLeft(), t = getPaddingTop(); - if(open){ - if(mDragEdge == DragEdge.Left) l = getPaddingLeft() + mDragDistance; - else if(mDragEdge == DragEdge.Right) l = getPaddingLeft() - mDragDistance; - else if(mDragEdge == DragEdge.Top) t = getPaddingTop() + mDragDistance; - else t = getPaddingTop() - mDragDistance; + if (open) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + l = getPaddingLeft() + mDragDistance; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Right) + l = getPaddingLeft() - mDragDistance; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + t = getPaddingTop() + mDragDistance; + else t = getPaddingTop() - mDragDistance; } return new Rect(l, t, l + getMeasuredWidth(), t + getMeasuredHeight()); } - - private Rect computeBottomLayoutAreaViaSurface(ShowMode mode, Rect surfaceArea){ + private Rect computeBottomLayoutAreaViaSurface(ShowMode mode, Rect surfaceArea) + { Rect rect = surfaceArea; int bl = rect.left, bt = rect.top, br = rect.right, bb = rect.bottom; - if(mode == ShowMode.PullOut){ - if (mDragEdge == DragEdge.Left) bl = rect.left - mDragDistance; - else if (mDragEdge == DragEdge.Right) bl = rect.right; - else if (mDragEdge == DragEdge.Top) bt = rect.top - mDragDistance; - else bt = rect.bottom; + if (mode == ShowMode.PullOut) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + bl = rect.left - mDragDistance; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Right) + bl = rect.right; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + bt = rect.top - mDragDistance; + else bt = rect.bottom; - if (mDragEdge == DragEdge.Left || mDragEdge == DragEdge.Right) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left || mDragEdges.get(currentDirectionIndex) == DragEdge.Right) { bb = rect.bottom; - br = bl + getBottomView().getMeasuredWidth(); - } else { - bb = bt + getBottomView().getMeasuredHeight(); + br = bl + getBottomViews().get(currentDirectionIndex).getMeasuredWidth(); + } + else { + bb = bt + getBottomViews().get(currentDirectionIndex).getMeasuredHeight(); br = rect.right; } - }else if(mode == ShowMode.LayDown){ - if(mDragEdge == DragEdge.Left) br = bl + mDragDistance; - else if(mDragEdge == DragEdge.Right) bl = br - mDragDistance; - else if(mDragEdge == DragEdge.Top) bb = bt + mDragDistance; - else bt = bb - mDragDistance; + } + else if (mode == ShowMode.LayDown) { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) + br = bl + mDragDistance; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Right) + bl = br - mDragDistance; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) + bb = bt + mDragDistance; + else bt = bb - mDragDistance; } return new Rect(bl, bt, br, bb); - } - private Rect computeBottomLayDown(DragEdge dragEdge){ + private Rect computeBottomLayDown(DragEdge dragEdge) + { int bl = getPaddingLeft(), bt = getPaddingTop(); int br, bb; - if(dragEdge == DragEdge.Right){ + if (dragEdge == DragEdge.Right) { bl = getMeasuredWidth() - mDragDistance; - }else if(dragEdge == DragEdge.Bottom){ + } + else if (dragEdge == DragEdge.Bottom) { bt = getMeasuredHeight() - mDragDistance; } - if(dragEdge == DragEdge.Left || dragEdge == DragEdge.Right){ + if (dragEdge == DragEdge.Left || dragEdge == DragEdge.Right) { br = bl + mDragDistance; bb = bt + getMeasuredHeight(); - }else{ + } + else { br = bl + getMeasuredWidth(); bb = bt + mDragDistance; } return new Rect(bl, bt, br, bb); } - public void setOnDoubleClickListener(DoubleClickListener doubleClickListener){ + public void setOnDoubleClickListener(DoubleClickListener doubleClickListener) + { mDoubleClickListener = doubleClickListener; } - public interface DoubleClickListener { + public interface DoubleClickListener + { public void onDoubleClick(SwipeLayout layout, boolean surface); } - private int dp2px(float dp){ + private int dp2px(float dp) + { return (int) (dp * getContext().getResources().getDisplayMetrics().density + 0.5f); } + + public List getDragEdges() + { + return mDragEdges; + } + + public void setDragEdges(List mDragEdges) + { + this.mDragEdges = mDragEdges; + currentDirectionIndex = 0; + populateIndexes(); + updateBottomViews(); + } + + public void setDragEdges(DragEdge... mDragEdges) + { + this.mDragEdges = new ArrayList(); + for (DragEdge e : mDragEdges) { + this.mDragEdges.add(e); + } + currentDirectionIndex = 0; + populateIndexes(); + updateBottomViews(); + } + + private void populateIndexes() + { + mLeftIndex = this.mDragEdges.indexOf(DragEdge.Left); + mRightIndex = this.mDragEdges.indexOf(DragEdge.Right); + mTopIndex = this.mDragEdges.indexOf(DragEdge.Top); + mBottomIndex = this.mDragEdges.indexOf(DragEdge.Bottom); + } + + private float getCurrentOffset() + { + if (mDragEdges.get(currentDirectionIndex) == DragEdge.Left) return mLeftEdgeSwipeOffset; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Right) return mRightEdgeSwipeOffset; + else if (mDragEdges.get(currentDirectionIndex) == DragEdge.Top) return mTopEdgeSwipeOffset; + else return mLeftEdgeSwipeOffset; + } + + private void updateBottomViews() + { +// removeAllViews(); +// addView(getBottomViews().get(currentDirectionIndex)); +// addView(getSurfaceView()); +// getBottomViews().get(currentDirectionIndex).bringToFront(); +// getSurfaceView().bringToFront(); + if (mShowMode == ShowMode.PullOut) + layoutPullOut(); + else if (mShowMode == ShowMode.LayDown) layoutLayDown(); + + safeBottomView(); + + if (mOnLayoutListeners != null) for (int i = 0; i < mOnLayoutListeners.size(); i++) { + mOnLayoutListeners.get(i).onLayout(this); + } + } } diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml index 9f69031..c23e5a6 100644 --- a/library/src/main/res/values/attrs.xml +++ b/library/src/main/res/values/attrs.xml @@ -1,14 +1,16 @@ - - - - - + + + + + - - + + + +