Merge pull request daimajia#145 from jivesoftware/master

Refactor SwipeItemManager code to decouple it from adapter converns

Author: daimajia

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

@@ -15,7 +15,6 @@
 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 void onClick(View view) {
         });
         viewHolder.textViewPos.setText((position + 1) + ".");
         viewHolder.textViewData.setText(item);
-        mItemManger.bindView(viewHolder.itemView, position);
+        mItemManger.bind(viewHolder.itemView, position);
     }
 
     @Override

library/build.gradle

@@ -12,6 +12,6 @@ android {
 
 dependencies {
     compile 'com.android.support:recyclerview-v7:21.0.0'
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:support-v4:22.1.1'
 }
 apply from: './gradle-mvn-push.gradle'

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

@@ -6,17 +6,16 @@
 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;
 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 SwipeItemAdapterMangerImpl mItemManger = new SwipeItemAdapterMangerImpl(this);
+    private SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
     {}
     public ArraySwipeAdapter(Context context, int resource) {
         super(context, resource);
@@ -42,15 +41,15 @@ public ArraySwipeAdapter(Context context, int resource, int textViewResourceId,
         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);
-        if(convertViewIsNull){
-            mItemManger.initialize(v, position);
-        }else{
-            mItemManger.updateConvertView(v, position);
-        }
+        mItemManger.bind(v, position);
         return v;
     }
 

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

@@ -5,17 +5,16 @@
 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;
 
 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,17 +7,16 @@
 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;
 
 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 @@ protected CursorSwipeAdapter(Context context, Cursor c, int flags) {
 
     @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 void closeAllExcept(SwipeLayout layout) {
         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.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,14 +13,19 @@
 
 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);
 
     @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.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 @@
 
 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 @@ protected SimpleCursorSwipeAdapter(Context context, int layout, Cursor c, String
 
     @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;
     }