.travis.yml

@@ -1,12 +0,0 @@
-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,9 +1,7 @@
-# Android Swipe Layout [![Build Status](https://travis-ci.org/daimajia/AndroidSwipeLayout.svg?branch=master)](https://travis-ci.org/daimajia/AndroidSwipeLayout)
+# Android Swipe Layout
 
 [![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:
@@ -42,7 +40,7 @@ When I start to make this library, I set some goals:
 dependencies {
     compile 'com.android.support:recyclerview-v7:21.0.0'
     compile 'com.android.support:support-v4:20.+'
-    compile "com.daimajia.swipelayout:library:1.2.0@aar"
+    compile "com.daimajia.swipelayout:library:1.1.8@aar"
 }
 ```
 
@@ -62,7 +60,7 @@ dependencies {
 <dependency>
     <groupId>com.daimajia.swipelayout</groupId>
     <artifactId>library</artifactId>
-    <version>1.2.0</version>
+    <version>1.1.8</version>
     <type>apklib</type>
 </dependency>
 ```
@@ -73,8 +71,6 @@ 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,13 +3,9 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url "https://jitpack.io"
-        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,8 +15,5 @@ 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:25.1.1'
+    compile 'com.android.support:recyclerview-v7:21.0.0'
     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/GridViewExample.java

@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.GridView;
 
+import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.util.Attributes;
 import com.daimajia.swipedemo.adapter.GridViewAdapter;
 

demo/src/main/java/com/daimajia/swipedemo/ListViewExample.java

@@ -17,6 +17,7 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import com.daimajia.swipe.SwipeLayout;
+import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.util.Attributes;
 import com.daimajia.swipedemo.adapter.ListViewAdapter;
 
@@ -67,7 +68,7 @@ public class ListViewExample extends Activity {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
                 Toast.makeText(mContext, "OnItemLongClickListener", Toast.LENGTH_SHORT).show();
-                return true;
+                return false;
             }
         });
         mListView.setOnScrollListener(new AbsListView.OnScrollListener() {

demo/src/main/java/com/daimajia/swipedemo/MyActivity.java

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,11 +28,9 @@ public class MyActivity extends Activity {
 
         sample1 = (SwipeLayout) findViewById(R.id.sample1);
         sample1.setShowMode(SwipeLayout.ShowMode.PullOut);
-        View starBottView = sample1.findViewById(R.id.starbott);
-        sample1.addDrag(SwipeLayout.DragEdge.Left, sample1.findViewById(R.id.bottom_wrapper));
-        sample1.addDrag(SwipeLayout.DragEdge.Right, sample1.findViewById(R.id.bottom_wrapper_2));
-        sample1.addDrag(SwipeLayout.DragEdge.Top, starBottView);
-        sample1.addDrag(SwipeLayout.DragEdge.Bottom, starBottView);
+        sample1.setDragEdges(SwipeLayout.DragEdge.Left, SwipeLayout.DragEdge.Right, SwipeLayout.DragEdge.Top);
+        // When using multiple drag edges it's a good idea to pass the ids of the views that you're using for the left, right, top bottom views (-1 if you're not using a particular view)
+        sample1.setBottomViewIds(R.id.bottom_wrapper, R.id.bottom_wrapper_2, R.id.starbott, SwipeLayout.EMPTY_LAYOUT);
         sample1.addRevealListener(R.id.delete, new SwipeLayout.OnRevealListener() {
             @Override
             public void onReveal(View child, SwipeLayout.DragEdge edge, float fraction, int distance) {
@@ -41,21 +38,6 @@ public class MyActivity extends Activity {
             }
         });
 
-        sample1.getSurfaceView().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Toast.makeText(MyActivity.this, "Click on surface", Toast.LENGTH_SHORT).show();
-                Log.d(MyActivity.class.getName(), "click on surface");
-            }
-        });
-        sample1.getSurfaceView().setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                Toast.makeText(MyActivity.this, "longClick on surface", Toast.LENGTH_SHORT).show();
-                Log.d(MyActivity.class.getName(), "longClick on surface");
-                return true;
-            }
-        });
         sample1.findViewById(R.id.star2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -92,7 +74,7 @@ public class MyActivity extends Activity {
 
         sample2 = (SwipeLayout) findViewById(R.id.sample2);
         sample2.setShowMode(SwipeLayout.ShowMode.LayDown);
-        sample2.addDrag(SwipeLayout.DragEdge.Right, sample2.findViewWithTag("Bottom2"));
+        sample2.setDragEdge(SwipeLayout.DragEdge.Right);
 //        sample2.setShowMode(SwipeLayout.ShowMode.PullOut);
         sample2.findViewById(R.id.star).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -121,17 +103,11 @@ public class MyActivity extends Activity {
                 Toast.makeText(MyActivity.this, "Yo", Toast.LENGTH_SHORT).show();
             }
         });
