Merge pull request #446 from chongzhe/patch-1

add insight.io badge to README.md

.travis.yml

@@ -0,0 +1,12 @@
+language: android
+android:
+  components:
+  - tools
+  - platform-tools
+  - build-tools-25.0.2
+  - android-25
+  - extra-android-support
+  - extra
+  - extra-android-m2repository
+script:
+  - ./gradlew assembleDebug

README.md

@@ -1,7 +1,9 @@
-# Android Swipe Layout
+# Android Swipe Layout [![Build Status](https://travis-ci.org/daimajia/AndroidSwipeLayout.svg?branch=master)](https://travis-ci.org/daimajia/AndroidSwipeLayout)
 
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/daimajia/AndroidSwipeLayout?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+[![Insight.io](https://insight.io/repoBadge/github.com/daimajia/AndroidSwipeLayout)](https://insight.io/github.com/daimajia/AndroidSwipeLayout)
+
 This is the brother of [AndroidViewHover](https://github.com/daimajia/AndroidViewHover).
 
 One year ago, I started to make an app named [EverMemo](https://play.google.com/store/apps/details?id=com.zhan_dui.evermemo) with my good friends. The designer gave me a design picture, the design like this:
@@ -71,6 +73,8 @@ dependencies {
 
 ### Step 2
 
+**Make sure to use the internal adapter instead of your own!**
+
 [Wiki Usage](https://github.com/daimajia/AndroidSwipeLayout/wiki/usage)
 
 ## Wiki

build.gradle

@@ -3,9 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.github.dcendents:android-maven-plugin:1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,5 +19,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://jitpack.io"
+        }
     }
 }

demo/build.gradle

@@ -26,7 +26,7 @@ android {
 
 dependencies {
     compile project(":library")
-    compile 'com.android.support:recyclerview-v7:21.0.0'
+    compile 'com.android.support:recyclerview-v7:25.1.1'
     compile 'com.daimajia.easing:library:1.0.0@aar'
     compile 'com.daimajia.androidanimations:library:1.1.2@aar'
     compile 'com.nineoldandroids:library:2.4.0'

demo/src/main/java/com/daimajia/swipedemo/adapter/RecyclerViewAdapter.java

@@ -15,7 +15,6 @@ import com.daimajia.androidanimations.library.YoYo;
 import com.daimajia.swipe.SimpleSwipeListener;
 import com.daimajia.swipe.SwipeLayout;
 import com.daimajia.swipe.adapters.RecyclerSwipeAdapter;
-import com.daimajia.swipe.implments.SwipeItemRecyclerMangerImpl;
 import com.daimajia.swipedemo.R;
 
 import java.util.ArrayList;
@@ -90,7 +89,7 @@ public class RecyclerViewAdapter extends RecyclerSwipeAdapter<RecyclerViewAdapte
         });
         viewHolder.textViewPos.setText((position + 1) + ".");
         viewHolder.textViewData.setText(item);
-        mItemManger.bindView(viewHolder.itemView, position);
+        mItemManger.bind(viewHolder.itemView, position);
     }
 
     @Override

demo/src/main/java/com/daimajia/swipedemo/adapter/util/RecyclerItemClickListener.java

@@ -37,4 +37,9 @@ public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListen
     @Override
     public void onTouchEvent(RecyclerView view, MotionEvent motionEvent) {
     }
+
+    @Override
+    public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+        
+    }
 }

gradle.properties

@@ -22,7 +22,7 @@ VERSION_NAME=1.2.0
 VERSION_CODE=22
 GROUP=com.daimajia.swipelayout
 
-ANDROID_BUILD_MIN_SDK_VERSION=8
-ANDROID_BUILD_TARGET_SDK_VERSION=21
-ANDROID_BUILD_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=21.0.0
+ANDROID_BUILD_MIN_SDK_VERSION=9
+ANDROID_BUILD_TARGET_SDK_VERSION=25
+ANDROID_BUILD_SDK_VERSION=25
+ANDROID_BUILD_TOOLS_VERSION=25.0.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Thu Mar 09 16:07:03 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

library/build.gradle

@@ -5,13 +5,22 @@ android {
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
     }
 }
 
 dependencies {
-    compile 'com.android.support:recyclerview-v7:21.0.0'
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'com.android.support:support-v4:25.2.0'
 }
 apply from: './gradle-mvn-push.gradle'
+
+// build a jar with source files
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+artifacts {
+    archives sourcesJar
+}

library/src/main/AndroidManifest.xml

@@ -1,2 +1,3 @@
-
-<manifest package="com.daimajia.swipe"/>
+<manifest package="com.daimajia.swipe">
+    <application />
+</manifest>

library/src/main/java/com/daimajia/swipe/SwipeLayout.java

