Merge branch 'pr/n36_quazardous' into dev

nhaarman · Oct 13, 2013 · 005f0d2 · 005f0d2
2 parents 71ac2b8 + c1468da
commit 005f0d2
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 55 deletions.
diff --git a/library/project.properties b/library/project.properties
@@ -13,3 +13,4 @@
 # Project target.
 target=android-18
 android.library=true
+android.library.reference.1=../../../workspace/android-support-v7-appcompat
diff --git a/library/src/com/haarman/listviewanimations/ArrayAdapter.java b/library/src/com/haarman/listviewanimations/ArrayAdapter.java
@@ -20,18 +20,18 @@
 import java.util.Collections;
 import java.util.List;
 
+import android.widget.BaseAdapter;
+
 import com.haarman.listviewanimations.view.DynamicListView;
 import com.haarman.listviewanimations.view.DynamicListView.Swappable;
 
-import android.widget.BaseAdapter;
-
 /**
  * A true {@link ArrayList} adapter providing access to all ArrayList methods.
  * Also implements {@link Swappable} for easy item swapping.
  */
 public abstract class ArrayAdapter<T> extends BaseAdapter implements DynamicListView.Swappable {
 
-	private List<T> mItems;
+	protected List<T> mItems;
 
 	/**
 	 * Creates a new ArrayAdapter with an empty list.
@@ -44,12 +44,14 @@ public ArrayAdapter() {
 	 * Creates a new {@link ArrayAdapter} with a <b>copy</b> of the specified
 	 * list, or an empty list if items == null.
 	 */
+
 	public ArrayAdapter(List<T> items) {
 		mItems = new ArrayList<T>();
 		if (items != null) {
 			mItems.addAll(items);
 		}
 	}
+
 
 	@Override
 	public int getCount() {
@@ -203,4 +205,18 @@ public void swapItems(int positionOne, int positionTwo) {
 		set(positionOne, getItem(positionTwo));
 		set(positionTwo, temp);
 	}
+
+	private BaseAdapter mDataSetChangedSlavedAdapter;
+
+	public void propagateNotifyDataSetChanged(BaseAdapter slavedAdapter) {
+		mDataSetChangedSlavedAdapter = slavedAdapter;
+	}
+
+	@Override
+	public void notifyDataSetChanged() {
+		super.notifyDataSetChanged();
+		if (mDataSetChangedSlavedAdapter != null) {
+			mDataSetChangedSlavedAdapter.notifyDataSetChanged();
+		}
+	}
 }
diff --git a/library/src/com/haarman/listviewanimations/BaseAdapterDecorator.java b/library/src/com/haarman/listviewanimations/BaseAdapterDecorator.java
@@ -120,7 +120,22 @@ public boolean isEnabled(int position) {
 
 	@Override
 	public void notifyDataSetChanged() {
-		mDecoratedBaseAdapter.notifyDataSetChanged();
+		if (!(mDecoratedBaseAdapter instanceof ArrayAdapter<?>)) {
+			// fix #35 dirty trick !
+			// leads to an infinite loop when trying because ArrayAdapter triggers notifyDataSetChanged itself
+			mDecoratedBaseAdapter.notifyDataSetChanged();
+		}
+	}
+
+	/**
+	 * Helper function if you want to force notifyDataSetChanged()
+	 * @param force
+	 */
+	public void notifyDataSetChanged(Boolean force) {
+		if ((force) || (!(mDecoratedBaseAdapter instanceof ArrayAdapter<?>))) {
+			// leads to an infinite loop when trying because ArrayAdapter triggers notifyDataSetChanged itself
+			mDecoratedBaseAdapter.notifyDataSetChanged();
+		}
 	}
 
 	@Override

diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissAdapter.java b/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissAdapter.java
@@ -18,6 +18,7 @@
 import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 
+import com.haarman.listviewanimations.ArrayAdapter;
 import com.haarman.listviewanimations.BaseAdapterDecorator;
 
 /**
@@ -26,18 +27,40 @@
  */
 public class SwipeDismissAdapter extends BaseAdapterDecorator {
 
-	private OnDismissCallback mCallback;
-	private SwipeDismissListViewTouchListener mSwipeDismissListViewTouchListener;
+	protected OnDismissCallback mCallback;
+	protected SwipeDismissListViewTouchListener mSwipeDismissListViewTouchListener;
 
+	protected SwipeOnScrollListener mOnScroll;
+
 	public SwipeDismissAdapter(BaseAdapter baseAdapter, OnDismissCallback callback) {
+		// add a default OnScrollListener
+		this(baseAdapter, callback, new SwipeOnScrollListener());
+	}
+
+	public SwipeDismissAdapter(BaseAdapter baseAdapter, OnDismissCallback callback, SwipeOnScrollListener onScroll) {
 		super(baseAdapter);
 		mCallback = callback;
+		mOnScroll = onScroll;
 	}
-
+
+	/**
+	 * Override-able 
+	 * @param listView
+	 * @return SwipeDismissListViewTouchListener
+	 */
+	protected SwipeDismissListViewTouchListener createListViewTouchListener(AbsListView listView) {
+		return new SwipeDismissListViewTouchListener(listView, mCallback, mOnScroll);
+	}
+
 	@Override
 	public void setAbsListView(AbsListView listView) {
 		super.setAbsListView(listView);
-		mSwipeDismissListViewTouchListener = new SwipeDismissListViewTouchListener(listView, mCallback);
+		if (mDecoratedBaseAdapter instanceof ArrayAdapter<?>) {
+			// fix #35 dirty trick !
+			// if ArrayAdapter we assume that items manipulation will come from it
+			((ArrayAdapter<?>)mDecoratedBaseAdapter).propagateNotifyDataSetChanged(this);
+		}
+		mSwipeDismissListViewTouchListener = createListViewTouchListener(listView);
 		mSwipeDismissListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer());
 		mSwipeDismissListViewTouchListener.setTouchChild(getTouchChild());
 		listView.setOnTouchListener(mSwipeDismissListViewTouchListener);
@@ -54,7 +77,9 @@ public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrol
 	@Override
 	public void notifyDataSetChanged() {
 		super.notifyDataSetChanged();
-		mSwipeDismissListViewTouchListener.notifyDataSetChanged();
+		if (mSwipeDismissListViewTouchListener != null) {
+			mSwipeDismissListViewTouchListener.notifyDataSetChanged();
+		}
 	}
 
 	@Override