-        sample2.getSurfaceView().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Toast.makeText(MyActivity.this, "Click on surface", Toast.LENGTH_SHORT).show();
-            }
-        });
 
         //sample3
 
         sample3 = (SwipeLayout) findViewById(R.id.sample3);
-        sample3.addDrag(SwipeLayout.DragEdge.Top, sample3.findViewWithTag("Bottom3"));
+        sample3.setDragEdge(SwipeLayout.DragEdge.Top);
         sample3.addRevealListener(R.id.bottom_wrapper_child1, new SwipeLayout.OnRevealListener() {
             @Override
             public void onReveal(View child, SwipeLayout.DragEdge edge, float fraction, int distance) {
@@ -144,18 +120,12 @@ public class MyActivity extends Activity {
                 child.setBackgroundColor(c);
             }
         });
-        sample3.findViewById(R.id.bottom_wrapper_child1).setOnClickListener(new View.OnClickListener() {
+        sample3.findViewById(R.id.star).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Toast.makeText(MyActivity.this, "Yo!", Toast.LENGTH_SHORT).show();
             }
         });
-        sample3.getSurfaceView().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Toast.makeText(MyActivity.this, "Click on surface", Toast.LENGTH_SHORT).show();
-            }
-        });
 
     }
 

demo/src/main/java/com/daimajia/swipedemo/RecyclerViewExample.java

@@ -2,6 +2,7 @@ package com.daimajia.swipedemo;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;

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

@@ -43,12 +43,6 @@ public class ListViewAdapter extends BaseSwipeAdapter {
                 Toast.makeText(mContext, "DoubleClick", Toast.LENGTH_SHORT).show();
             }
         });
-        v.findViewById(R.id.delete).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Toast.makeText(mContext, "click delete", Toast.LENGTH_SHORT).show();
-            }
-        });
         return v;
     }
 

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

@@ -15,6 +15,7 @@ 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;
@@ -89,7 +90,7 @@ public class RecyclerViewAdapter extends RecyclerSwipeAdapter<RecyclerViewAdapte
         });
         viewHolder.textViewPos.setText((position + 1) + ".");
         viewHolder.textViewData.setText(item);
-        mItemManger.bind(viewHolder.itemView, position);
+        mItemManger.bindView(viewHolder.itemView, position);
     }
 
     @Override

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

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

demo/src/main/res/drawable/dark_gray.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/dark_gray_press" android:state_pressed="true"/>
-    <item android:drawable="@color/dark_gray_press" android:state_focused="true"/>
-    <item android:drawable="@color/dark_gray"/>
-
-</selector>

demo/src/main/res/drawable/red.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/red_press" android:state_pressed="true"/>
-    <item android:drawable="@color/red_press" android:state_focused="true"/>
-    <item android:drawable="@color/red"/>
-
-</selector>

demo/src/main/res/drawable/white.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@android:color/darker_gray" android:state_pressed="true"/>
-    <item android:drawable="@android:color/darker_gray" android:state_focused="true"/>
-    <item android:drawable="@android:color/white"/>
-
-</selector>

demo/src/main/res/layout/listview_item.xml

@@ -36,7 +36,7 @@
             android:layout_width="0dp"
             android:layout_height="40dp"
             android:layout_weight="4"
-            android:background="@drawable/white"
+            android:background="#ffffff"
             android:text="Yes,Delete"
             android:textColor="#FF5534" />
     </LinearLayout>

demo/src/main/res/layout/main.xml

@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <com.daimajia.swipe.SwipeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/godfather"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ImageView
-        android:layout_gravity="left|right|top"
-        android:src="@drawable/bird"
-        android:layout_width="100dp"
-        android:layout_height="100dp" />
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    app:drag_edge="bottom">
     <LinearLayout
-        android:id="@+id/bird_bottom"
-        android:layout_gravity="bottom"
         android:gravity="center"
         android:layout_width="match_parent"
         android:layout_height="match_parent">