@@ -3,7 +3,6 @@ package com.daimajia.swipe;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.widget.ViewDragHelper;
@@ -43,30 +42,33 @@ public class SwipeLayout extends FrameLayout {
     private ViewDragHelper mDragHelper;
 
     private int mDragDistance = 0;
-    private LinkedHashMap<DragEdge, View> mDragEdges = new LinkedHashMap<DragEdge, View>();
+    private LinkedHashMap<DragEdge, View> mDragEdges = new LinkedHashMap<>();
     private ShowMode mShowMode;
 
     private float[] mEdgeSwipesOffset = new float[4];
 
-    private List<SwipeListener> mSwipeListeners = new ArrayList<SwipeListener>();
-    private List<SwipeDenier> mSwipeDeniers = new ArrayList<SwipeDenier>();
-    private Map<View, ArrayList<OnRevealListener>> mRevealListeners = new HashMap<View, ArrayList<OnRevealListener>>();
-    private Map<View, Boolean> mShowEntirely = new HashMap<View, Boolean>();
+    private List<SwipeListener> mSwipeListeners = new ArrayList<>();
+    private List<SwipeDenier> mSwipeDeniers = new ArrayList<>();
+    private Map<View, ArrayList<OnRevealListener>> mRevealListeners = new HashMap<>();
+    private Map<View, Boolean> mShowEntirely = new HashMap<>();
+    private Map<View, Rect> mViewBoundCache = new HashMap<>();//save all children's bound, restore in onLayout
 
     private DoubleClickListener mDoubleClickListener;
 
     private boolean mSwipeEnabled = true;
     private boolean[] mSwipesEnabled = new boolean[]{true, true, true, true};
     private boolean mClickToClose = false;
+    private float mWillOpenPercentAfterOpen = 0.75f;
+    private float mWillOpenPercentAfterClose = 0.25f;
 
-    public static enum DragEdge {
+    public enum DragEdge {
         Left,
         Top,
         Right,
         Bottom
     }
 
-    public static enum ShowMode {
+    public enum ShowMode {
         LayDown,
         PullOut
     }
@@ -111,17 +113,17 @@ public class SwipeLayout extends FrameLayout {
     }
 
     public interface SwipeListener {
-        public void onStartOpen(SwipeLayout layout);
+        void onStartOpen(SwipeLayout layout);
 
-        public void onOpen(SwipeLayout layout);
+        void onOpen(SwipeLayout layout);
 
-        public void onStartClose(SwipeLayout layout);
+        void onStartClose(SwipeLayout layout);
 
-        public void onClose(SwipeLayout layout);
+        void onClose(SwipeLayout layout);
 
-        public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset);
+        void onUpdate(SwipeLayout layout, int leftOffset, int topOffset);
 
-        public void onHandRelease(SwipeLayout layout, float xvel, float yvel);
+        void onHandRelease(SwipeLayout layout, float xvel, float yvel);
     }
 
     public void addSwipeListener(SwipeListener l) {
@@ -132,7 +134,11 @@ public class SwipeLayout extends FrameLayout {
         mSwipeListeners.remove(l);
     }
 
-    public static interface SwipeDenier {
+    public void removeAllSwipeListener() {
+        mSwipeListeners.clear();
+    }
+
+    public interface SwipeDenier {
         /*
          * Called in onInterceptTouchEvent Determines if this swipe event should
          * be denied Implement this interface if you are using views with swipe
@@ -140,7 +146,7 @@ public class SwipeLayout extends FrameLayout {
          * 
          * @return true deny false allow
          */
-        public boolean shouldDenySwipe(MotionEvent ev);
+        boolean shouldDenySwipe(MotionEvent ev);
     }
 
     public void addSwipeDenier(SwipeDenier denier) {
@@ -156,7 +162,7 @@ public class SwipeLayout extends FrameLayout {
     }
 
     public interface OnRevealListener {
-        public void onReveal(View child, DragEdge edge, float fraction, int distance);
+        void onReveal(View child, DragEdge edge, float fraction, int distance);
     }
 
     /**
@@ -326,6 +332,7 @@ public class SwipeLayout extends FrameLayout {
         }
 
         boolean isCloseBeforeDrag = true;
+
         @Override
         public void onViewReleased(View releasedChild, float xvel, float yvel) {
             super.onViewReleased(releasedChild, xvel, yvel);
@@ -387,9 +394,35 @@ public class SwipeLayout extends FrameLayout {
             dispatchSwipeEvent(evLeft, evTop, dx, dy);
 
             invalidate();
+
+            captureChildrenBound();
         }
     };
 
+    /**
+     * save children's bounds, so they can restore the bound in {@link #onLayout(boolean, int, int, int, int)}
+     */
+    private void captureChildrenBound() {
+        View currentBottomView = getCurrentBottomView();
+        if (getOpenStatus() == Status.Close) {
+            mViewBoundCache.remove(currentBottomView);
+            return;
+        }
+
+        View[] views = new View[]{getSurfaceView(), currentBottomView};
+        for (View child : views) {
+            Rect rect = mViewBoundCache.get(child);
+            if (rect == null) {
+                rect = new Rect();
+                mViewBoundCache.put(child, rect);
+            }
+            rect.left = child.getLeft();
+            rect.top = child.getTop();
+            rect.right = child.getRight();
+            rect.bottom = child.getBottom();
+        }
+    }
+
     /**
      * the dispatchRevealEvent method may not always get accurate position, it
      * makes the view may not always get the event when the view is totally
@@ -642,7 +675,7 @@ public class SwipeLayout extends FrameLayout {
      * to support it from API 8.
      */
     public interface OnLayout {
-        public void onLayout(SwipeLayout v);
+        void onLayout(SwipeLayout v);
     }
 
     private List<OnLayout> mOnLayoutListeners;
@@ -655,23 +688,29 @@ public class SwipeLayout extends FrameLayout {
     public void removeOnLayoutListener(OnLayout l) {
         if (mOnLayoutListeners != null) mOnLayoutListeners.remove(l);
     }
+
     public void clearDragEdge() {
         mDragEdges.clear();
     }
+
     public void setDrag(DragEdge dragEdge, int childId) {
         clearDragEdge();
         addDrag(dragEdge, childId);
     }
+
     public void setDrag(DragEdge dragEdge, View child) {
         clearDragEdge();
         addDrag(dragEdge, child);
     }
+
     public void addDrag(DragEdge dragEdge, int childId) {
         addDrag(dragEdge, findViewById(childId), null);
     }
+
     public void addDrag(DragEdge dragEdge, View child) {
         addDrag(dragEdge, child, null);
     }
+
     public void addDrag(DragEdge dragEdge, View child, ViewGroup.LayoutParams params) {
         if (child == null) return;
 
@@ -683,16 +722,25 @@ public class SwipeLayout extends FrameLayout {
         }
         int gravity = -1;
         switch (dragEdge) {
-            case Left:gravity = Gravity.LEFT;break;
-            case Right:gravity = Gravity.RIGHT;break;
-            case Top:gravity = Gravity.TOP;break;
-            case Bottom:gravity = Gravity.BOTTOM;break;
+            case Left:
+                gravity = Gravity.LEFT;
+                break;
+            case Right:
+                gravity = Gravity.RIGHT;
+                break;
+            case Top:
+                gravity = Gravity.TOP;
+                break;
+            case Bottom:
+                gravity = Gravity.BOTTOM;
+                break;
         }
         if (params instanceof FrameLayout.LayoutParams) {
             ((LayoutParams) params).gravity = gravity;
         }
         addView(child, 0, params);
     }
+
     @Override
     public void addView(View child, int index, ViewGroup.LayoutParams params) {
         if (child == null) return;
@@ -743,34 +791,41 @@ public class SwipeLayout extends FrameLayout {
     }
 
     void layoutPullOut() {
-        Rect rect = computeSurfaceLayoutArea(false);
         View surfaceView = getSurfaceView();
+        Rect surfaceRect = mViewBoundCache.get(surfaceView);
+        if (surfaceRect == null) surfaceRect = computeSurfaceLayoutArea(false);
         if (surfaceView != null) {
-            surfaceView.layout(rect.left, rect.top, rect.right, rect.bottom);
+            surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
             bringChildToFront(surfaceView);
         }
-        rect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, rect);
         View currentBottomView = getCurrentBottomView();
+        Rect bottomViewRect = mViewBoundCache.get(currentBottomView);
+        if (bottomViewRect == null)
+            bottomViewRect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, surfaceRect);
         if (currentBottomView != null) {
-            currentBottomView.layout(rect.left, rect.top, rect.right, rect.bottom);
+            currentBottomView.layout(bottomViewRect.left, bottomViewRect.top, bottomViewRect.right, bottomViewRect.bottom);
         }
     }
 
     void layoutLayDown() {
-        Rect rect = computeSurfaceLayoutArea(false);
         View surfaceView = getSurfaceView();
+        Rect surfaceRect = mViewBoundCache.get(surfaceView);
+        if (surfaceRect == null) surfaceRect = computeSurfaceLayoutArea(false);
         if (surfaceView != null) {
-            surfaceView.layout(rect.left, rect.top, rect.right, rect.bottom);
+            surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
             bringChildToFront(surfaceView);
         }
-        rect = computeBottomLayoutAreaViaSurface(ShowMode.LayDown, rect);
         View currentBottomView = getCurrentBottomView();
+        Rect bottomViewRect = mViewBoundCache.get(currentBottomView);
+        if (bottomViewRect == null)
+            bottomViewRect = computeBottomLayoutAreaViaSurface(ShowMode.LayDown, surfaceRect);
         if (currentBottomView != null) {
-            currentBottomView.layout(rect.left, rect.top, rect.right, rect.bottom);
+            currentBottomView.layout(bottomViewRect.left, bottomViewRect.top, bottomViewRect.right, bottomViewRect.bottom);
         }
     }
 
     private boolean mIsBeingDragged;
+
     private void checkCanDrag(MotionEvent ev) {
         if (mIsBeingDragged) return;
         if (getOpenStatus() == Status.Middle) {
@@ -843,6 +898,7 @@ public class SwipeLayout extends FrameLayout {
         }
         mIsBeingDragged = !doNothing;
     }
+
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         if (!isSwipeEnabled()) {
@@ -932,6 +988,7 @@ public class SwipeLayout extends FrameLayout {
 
         return super.onTouchEvent(event) || mIsBeingDragged || action == MotionEvent.ACTION_DOWN;
     }
+
     public boolean isClickToClose() {
         return mClickToClose;
     }
@@ -987,6 +1044,47 @@ public class SwipeLayout extends FrameLayout {
     public void setBottomSwipeEnabled(boolean bottomSwipeEnabled) {
         this.mSwipesEnabled[DragEdge.Bottom.ordinal()] = bottomSwipeEnabled;
     }
+
+    /***
+     * Returns the percentage of revealing at which the view below should the view finish opening
+     * if it was already open before dragging
+     *
+     * @returns The percentage of view revealed to trigger, default value is 0.25
+     */
+    public float getWillOpenPercentAfterOpen() {
+        return mWillOpenPercentAfterOpen;
+    }
+
+    /***
+     * Allows to stablish at what percentage of revealing the view below should the view finish opening
+     * if it was already open before dragging
+     *
+     * @param willOpenPercentAfterOpen The percentage of view revealed to trigger, default value is 0.25
+     */
+    public void setWillOpenPercentAfterOpen(float willOpenPercentAfterOpen) {
+        this.mWillOpenPercentAfterOpen = willOpenPercentAfterOpen;
+    }
+
+    /***
+     * Returns the percentage of revealing at which the view below should the view finish opening
+     * if it was already closed before dragging
+     *
+     * @returns The percentage of view revealed to trigger, default value is 0.25
+     */
+    public float getWillOpenPercentAfterClose() {
+        return mWillOpenPercentAfterClose;
+    }
+
+    /***
+     * Allows to stablish at what percentage of revealing the view below should the view finish opening
+     * if it was already closed before dragging
+     *
+     * @param willOpenPercentAfterClose The percentage of view revealed to trigger, default value is 0.75
+     */
+    public void setWillOpenPercentAfterClose(float willOpenPercentAfterClose) {
+        this.mWillOpenPercentAfterClose = willOpenPercentAfterClose;
+    }
+
     private boolean insideAdapterView() {
         return getAdapterView() != null;
     }
@@ -1011,6 +1109,7 @@ public class SwipeLayout extends FrameLayout {
             }
         }
     }
+
     private boolean performAdapterViewItemLongClick() {
         if (getOpenStatus() != Status.Close) return false;
         ViewParent t = getParent();
@@ -1039,6 +1138,7 @@ public class SwipeLayout extends FrameLayout {
         }
         return false;
     }
+
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
@@ -1062,13 +1162,17 @@ public class SwipeLayout extends FrameLayout {
             }
         }
     }
+
     OnClickListener clickListener;
+
     @Override
     public void setOnClickListener(OnClickListener l) {
         super.setOnClickListener(l);
         clickListener = l;
     }
+
     OnLongClickListener longClickListener;
+
     @Override
     public void setOnLongClickListener(OnLongClickListener l) {
         super.setOnLongClickListener(l);
@@ -1076,6 +1180,7 @@ public class SwipeLayout extends FrameLayout {
     }
 
     private Rect hitSurfaceRect;
+
     private boolean isTouchOnSurface(MotionEvent ev) {
         View surfaceView = getSurfaceView();
         if (surfaceView == null) {
@@ -1087,6 +1192,7 @@ public class SwipeLayout extends FrameLayout {
         surfaceView.getHitRect(hitSurfaceRect);
         return hitSurfaceRect.contains((int) ev.getX(), (int) ev.getY());
     }
+
     private GestureDetector gestureDetector = new GestureDetector(getContext(), new SwipeDetector());
 
     class SwipeDetector extends GestureDetector.SimpleOnGestureListener {
@@ -1097,6 +1203,7 @@ public class SwipeLayout extends FrameLayout {
             }
             return super.onSingleTapUp(e);
         }
+
         @Override
         public boolean onDoubleTap(MotionEvent e) {
             if (mDoubleClickListener != null) {
@@ -1151,14 +1258,17 @@ public class SwipeLayout extends FrameLayout {
         return mShowMode;
     }
 
-    /**return null if there is no surface view(no children) */
+    /**
+     * return null if there is no surface view(no children)
+     */
     public View getSurfaceView() {
         if (getChildCount() == 0) return null;
         return getChildAt(getChildCount() - 1);
     }
 
-    /**return null if there is no bottom view */
-    @Nullable
+    /**
+     * return null if there is no bottom view
+     */
     public View getCurrentBottomView() {
         List<View> bottoms = getBottomViews();
         if (mCurrentDragEdge.ordinal() < bottoms.size()) {
@@ -1166,6 +1276,7 @@ public class SwipeLayout extends FrameLayout {
         }
         return null;
     }
+
     /**
      * @return all bottomViews: left, top, right, bottom (may null if the edge is not set)
      */
@@ -1220,7 +1331,7 @@ public class SwipeLayout extends FrameLayout {
         if (currentDragEdge == null || surfaceView == null) {
             return;
         }
-        float willOpenPercent = (isCloseBeforeDragged ? .25f : .75f);
+        float willOpenPercent = (isCloseBeforeDragged ? mWillOpenPercentAfterClose : mWillOpenPercentAfterOpen);
         if (currentDragEdge == DragEdge.Left) {
             if (xvel > minVelocity) open();
             else if (xvel < -minVelocity) close();
@@ -1364,6 +1475,7 @@ public class SwipeLayout extends FrameLayout {
 
     /**
      * a helper function to compute the Rect area that surface will hold in.
+     *
      * @param open open status or close status.
      */
     private Rect computeSurfaceLayoutArea(boolean open) {
@@ -1438,7 +1550,7 @@ public class SwipeLayout extends FrameLayout {
     }
 
     public interface DoubleClickListener {
-        public void onDoubleClick(SwipeLayout layout, boolean surface);
+        void onDoubleClick(SwipeLayout layout, boolean surface);
     }
 
     private int dp2px(float dp) {
@@ -1446,7 +1558,9 @@ public class SwipeLayout extends FrameLayout {
     }
 
 
-    /**Deprecated, use {@link #setDrag(DragEdge, View)} */
+    /**
+     * Deprecated, use {@link #setDrag(DragEdge, View)}
+     */
     @Deprecated
     public void setDragEdge(DragEdge dragEdge) {
         clearDragEdge();
@@ -1456,24 +1570,29 @@ public class SwipeLayout extends FrameLayout {
         setCurrentDragEdge(dragEdge);
     }
 
-    protected void onViewRemoved(View child) {
+    public void onViewRemoved(View child) {
         for (Map.Entry<DragEdge, View> entry : new HashMap<DragEdge, View>(mDragEdges).entrySet()) {
             if (entry.getValue() == child) {
                 mDragEdges.remove(entry.getKey());
             }
         }
     }
+
     public Map<DragEdge, View> getDragEdgeMap() {
         return mDragEdges;
     }
 
-    /**Deprecated, use {@link #getDragEdgeMap()} */
+    /**
+     * Deprecated, use {@link #getDragEdgeMap()}
+     */
     @Deprecated
     public List<DragEdge> getDragEdges() {
         return new ArrayList<DragEdge>(mDragEdges.keySet());
     }
 
-    /**Deprecated, use {@link #setDrag(DragEdge, View)} */
+    /**
+     * Deprecated, use {@link #setDrag(DragEdge, View)}
+     */
     @Deprecated
     public void setDragEdges(List<DragEdge> dragEdges) {
         clearDragEdge();
@@ -1488,12 +1607,15 @@ public class SwipeLayout extends FrameLayout {
         }
     }
 
-    /**Deprecated, use {@link #addDrag(DragEdge, View)} */
+    /**
+     * Deprecated, use {@link #addDrag(DragEdge, View)}
+     */
     @Deprecated
     public void setDragEdges(DragEdge... mDragEdges) {
         clearDragEdge();
         setDragEdges(Arrays.asList(mDragEdges));
     }
+
     /**
      * Deprecated, use {@link #addDrag(DragEdge, View)}
      * When using multiple drag edges it's a good idea to pass the ids of the views that
@@ -1522,13 +1644,16 @@ public class SwipeLayout extends FrameLayout {
         if (currentBottomView != null) {
             if (mCurrentDragEdge == DragEdge.Left || mCurrentDragEdge == DragEdge.Right) {
                 mDragDistance = currentBottomView.getMeasuredWidth() - dp2px(getCurrentOffset());
+            } else {
+                mDragDistance = currentBottomView.getMeasuredHeight() - dp2px(getCurrentOffset());
             }
-            else mDragDistance = currentBottomView.getMeasuredHeight() - dp2px(getCurrentOffset());
         }
 
-        if (mShowMode == ShowMode.PullOut)
+        if (mShowMode == ShowMode.PullOut) {
             layoutPullOut();
-        else if (mShowMode == ShowMode.LayDown) layoutLayDown();
+        } else if (mShowMode == ShowMode.LayDown) {
+            layoutLayDown();
+        }
 
         safeBottomView();
     }

library/src/main/java/com/daimajia/swipe/adapters/ArraySwipeAdapter.java

@@ -6,7 +6,6 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemAdapterMangerImpl;
 import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
@@ -16,7 +15,7 @@ import java.util.List;
 
 public abstract class ArraySwipeAdapter<T> extends ArrayAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    private SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
+    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
     {}
     public ArraySwipeAdapter(Context context, int resource) {
         super(context, resource);
@@ -43,14 +42,14 @@ public abstract class ArraySwipeAdapter<T> extends ArrayAdapter implements Swipe
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        boolean convertViewIsNull = convertView == null;
-        View v = super.getView(position, convertView, parent);
-        if(convertViewIsNull){
-            mItemManger.initialize(v, position);
-        }else{
-            mItemManger.updateConvertView(v, position);
+    public void notifyDatasetChanged() {
+        super.notifyDataSetChanged();
     }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View v = super.getView(position, convertView, parent);
+        mItemManger.bind(v, position);
         return v;
     }
 

library/src/main/java/com/daimajia/swipe/adapters/BaseSwipeAdapter.java

@@ -5,9 +5,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemAdapterMangerImpl;
-import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.implments.SwipeItemMangerImpl;
+import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
 
@@ -15,7 +14,7 @@ import java.util.List;
 
 public abstract class BaseSwipeAdapter extends BaseAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    protected SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
+    protected SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
 
     /**
      * return the {@link com.daimajia.swipe.SwipeLayout} resource id, int the view item.
@@ -42,16 +41,19 @@ public abstract class BaseSwipeAdapter extends BaseAdapter implements SwipeItemM
      */
     public abstract void fillValues(int position, View convertView);
 
+    @Override
+    public void notifyDatasetChanged() {
+        super.notifyDataSetChanged();
+    }
+
 
     @Override
     public final View getView(int position, View convertView, ViewGroup parent) {
         View v = convertView;
         if(v == null){
             v = generateView(position, parent);
-            mItemManger.initialize(v, position);
-        }else{
-            mItemManger.updateConvertView(v, position);
         }
+        mItemManger.bind(v, position);
         fillValues(position, v);
         return v;
     }

library/src/main/java/com/daimajia/swipe/adapters/CursorSwipeAdapter.java

@@ -7,9 +7,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemAdapterMangerImpl;
-import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.implments.SwipeItemMangerImpl;
+import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
 
@@ -17,7 +16,7 @@ import java.util.List;
 
 public abstract class CursorSwipeAdapter extends CursorAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    private SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
+    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
 
     protected CursorSwipeAdapter(Context context, Cursor c, boolean autoRequery) {
         super(context, c, autoRequery);
@@ -29,13 +28,8 @@ public abstract class CursorSwipeAdapter extends CursorAdapter implements SwipeI
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        boolean convertViewIsNull = convertView == null;
         View v = super.getView(position, convertView, parent);
-        if(convertViewIsNull){
-            mItemManger.initialize(v, position);
-        }else{
-            mItemManger.updateConvertView(v, position);
-        }
+        mItemManger.bind(v, position);
         return v;
     }
 
@@ -54,6 +48,11 @@ public abstract class CursorSwipeAdapter extends CursorAdapter implements SwipeI
         mItemManger.closeAllExcept(layout);
     }
 
+    @Override
+    public void closeAllItems() {
+        mItemManger.closeAllItems();
+    }
+
     @Override
     public List<Integer> getOpenItems() {
         return mItemManger.getOpenItems();

library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java

@@ -4,7 +4,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemRecyclerMangerImpl;
+import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
@@ -13,7 +13,7 @@ import java.util.List;
 
 public abstract class RecyclerSwipeAdapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    public SwipeItemRecyclerMangerImpl mItemManger = new SwipeItemRecyclerMangerImpl(this);
+    public SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
 
     @Override
     public abstract VH onCreateViewHolder(ViewGroup parent, int viewType);
@@ -21,6 +21,11 @@ public abstract class RecyclerSwipeAdapter<VH extends RecyclerView.ViewHolder> e
     @Override
     public abstract void onBindViewHolder(VH viewHolder, final int position);
 
+    @Override
+    public void notifyDatasetChanged() {
+        super.notifyDataSetChanged();
+    }
+
     @Override
     public void openItem(int position) {
         mItemManger.openItem(position);

library/src/main/java/com/daimajia/swipe/adapters/SimpleCursorSwipeAdapter.java

@@ -7,7 +7,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemAdapterMangerImpl;
 import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
@@ -17,7 +16,7 @@ import java.util.List;
 
 public abstract class SimpleCursorSwipeAdapter extends SimpleCursorAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    private SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
+    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
 
     protected SimpleCursorSwipeAdapter(Context context, int layout, Cursor c, String[] from, int[] to, int flags) {
         super(context, layout, c, from, to, flags);
@@ -29,13 +28,8 @@ public abstract class SimpleCursorSwipeAdapter extends SimpleCursorAdapter imple
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        boolean convertViewIsNull = convertView == null;
         View v = super.getView(position, convertView, parent);
-        if(convertViewIsNull){
-            mItemManger.initialize(v, position);
-        }else{
-            mItemManger.updateConvertView(v, position);
-        }
+        mItemManger.bind(v, position);
         return v;
     }
 

library/src/main/java/com/daimajia/swipe/implments/SwipeItemAdapterMangerImpl.java

@@ -1,66 +0,0 @@
-package com.daimajia.swipe.implments;
-
-import android.view.View;
-import android.widget.BaseAdapter;
-
-import com.daimajia.swipe.SimpleSwipeListener;
-import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
-import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
-import com.daimajia.swipe.util.Attributes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * SwipeItemMangerImpl is a helper class to help all the adapters to maintain open status.
- */
-public class SwipeItemAdapterMangerImpl extends SwipeItemMangerImpl{
-
-    protected BaseAdapter mAdapter;
-
-    public SwipeItemAdapterMangerImpl(BaseAdapter adapter) {
-        super(adapter);
-        this.mAdapter = adapter;
-    }
-
-    @Override
-    public void initialize(View target, int position) {
-        int resId = getSwipeLayoutId(position);
-
-        OnLayoutListener onLayoutListener = new OnLayoutListener(position);
-        SwipeLayout swipeLayout = (SwipeLayout) target.findViewById(resId);
-        if (swipeLayout == null)
-            throw new IllegalStateException("can not find SwipeLayout in target view");
-
-        SwipeMemory swipeMemory = new SwipeMemory(position);
-        swipeLayout.addSwipeListener(swipeMemory);
-        swipeLayout.addOnLayoutListener(onLayoutListener);
-        swipeLayout.setTag(resId, new ValueBox(position, swipeMemory, onLayoutListener));
-
-        mShownLayouts.add(swipeLayout);
-    }
-
-    @Override
-    public void updateConvertView(View target, int position) {
-        int resId = getSwipeLayoutId(position);
-
-        SwipeLayout swipeLayout = (SwipeLayout) target.findViewById(resId);
-        if (swipeLayout == null)
-            throw new IllegalStateException("can not find SwipeLayout in target view");
-
-        ValueBox valueBox = (ValueBox) swipeLayout.getTag(resId);
-        valueBox.swipeMemory.setPosition(position);
-        valueBox.onLayoutListener.setPosition(position);
-        valueBox.position = position;
-    }
-
-    @Override
-    public void bindView(View target, int position){
-
-    }
-
-}

library/src/main/java/com/daimajia/swipe/implments/SwipeItemMangerImpl.java

@@ -1,8 +1,6 @@
 package com.daimajia.swipe.implments;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.BaseAdapter;
 
 import com.daimajia.swipe.SimpleSwipeListener;
 import com.daimajia.swipe.SwipeLayout;
@@ -11,7 +9,7 @@ import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -19,7 +17,7 @@ import java.util.Set;
 /**
  * SwipeItemMangerImpl is a helper class to help all the adapters to maintain open status.
  */
-public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
+public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
 
     private Attributes.Mode mode = Attributes.Mode.Single;
     public final int INVALID_POSITION = -1;
@@ -29,27 +27,13 @@ public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
     protected Set<Integer> mOpenPositions = new HashSet<Integer>();
     protected Set<SwipeLayout> mShownLayouts = new HashSet<SwipeLayout>();
 
-    protected BaseAdapter mBaseAdapter;
-    protected RecyclerView.Adapter mRecyclerAdapter;
+    protected SwipeAdapterInterface swipeAdapterInterface;
 
-    public SwipeItemMangerImpl(BaseAdapter adapter) {
-        if (adapter == null)
-            throw new IllegalArgumentException("Adapter can not be null");
+    public SwipeItemMangerImpl(SwipeAdapterInterface swipeAdapterInterface) {
+        if (swipeAdapterInterface == null)
+            throw new IllegalArgumentException("SwipeAdapterInterface can not be null");
 
-        if (!(adapter instanceof SwipeItemMangerInterface))
-            throw new IllegalArgumentException("adapter should implement the SwipeAdapterInterface");
-
-        this.mBaseAdapter = adapter;
-    }
-
-    public SwipeItemMangerImpl(RecyclerView.Adapter adapter) {
-        if (adapter == null)
-            throw new IllegalArgumentException("Adapter can not be null");
-
-        if (!(adapter instanceof SwipeItemMangerInterface))
-            throw new IllegalArgumentException("adapter should implement the SwipeAdapterInterface");
-
-        this.mRecyclerAdapter = adapter;
+        this.swipeAdapterInterface = swipeAdapterInterface;
     }
 
     public Attributes.Mode getMode() {
@@ -63,21 +47,24 @@ public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
         mOpenPosition = INVALID_POSITION;
     }
 
-    /* initialize and updateConvertView used for AdapterManagerImpl */
-    public abstract void initialize(View target, int position);
+    public void bind(View view, int position) {
+        int resId = swipeAdapterInterface.getSwipeLayoutResourceId(position);
+        SwipeLayout swipeLayout = (SwipeLayout) view.findViewById(resId);
+        if (swipeLayout == null)
+            throw new IllegalStateException("can not find SwipeLayout in target view");
 
-    public abstract void updateConvertView(View target, int position);
-
-    /* bindView used for RecyclerViewManagerImpl */
-    public abstract void bindView(View target, int position);
-
-    public int getSwipeLayoutId(int position) {
-        if (mBaseAdapter != null) {
-            return ((SwipeAdapterInterface) (mBaseAdapter)).getSwipeLayoutResourceId(position);
-        } else if (mRecyclerAdapter != null) {
-            return ((SwipeAdapterInterface) (mRecyclerAdapter)).getSwipeLayoutResourceId(position);
+        if (swipeLayout.getTag(resId) == null) {
+            OnLayoutListener onLayoutListener = new OnLayoutListener(position);
+            SwipeMemory swipeMemory = new SwipeMemory(position);
+            swipeLayout.addSwipeListener(swipeMemory);
+            swipeLayout.addOnLayoutListener(onLayoutListener);
+            swipeLayout.setTag(resId, new ValueBox(position, swipeMemory, onLayoutListener));
+            mShownLayouts.add(swipeLayout);
         } else {
-            return -1;
+            ValueBox valueBox = (ValueBox) swipeLayout.getTag(resId);
+            valueBox.swipeMemory.setPosition(position);
+            valueBox.onLayoutListener.setPosition(position);
+            valueBox.position = position;
         }
     }
 
@@ -89,11 +76,7 @@ public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
         } else {
             mOpenPosition = position;
         }
-        if (mBaseAdapter != null) {
-            mBaseAdapter.notifyDataSetChanged();
-        } else if (mRecyclerAdapter != null) {
-            mRecyclerAdapter.notifyDataSetChanged();
-        }
+        swipeAdapterInterface.notifyDatasetChanged();
     }
 
     @Override
@@ -104,11 +87,7 @@ public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
             if (mOpenPosition == position)
                 mOpenPosition = INVALID_POSITION;
         }
-        if (mBaseAdapter != null) {
-            mBaseAdapter.notifyDataSetChanged();
-        } else if (mRecyclerAdapter != null) {
-            mRecyclerAdapter.notifyDataSetChanged();
-        }
+        swipeAdapterInterface.notifyDatasetChanged();
     }
 
     @Override
@@ -141,7 +120,7 @@ public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
         if (mode == Attributes.Mode.Multiple) {
             return new ArrayList<Integer>(mOpenPositions);
         } else {
-            return Arrays.asList(mOpenPosition);
+            return Collections.singletonList(mOpenPosition);
         }
     }
 

library/src/main/java/com/daimajia/swipe/implments/SwipeItemRecyclerMangerImpl.java

@@ -1,63 +0,0 @@
-package com.daimajia.swipe.implments;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import com.daimajia.swipe.SimpleSwipeListener;
-import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
-import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
-import com.daimajia.swipe.util.Attributes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * SwipeItemRecyclerMangerImpl is a helper class to help the RecyclerView to maintain open status.
- */
-public class SwipeItemRecyclerMangerImpl extends SwipeItemMangerImpl{
-
-    protected RecyclerView.Adapter mAdapter;
-
-    public SwipeItemRecyclerMangerImpl(RecyclerView.Adapter adapter) {
-        super(adapter);
-        this.mAdapter = adapter;
-    }
-
-    @Override
-    public void bindView(View target, int position) {
-        int resId = getSwipeLayoutId(position);
-
-        OnLayoutListener onLayoutListener = new OnLayoutListener(position);
-        SwipeLayout swipeLayout = (SwipeLayout) target.findViewById(resId);
-        if (swipeLayout == null)
-            throw new IllegalStateException("can not find SwipeLayout in target view");
-
-        if (swipeLayout.getTag(resId) == null) {
-            SwipeMemory swipeMemory = new SwipeMemory(position);
-            swipeLayout.addSwipeListener(swipeMemory);
-            swipeLayout.addOnLayoutListener(onLayoutListener);
-            swipeLayout.setTag(resId, new ValueBox(position, swipeMemory, onLayoutListener));
-            mShownLayouts.add(swipeLayout);
-        } else {
-            ValueBox valueBox = (ValueBox) swipeLayout.getTag(resId);
-            valueBox.swipeMemory.setPosition(position);
-            valueBox.onLayoutListener.setPosition(position);
-            valueBox.position = position;
-        }
-    }
-
-    @Override
-    public void initialize(View target, int position) {
-
-    }
-
-    @Override
-    public void updateConvertView(View target, int position) {
-
-    }
-
-}

library/src/main/java/com/daimajia/swipe/interfaces/SwipeAdapterInterface.java

@@ -1,5 +1,9 @@
 package com.daimajia.swipe.interfaces;
 
 public interface SwipeAdapterInterface {
-    public int getSwipeLayoutResourceId(int position);
+
+    int getSwipeLayoutResourceId(int position);
+
+    void notifyDatasetChanged();
+
 }

library/src/main/java/com/daimajia/swipe/interfaces/SwipeItemMangerInterface.java

@@ -1,30 +1,29 @@
 package com.daimajia.swipe.interfaces;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.util.Attributes;
 
 import java.util.List;
 
 public interface SwipeItemMangerInterface {
 
-    public void openItem(int position);
+    void openItem(int position);
 
-    public void closeItem(int position);
+    void closeItem(int position);
 
-    public void closeAllExcept(SwipeLayout layout);
+    void closeAllExcept(SwipeLayout layout);
     
-    public void closeAllItems();
+    void closeAllItems();
 
-    public List<Integer> getOpenItems();
+    List<Integer> getOpenItems();
 
-    public List<SwipeLayout> getOpenLayouts();
+    List<SwipeLayout> getOpenLayouts();
 
-    public void removeShownLayouts(SwipeLayout layout);
+    void removeShownLayouts(SwipeLayout layout);
 
-    public boolean isOpen(int position);
+    boolean isOpen(int position);
 
-    public Attributes.Mode getMode();
+    Attributes.Mode getMode();
 
-    public void setMode(Attributes.Mode mode);
+    void setMode(Attributes.Mode mode);
 }