demo/src/main/res/layout/sample1.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<com.daimajia.swipe.SwipeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.daimajia.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@drawable/item_selector"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
-    app:clickToClose="true">
+    android:layout_height="80dp">
 
     <LinearLayout
         android:tag="Bottom1"
@@ -21,8 +19,7 @@
             android:text="Archive"
             android:layout_weight="0.5"
             android:gravity="center"
-            android:clickable="true"
-            android:background="@drawable/red"
+            android:background="#FF1300"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
 
@@ -64,7 +61,7 @@
             android:id="@+id/trash2"
             android:src="@drawable/trash"
             android:layout_width="70dp"
-            android:background="@drawable/red"
+            android:background="#FF3B30"
             android:paddingLeft="25dp"
             android:paddingRight="25dp"
             android:layout_height="match_parent" />
@@ -77,8 +74,7 @@
         android:layout_height="match_parent">
         <RelativeLayout
             android:id="@+id/bottom_wrapper_child1"
-            android:background="@drawable/dark_gray"
-            android:clickable="true"
+            android:background="#4C535B"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
@@ -91,12 +87,17 @@
         </RelativeLayout>
     </LinearLayout>
 
-    <TextView
+    <LinearLayout
         android:padding="10dp"
-        android:background="@drawable/white"
-        android:tag="Hover"
-        android:text="要有最樸素的生活和最遙遠的夢想，即使明天天寒地凍，山高水遠，路遠馬亡。"
+        android:background="#ffffff"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
+
+        <TextView
+            android:tag="Hover"
+            android:text="要有最樸素的生活和最遙遠的夢想，即使明天天寒地凍，山高水遠，路遠馬亡。"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
 
 </com.daimajia.swipe.SwipeLayout>

demo/src/main/res/layout/sample2.xml

@@ -26,7 +26,7 @@
             android:id="@+id/trash"
             android:src="@drawable/trash"
             android:layout_width="70dp"
-            android:background="@drawable/red"
+            android:background="#FF3B30"
             android:paddingLeft="25dp"
             android:paddingRight="25dp"
             android:layout_height="match_parent" />
@@ -35,7 +35,7 @@
     <LinearLayout
         android:padding="10dp"
         android:orientation="vertical"
-        android:background="@drawable/white"
+        android:background="#ffffff"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <TextView

demo/src/main/res/layout/sample3.xml

@@ -22,11 +22,15 @@
         </RelativeLayout>
     </LinearLayout>
 
-    <TextView
+    <LinearLayout
         android:padding="10dp"
         android:background="#ffffff"
-        android:tag="Hover"
-        android:text="None is of freedom or of life deserving unless he daily conquers it anew. "
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
+        <TextView
+            android:tag="Hover"
+            android:text="None is of freedom or of life deserving unless he daily conquers it anew. "
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
 </com.daimajia.swipe.SwipeLayout>

demo/src/main/res/values/colors.xml

@@ -2,8 +2,4 @@
 <resources>
     <color name="backgroundColor">#E8E8E0</color>
     <color name="backgroundColorPress">#DBDBD3</color>
-    <color name="red">#FF3B00</color>
-    <color name="red_press">#990000</color>
-    <color name="dark_gray">#4C535B</color>
-    <color name="dark_gray_press">#ff7e8a97</color>
 </resources>

gradle.properties

@@ -18,11 +18,11 @@
 # org.gradle.parallel=true
 
 
-VERSION_NAME=1.2.0
-VERSION_CODE=22
+VERSION_NAME=1.1.8
+VERSION_CODE=20
 GROUP=com.daimajia.swipelayout
 
-ANDROID_BUILD_MIN_SDK_VERSION=9
-ANDROID_BUILD_TARGET_SDK_VERSION=25
-ANDROID_BUILD_SDK_VERSION=25
-ANDROID_BUILD_TOOLS_VERSION=25.0.2
+ANDROID_BUILD_MIN_SDK_VERSION=8
+ANDROID_BUILD_TARGET_SDK_VERSION=21
+ANDROID_BUILD_SDK_VERSION=21
+ANDROID_BUILD_TOOLS_VERSION=21.0.0

gradle/wrapper/gradle-wrapper.properties

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

library/build.gradle

@@ -5,22 +5,13 @@ android {
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 8
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
     }
 }
 
 dependencies {
-    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
+    compile 'com.android.support:recyclerview-v7:21.0.0'
+    compile 'com.android.support:support-v4:21.0.3'
 }
+apply from: './gradle-mvn-push.gradle'

library/src/main/AndroidManifest.xml

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

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

@@ -6,6 +6,7 @@ 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;
@@ -13,9 +14,9 @@ import com.daimajia.swipe.util.Attributes;
 
 import java.util.List;
 
-public abstract class ArraySwipeAdapter<T> extends ArrayAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
+public abstract class ArraySwipeAdapter<T> extends ArrayAdapter implements SwipeItemMangerInterface,SwipeAdapterInterface {
 
-    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
+    private SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
     {}
     public ArraySwipeAdapter(Context context, int resource) {
         super(context, resource);
@@ -41,15 +42,15 @@ public abstract class ArraySwipeAdapter<T> extends ArrayAdapter implements Swipe
         super(context, resource, textViewResourceId, objects);
     }
 
-    @Override
-    public void notifyDatasetChanged() {
-        super.notifyDataSetChanged();
-    }
-
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
+        boolean convertViewIsNull = convertView == null;
         View v = super.getView(position, convertView, parent);
-        mItemManger.bind(v, position);
+        if(convertViewIsNull){
+            mItemManger.initialize(v, position);
+        }else{
+            mItemManger.updateConvertView(v, position);
+        }
         return v;
     }
 

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

@@ -5,8 +5,9 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemMangerImpl;
+import com.daimajia.swipe.implments.SwipeItemAdapterMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
+import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
 
@@ -14,7 +15,7 @@ import java.util.List;
 
 public abstract class BaseSwipeAdapter extends BaseAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    protected SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
+    protected SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
 
     /**
      * return the {@link com.daimajia.swipe.SwipeLayout} resource id, int the view item.
@@ -41,19 +42,16 @@ 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,8 +7,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.daimajia.swipe.SwipeLayout;
-import com.daimajia.swipe.implments.SwipeItemMangerImpl;
+import com.daimajia.swipe.implments.SwipeItemAdapterMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeAdapterInterface;
+import com.daimajia.swipe.implments.SwipeItemMangerImpl;
 import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
 
@@ -16,7 +17,7 @@ import java.util.List;
 
 public abstract class CursorSwipeAdapter extends CursorAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
+    private SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
 
     protected CursorSwipeAdapter(Context context, Cursor c, boolean autoRequery) {
         super(context, c, autoRequery);
@@ -28,8 +29,13 @@ 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);
-        mItemManger.bind(v, position);
+        if(convertViewIsNull){
+            mItemManger.initialize(v, position);
+        }else{
+            mItemManger.updateConvertView(v, position);
+        }
         return v;
     }
 
@@ -48,11 +54,6 @@ 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.SwipeItemMangerImpl;
+import com.daimajia.swipe.implments.SwipeItemRecyclerMangerImpl;
 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 SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
+    public SwipeItemRecyclerMangerImpl mItemManger = new SwipeItemRecyclerMangerImpl(this);
 
     @Override
     public abstract VH onCreateViewHolder(ViewGroup parent, int viewType);
@@ -21,11 +21,6 @@ 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,6 +7,7 @@ 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;
@@ -16,7 +17,7 @@ import java.util.List;
 
 public abstract class SimpleCursorSwipeAdapter extends SimpleCursorAdapter implements SwipeItemMangerInterface, SwipeAdapterInterface {
 
-    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
+    private SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
 
     protected SimpleCursorSwipeAdapter(Context context, int layout, Cursor c, String[] from, int[] to, int flags) {
         super(context, layout, c, from, to, flags);
@@ -28,8 +29,13 @@ 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);
-        mItemManger.bind(v, position);
+        if(convertViewIsNull){
+            mItemManger.initialize(v, position);
+        }else{
+            mItemManger.updateConvertView(v, position);
+        }
         return v;
     }
 

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

@@ -0,0 +1,66 @@
+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,6 +1,8 @@
 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;
@@ -9,7 +11,7 @@ import com.daimajia.swipe.interfaces.SwipeItemMangerInterface;
 import com.daimajia.swipe.util.Attributes;
 
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -17,7 +19,7 @@ import java.util.Set;
 /**
  * SwipeItemMangerImpl is a helper class to help all the adapters to maintain open status.
  */
-public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
+public abstract class SwipeItemMangerImpl implements SwipeItemMangerInterface {
 
     private Attributes.Mode mode = Attributes.Mode.Single;
     public final int INVALID_POSITION = -1;
@@ -27,13 +29,27 @@ public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
     protected Set<Integer> mOpenPositions = new HashSet<Integer>();
     protected Set<SwipeLayout> mShownLayouts = new HashSet<SwipeLayout>();
 
-    protected SwipeAdapterInterface swipeAdapterInterface;
+    protected BaseAdapter mBaseAdapter;
+    protected RecyclerView.Adapter mRecyclerAdapter;
 
-    public SwipeItemMangerImpl(SwipeAdapterInterface swipeAdapterInterface) {
-        if (swipeAdapterInterface == null)
-            throw new IllegalArgumentException("SwipeAdapterInterface can not be null");
+    public SwipeItemMangerImpl(BaseAdapter adapter) {
+        if (adapter == null)
+            throw new IllegalArgumentException("Adapter can not be null");
 
-        this.swipeAdapterInterface = swipeAdapterInterface;
+        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;
     }
 
     public Attributes.Mode getMode() {
@@ -47,24 +63,21 @@ public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
         mOpenPosition = INVALID_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");
+    /* initialize and updateConvertView used for AdapterManagerImpl */
+    public abstract void initialize(View target, int 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);
+    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);
         } else {
-            ValueBox valueBox = (ValueBox) swipeLayout.getTag(resId);
-            valueBox.swipeMemory.setPosition(position);
-            valueBox.onLayoutListener.setPosition(position);
-            valueBox.position = position;
+            return -1;
         }
     }
 
@@ -76,7 +89,11 @@ public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
         } else {
             mOpenPosition = position;
         }
-        swipeAdapterInterface.notifyDatasetChanged();
+        if (mBaseAdapter != null) {
+            mBaseAdapter.notifyDataSetChanged();
+        } else if (mRecyclerAdapter != null) {
+            mRecyclerAdapter.notifyDataSetChanged();
+        }
     }
 
     @Override
@@ -87,7 +104,11 @@ public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
             if (mOpenPosition == position)
                 mOpenPosition = INVALID_POSITION;
         }
-        swipeAdapterInterface.notifyDatasetChanged();
+        if (mBaseAdapter != null) {
+            mBaseAdapter.notifyDataSetChanged();
+        } else if (mRecyclerAdapter != null) {
+            mRecyclerAdapter.notifyDataSetChanged();
+        }
     }
 
     @Override
@@ -120,7 +141,7 @@ public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
         if (mode == Attributes.Mode.Multiple) {
             return new ArrayList<Integer>(mOpenPositions);
         } else {
-            return Collections.singletonList(mOpenPosition);
+            return Arrays.asList(mOpenPosition);
         }
     }
 

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

@@ -0,0 +1,63 @@
+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,9 +1,5 @@
 package com.daimajia.swipe.interfaces;
 
 public interface SwipeAdapterInterface {
-
-    int getSwipeLayoutResourceId(int position);
-
-    void notifyDatasetChanged();
-
+    public int getSwipeLayoutResourceId(int position);
 }

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

@@ -1,29 +1,30 @@
 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 {
 
-    void openItem(int position);
+    public void openItem(int position);
 
-    void closeItem(int position);
+    public void closeItem(int position);
 
-    void closeAllExcept(SwipeLayout layout);
+    public void closeAllExcept(SwipeLayout layout);
     
-    void closeAllItems();
+    public void closeAllItems();
 
-    List<Integer> getOpenItems();
+    public List<Integer> getOpenItems();
 
-    List<SwipeLayout> getOpenLayouts();
+    public List<SwipeLayout> getOpenLayouts();
 
-    void removeShownLayouts(SwipeLayout layout);
+    public void removeShownLayouts(SwipeLayout layout);
 
-    boolean isOpen(int position);
+    public boolean isOpen(int position);
 
-    Attributes.Mode getMode();
+    public Attributes.Mode getMode();
 
-    void setMode(Attributes.Mode mode);
+    public void setMode(Attributes.Mode mode);
 }

library/src/main/res/values/attrs.xml

@@ -15,6 +15,5 @@
             <enum name="lay_down" value="0" />
             <enum name="pull_out" value="1" />
         </attr>
-        <attr name="clickToClose" format="boolean" />
     </declare-styleable>
 </resources>