diff --git a/.gitignore b/.gitignore
index e0b45ef7..dba5cc47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,5 @@ example/proguard-project.txt
 *proguard-project.txt
 
 .gradle/
+gradle/*
+gradlew*
diff --git a/ListViewAnimationsExample.apk b/ListViewAnimationsExample.apk
index 03efb3ed..ae38cba2 100644
Binary files a/ListViewAnimationsExample.apk and b/ListViewAnimationsExample.apk differ
diff --git a/README.md b/README.md
index 913ef583..ead66a33 100644
--- a/README.md
+++ b/README.md
@@ -49,11 +49,13 @@ Setup
 Add the following to your `build.gradle`:
 
 	repositories {
+		<!-- repostart -->
+		<!-- repoend -->
 		mavenCentral()
 	}
 	
 	dependencies{
-		compile 'com.nhaarman.listviewanimations:library:2.5.2'
+		compile 'com.nhaarman.listviewanimations:library:2.6.0'
 	}
 
 **Or**:
@@ -63,7 +65,7 @@ Add the following to your `pom.xml`:
 	<dependency>
 		<groupId>com.nhaarman.listviewanimations</groupId>
 		<artifactId>library</artifactId>
-		<version>2.5.2</version>
+		<version>2.6.0</version>
 	</dependency>
 	
 Usage
@@ -105,7 +107,7 @@ License
  [1]: https://play.google.com/store/apps/details?id=com.haarman.listviewanimations
  [2]: http://nineoldandroids.com/
  [3]: http://en.wikipedia.org/wiki/Decorator_pattern
- [4]: https://github.com/nhaarman/ListViewAnimations/blob/master/com.haarman.listviewanimations-2.5.2.jar?raw=true
+ [4]: https://github.com/nhaarman/ListViewAnimations/blob/master/com.haarman.listviewanimations-2.6.0.jar?raw=true
  [5]: https://gist.github.com/romannurik/2980593
  [6]: https://play.google.com/store/apps/details?id=com.haarman.treinverkeer
  [7]: https://www.twitter.com/niekfct
@@ -123,3 +125,5 @@ License
  [20]: https://play.google.com/store/apps/details?id=com.cafetaso.foodinfo
  [21]: https://play.google.com/store/apps/details?id=sa.voorleesVerhaaltjes
  [22]: https://play.google.com/store/apps/details?id=com.seedform.counter
+
+ <!-- versionName="2.6.0" -->
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index de08a015..0fe6e91c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,23 @@
+import java.util.regex.Pattern
+
 buildscript {
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.1+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
 
+def isReleaseBuild() {
+    println version
+    return version.contains("SNAPSHOT") == false
+}
+
 allprojects {
-    group = 'com.haarman.listviewanimations'
+    group = 'com.nhaarman.listviewanimations'
+    version = VERSION_NAME
 
     repositories {
         mavenCentral()
@@ -19,3 +27,61 @@ allprojects {
         options.encoding = 'UTF-8'
     }
 }
+
+
+task('increaseVersionCode') << {
+    def files = new File[2];
+    files[0] = file("library/AndroidManifest.xml")
+    files[1] = file("example/AndroidManifest.xml")
+    def pattern = Pattern.compile("versionCode=\"(\\d+)\"")
+    for (int i = 0; i < files.length; ++i) {
+        def manifestText = files[i].getText()
+        def matcher = pattern.matcher(manifestText)
+        matcher.find()
+        def currentVersionCode = Long.parseLong(matcher.group(1));
+        def versionCode = Long.parseLong(new Date().format('yyyyMMdd') + "1")
+        while (versionCode <= currentVersionCode) {
+            ++versionCode
+        }
+        println(versionCode)
+        def manifestContent = matcher.replaceAll("versionCode=\"" + versionCode + "\"")
+        files[i].write(manifestContent)
+    }
+}
+
+task('syncVersionName') << {
+    def manifestFiles = new File[2];
+    manifestFiles[0] = file("library/AndroidManifest.xml")
+    manifestFiles[1] = file("example/AndroidManifest.xml")
+    def pattern = Pattern.compile("versionName=\"(.+)\"")
+    for (int i = 0; i < manifestFiles.length; ++i) {
+        def manifestText = manifestFiles[i].getText()
+        def matcher = pattern.matcher(manifestText)
+        matcher.find()
+        def manifestContent = matcher.replaceAll("versionName=\"" + version + "\"")
+        manifestFiles[i].write(manifestContent)
+    }
+
+    def readmeFile = file("README.md")
+    def readmeText = readmeFile.getText()
+    def matcher = pattern.matcher(readmeText)
+    matcher.find()
+    def previousVersion = matcher.group(1)
+    def readmeContent = readmeText.replaceAll(previousVersion, version)
+
+    pattern = Pattern.compile("repostart -->(.+)<!-- repoend", Pattern.DOTALL)
+    matcher = pattern.matcher(readmeContent)
+    matcher.find()
+    def repo = isReleaseBuild() ? "\n\t\t" : "\n\t\tmaven {\n\t\t\turl \"https://oss.sonatype.org/content/repositories/snapshots\"\n\t\t}\n\t\t";
+    readmeContent = matcher.replaceAll("repostart -->" + repo + "<!-- repoend")
+
+    readmeFile.write(readmeContent)
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name == 'generateReleaseBuildConfig') {
+        task.dependsOn 'increaseVersionCode'
+    }
+}
+
+apply plugin: 'android-reporting'
\ No newline at end of file
diff --git a/com.haarman.listviewanimations-2.5.2.jar b/com.haarman.listviewanimations-2.5.2.jar
deleted file mode 100644
index 121fe025..00000000
Binary files a/com.haarman.listviewanimations-2.5.2.jar and /dev/null differ
diff --git a/com.haarman.listviewanimations-2.6.0.jar b/com.haarman.listviewanimations-2.6.0.jar
new file mode 100644
index 00000000..e8501030
Binary files /dev/null and b/com.haarman.listviewanimations-2.6.0.jar differ
diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
index fb302511..83754c78 100644
--- a/example/AndroidManifest.xml
+++ b/example/AndroidManifest.xml
@@ -1,11 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.haarman.listviewanimations"
-    android:versionCode="201311071"
-    android:versionName="2.5.2" >
+    package="com.haarman.listviewanimations">
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
 
     <uses-permission android:name="com.android.vending.BILLING" />
 
@@ -13,8 +8,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity android:name="com.haarman.listviewanimations.MainActivity" >
+        android:theme="@style/AppTheme">
+        <activity android:name="com.haarman.listviewanimations.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -39,6 +34,9 @@
         <activity
             android:name="com.haarman.listviewanimations.itemmanipulationexamples.AnimateDismissActivity"
             android:label="@string/animateremoval" />
+        <activity
+            android:name="com.haarman.listviewanimations.itemmanipulationexamples.AnimateAdditionActivity"
+            android:label="@string/animateaddition" />
         <activity
             android:name="com.haarman.listviewanimations.GridViewActivity"
             android:label="@string/gridviewexample" />
diff --git a/example/build.gradle b/example/build.gradle
index c4592a33..394b3582 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'android'
 
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
-    compile 'com.android.support:appcompat-v7:18.0.+'
+    compile 'com.android.support:appcompat-v7:19.0.+'
     compile project(":library")
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion '18.0.1'
+    compileSdkVersion 19
+    buildToolsVersion '19.0.1'
 
     sourceSets {
         main {
@@ -19,4 +18,38 @@ android {
             assets.srcDirs = ['assets']
         }
     }
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 19
+        versionName project.VERSION_NAME
+        versionCode Integer.parseInt(new Date().format('yyyyMMddHH'))
+    }
+
+    signingConfigs {
+        debug {
+            storeFile file(System.getProperty("user.home") + "/.android/debug.keystore")
+        }
+
+        release {
+            storeFile file(System.getProperty("user.home") + "/.android/nhaarman.keystore")
+            storePassword nhaarman_lva_storePassword
+            keyAlias nhaarman_lva_keyAlias
+            keyPassword nhaarman_lva_keyPassword
+        }
+    }
+
+    buildTypes {
+
+        debug {
+            debuggable true
+            signingConfig signingConfigs.debug
+        }
+
+        release {
+            debuggable false
+            signingConfig signingConfigs.release
+        }
+
+    }
 }
diff --git a/example/libs/android-support-v4.jar b/example/libs/android-support-v4.jar
index cf12d283..9056828a 100644
Binary files a/example/libs/android-support-v4.jar and b/example/libs/android-support-v4.jar differ
diff --git a/example/res/layout/activity_draganddrop.xml b/example/res/layout/activity_draganddrop.xml
index 8ded6356..0aace78c 100644
--- a/example/res/layout/activity_draganddrop.xml
+++ b/example/res/layout/activity_draganddrop.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <com.haarman.listviewanimations.view.DynamicListView
+    <com.nhaarman.listviewanimations.widget.DynamicListView
         android:id="@+id/activity_draganddrop_listview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/example/res/layout/activity_examples_itemmanipulations.xml b/example/res/layout/activity_examples_itemmanipulations.xml
index 1dc2517a..50832c31 100644
--- a/example/res/layout/activity_examples_itemmanipulations.xml
+++ b/example/res/layout/activity_examples_itemmanipulations.xml
@@ -37,6 +37,13 @@
             android:onClick="onAnimateRemovalClicked"
             android:text="@string/animateremoval" />
 
+        <Button
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:onClick="onAnimateAdditionClicked"
+            android:text="@string/animateaddition" />
+
         <Button
             android:layout_width="150dp"
             android:layout_height="wrap_content"
diff --git a/example/res/layout/activity_expandablelistitem_card.xml b/example/res/layout/activity_expandablelistitem_card.xml
index 8852e34f..60f80aa8 100644
--- a/example/res/layout/activity_expandablelistitem_card.xml
+++ b/example/res/layout/activity_expandablelistitem_card.xml
@@ -15,6 +15,6 @@
         android:id="@+id/activity_expandablelistitem_card_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp" />
+        android:paddingTop="4dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/example/res/values/strings.xml b/example/res/values/strings.xml
index f50dc484..df1f4b18 100644
--- a/example/res/values/strings.xml
+++ b/example/res/values/strings.xml
@@ -16,6 +16,7 @@
     <string name="draganddrop">Drag and Drop</string>
     <string name="swipedismiss">Swipe to dismiss</string>
     <string name="animateremoval">Animate dismiss</string>
+    <string name="animateaddition">Animate addition</string>
     <string name="removeselected">Remove selected</string>
     <string name="expandablelistitemadapter">Expand list items</string>
     <string name="itemdeleted">Item deleted</string>
diff --git a/example/src/com/haarman/listviewanimations/BaseActivity.java b/example/src/com/haarman/listviewanimations/BaseActivity.java
index cad98d47..42d688e7 100644
--- a/example/src/com/haarman/listviewanimations/BaseActivity.java
+++ b/example/src/com/haarman/listviewanimations/BaseActivity.java
@@ -10,8 +10,8 @@ public class BaseActivity extends ActionBarActivity {
 
 	@SuppressLint("InlinedApi")
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		if (Build.VERSION.SDK_INT >= 19) {
+	protected void onCreate(final Bundle savedInstanceState) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
 		}
 		super.onCreate(savedInstanceState);
@@ -19,7 +19,7 @@ protected void onCreate(Bundle savedInstanceState) {
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
+	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch (item.getItemId()) {
 		case android.R.id.home:
 			finish();
diff --git a/example/src/com/haarman/listviewanimations/GoogleCardsActivity.java b/example/src/com/haarman/listviewanimations/GoogleCardsActivity.java
index 4cc2581c..42567a3a 100644
--- a/example/src/com/haarman/listviewanimations/GoogleCardsActivity.java
+++ b/example/src/com/haarman/listviewanimations/GoogleCardsActivity.java
@@ -30,16 +30,17 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.haarman.listviewanimations.itemmanipulation.OnDismissCallback;
-import com.haarman.listviewanimations.itemmanipulation.SwipeDismissAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.SwingBottomInAnimationAdapter;
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.OnDismissCallback;
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeDismissAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.SwingBottomInAnimationAdapter;
 
 public class GoogleCardsActivity extends BaseActivity implements OnDismissCallback {
 
 	private GoogleCardsAdapter mGoogleCardsAdapter;
 
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_googlecards);
 
@@ -64,7 +65,7 @@ private ArrayList<Integer> getItems() {
 	}
 
 	@Override
-	public void onDismiss(AbsListView listView, int[] reverseSortedPositions) {
+	public void onDismiss(final AbsListView listView, final int[] reverseSortedPositions) {
 		for (int position : reverseSortedPositions) {
 			mGoogleCardsAdapter.remove(position);
 		}
@@ -72,19 +73,16 @@ public void onDismiss(AbsListView listView, int[] reverseSortedPositions) {
 
 	private static class GoogleCardsAdapter extends ArrayAdapter<Integer> {
 
-		private Context mContext;
-		private LruCache<Integer, Bitmap> mMemoryCache;
+		private final Context mContext;
+		private final LruCache<Integer, Bitmap> mMemoryCache;
 
-		public GoogleCardsAdapter(Context context) {
+		public GoogleCardsAdapter(final Context context) {
 			mContext = context;
 
-			final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
-
-			// Use 1/8th of the available memory for this memory cache.
-			final int cacheSize = maxMemory;
+			final int cacheSize = (int) (Runtime.getRuntime().maxMemory() / 1024);
 			mMemoryCache = new LruCache<Integer, Bitmap>(cacheSize) {
 				@Override
-				protected int sizeOf(Integer key, Bitmap bitmap) {
+				protected int sizeOf(final Integer key, final Bitmap bitmap) {
 					// The cache size will be measured in kilobytes rather than
 					// number of items.
 					return bitmap.getRowBytes() * bitmap.getHeight() / 1024;
@@ -93,7 +91,7 @@ protected int sizeOf(Integer key, Bitmap bitmap) {
 		}
 
 		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
+		public View getView(final int position, final View convertView, final ViewGroup parent) {
 			ViewHolder viewHolder;
 			View view = convertView;
 			if (view == null) {
@@ -114,7 +112,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			return view;
 		}
 
-		private void setImageView(ViewHolder viewHolder, int position) {
+		private void setImageView(final ViewHolder viewHolder, final int position) {
 			int imageResId;
 			switch (getItem(position) % 5) {
 			case 0:
@@ -141,13 +139,13 @@ private void setImageView(ViewHolder viewHolder, int position) {
 			viewHolder.imageView.setImageBitmap(bitmap);
 		}
 
-		private void addBitmapToMemoryCache(int key, Bitmap bitmap) {
+		private void addBitmapToMemoryCache(final int key, final Bitmap bitmap) {
 			if (getBitmapFromMemCache(key) == null) {
 				mMemoryCache.put(key, bitmap);
 			}
 		}
 
-		private Bitmap getBitmapFromMemCache(int key) {
+		private Bitmap getBitmapFromMemCache(final int key) {
 			return mMemoryCache.get(key);
 		}
 
diff --git a/example/src/com/haarman/listviewanimations/GridViewActivity.java b/example/src/com/haarman/listviewanimations/GridViewActivity.java
index 5b4f2c02..c5ecbbbc 100644
--- a/example/src/com/haarman/listviewanimations/GridViewActivity.java
+++ b/example/src/com/haarman/listviewanimations/GridViewActivity.java
@@ -15,14 +15,16 @@
 import android.view.ViewGroup;
 import android.widget.GridView;
 import android.widget.ImageView;
-import com.haarman.listviewanimations.swinginadapters.prepared.SwingBottomInAnimationAdapter;
+
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.SwingBottomInAnimationAdapter;
 
 public class GridViewActivity extends ActionBarActivity {
 
 	@SuppressLint("InlinedApi")
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		if (Build.VERSION.SDK_INT >= 19) {
+	protected void onCreate(final Bundle savedInstanceState) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
 		}
 		super.onCreate(savedInstanceState);
@@ -47,19 +49,17 @@ private ArrayList<Integer> getItems() {
 
 	private static class MyAdapter extends ArrayAdapter<Integer> {
 
-		private Context mContext;
-		private LruCache<Integer, Bitmap> mMemoryCache;
+		private final Context mContext;
+		private final LruCache<Integer, Bitmap> mMemoryCache;
 
-		public MyAdapter(Context context, List<Integer> list) {
+		public MyAdapter(final Context context, final List<Integer> list) {
 			super(list);
 			mContext = context;
-			final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
 
-			// Use 1/8th of the available memory for this memory cache.
-			final int cacheSize = maxMemory;
+			final int cacheSize = (int) (Runtime.getRuntime().maxMemory() / 1024);
 			mMemoryCache = new LruCache<Integer, Bitmap>(cacheSize) {
 				@Override
-				protected int sizeOf(Integer key, Bitmap bitmap) {
+				protected int sizeOf(final Integer key, final Bitmap bitmap) {
 					// The cache size will be measured in kilobytes rather than
 					// number of items.
 					return bitmap.getRowBytes() * bitmap.getHeight() / 1024;
@@ -68,7 +68,7 @@ protected int sizeOf(Integer key, Bitmap bitmap) {
 		}
 
 		@Override
-		public View getView(int position, View convertView, ViewGroup viewGroup) {
+		public View getView(final int position, final View convertView, final ViewGroup viewGroup) {
 			ImageView imageView = (ImageView) convertView;
 
 			if (imageView == null) {
@@ -104,19 +104,19 @@ public View getView(int position, View convertView, ViewGroup viewGroup) {
 			return imageView;
 		}
 
-		private void addBitmapToMemoryCache(int key, Bitmap bitmap) {
+		private void addBitmapToMemoryCache(final int key, final Bitmap bitmap) {
 			if (getBitmapFromMemCache(key) == null) {
 				mMemoryCache.put(key, bitmap);
 			}
 		}
 
-		private Bitmap getBitmapFromMemCache(int key) {
+		private Bitmap getBitmapFromMemCache(final int key) {
 			return mMemoryCache.get(key);
 		}
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
+	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch (item.getItemId()) {
 		case android.R.id.home:
 			finish();
diff --git a/example/src/com/haarman/listviewanimations/MainActivity.java b/example/src/com/haarman/listviewanimations/MainActivity.java
index 2d2be850..32000817 100644
--- a/example/src/com/haarman/listviewanimations/MainActivity.java
+++ b/example/src/com/haarman/listviewanimations/MainActivity.java
@@ -46,8 +46,8 @@ public class MainActivity extends Activity {
 
 	@SuppressLint("InlinedApi")
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		if (Build.VERSION.SDK_INT >= 19) {
+	protected void onCreate(final Bundle savedInstanceState) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
 		}
 
@@ -58,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
 	}
 
 	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
+	public boolean onCreateOptionsMenu(final Menu menu) {
 		getMenuInflater().inflate(R.menu.menu_main, menu);
 
 		menu.findItem(R.id.menu_main_donate).setVisible(mService != null);
@@ -67,7 +67,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
+	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch (item.getItemId()) {
 		case R.id.menu_main_github:
 			Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -91,37 +91,37 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		return super.onOptionsItemSelected(item);
 	}
 
-	public void onGoogleCardsExampleClicked(View view) {
+	public void onGoogleCardsExampleClicked(final View view) {
 		Intent intent = new Intent(this, GoogleCardsActivity.class);
 		startActivity(intent);
 	}
 
-	public void onGridViewExampleClicked(View view) {
+	public void onGridViewExampleClicked(final View view) {
 		Intent intent = new Intent(this, GridViewActivity.class);
 		startActivity(intent);
 	}
 
-	public void onAppearanceClicked(View view) {
+	public void onAppearanceClicked(final View view) {
 		Intent intent = new Intent(this, AppearanceExamplesActivity.class);
 		startActivity(intent);
 	}
 
-	public void onItemManipulationClicked(View view) {
+	public void onItemManipulationClicked(final View view) {
 		Intent intent = new Intent(this, ItemManipulationsExamplesActivity.class);
 		startActivity(intent);
 	}
 
 	private IInAppBillingService mService;
 
-	private ServiceConnection mServiceConn = new ServiceConnection() {
+	private final ServiceConnection mServiceConn = new ServiceConnection() {
 		@Override
-		public void onServiceDisconnected(ComponentName name) {
+		public void onServiceDisconnected(final ComponentName name) {
 			mService = null;
 			//			supportInvalidateOptionsMenu();
 		}
 
 		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
+		public void onServiceConnected(final ComponentName name, final IBinder service) {
 			mService = IInAppBillingService.Stub.asInterface(service);
 			//			supportInvalidateOptionsMenu();
 
@@ -137,11 +137,10 @@ public void run() {
 							ArrayList<String> purchaseDataList = ownedItems.getStringArrayList("INAPP_PURCHASE_DATA_LIST");
 
 							if (purchaseDataList != null) {
-								for (int i = 0; i < purchaseDataList.size(); ++i) {
-									String purchaseData = purchaseDataList.get(i);
-									JSONObject json = new JSONObject(purchaseData);
-									mService.consumePurchase(3, getPackageName(), json.getString("purchaseToken"));
-								}
+                                for (String purchaseData : purchaseDataList) {
+                                    JSONObject json = new JSONObject(purchaseData);
+                                    mService.consumePurchase(3, getPackageName(), json.getString("purchaseToken"));
+                                }
 							}
 						}
 					} catch (RemoteException e) {
@@ -163,7 +162,7 @@ public void onDestroy() {
 	}
 
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
+	protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 
 		if (resultCode == RESULT_OK) {
@@ -187,12 +186,12 @@ public void run() {
 		}
 	}
 
-	private void buy(String sku) {
+	private void buy(final String sku) {
 		try {
 			Bundle buyIntentBundle = mService.getBuyIntent(3, getPackageName(), sku, "inapp", "bGoa+V7g/ysDXvKwqq+JTFn4uQZbPiQJo4pf9RzJ");
 			PendingIntent pendingIntent = buyIntentBundle.getParcelable("BUY_INTENT");
 			if (pendingIntent != null) {
-				startIntentSenderForResult(pendingIntent.getIntentSender(), 1001, new Intent(), Integer.valueOf(0), Integer.valueOf(0), Integer.valueOf(0));
+				startIntentSenderForResult(pendingIntent.getIntentSender(), 1001, new Intent(), 0, 0, 0);
 			}
 		} catch (RemoteException e) {
 			e.printStackTrace();
diff --git a/example/src/com/haarman/listviewanimations/MyListActivity.java b/example/src/com/haarman/listviewanimations/MyListActivity.java
index eed7b271..50311b86 100644
--- a/example/src/com/haarman/listviewanimations/MyListActivity.java
+++ b/example/src/com/haarman/listviewanimations/MyListActivity.java
@@ -25,12 +25,14 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.nhaarman.listviewanimations.ArrayAdapter;
+
 public class MyListActivity extends BaseActivity {
 
 	private ListView mListView;
 
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_mylist);
 		mListView = (ListView) findViewById(R.id.activity_mylist_listview);
@@ -55,15 +57,15 @@ public static ArrayList<Integer> getItems() {
 
 	private static class MyListAdapter extends ArrayAdapter<Integer> {
 
-		private Context mContext;
+		private final Context mContext;
 
-		public MyListAdapter(Context context, ArrayList<Integer> items) {
+		public MyListAdapter(final Context context, final ArrayList<Integer> items) {
 			super(items);
 			mContext = context;
 		}
 
 		@Override
-		public long getItemId(int position) {
+		public long getItemId(final int position) {
 			return getItem(position).hashCode();
 		}
 
@@ -73,7 +75,7 @@ public boolean hasStableIds() {
 		}
 
 		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
+		public View getView(final int position, final View convertView, final ViewGroup parent) {
 			TextView tv = (TextView) convertView;
 			if (tv == null) {
 				tv = (TextView) LayoutInflater.from(mContext).inflate(R.layout.list_row, parent, false);
diff --git a/example/src/com/haarman/listviewanimations/appearanceexamples/AppearanceExamplesActivity.java b/example/src/com/haarman/listviewanimations/appearanceexamples/AppearanceExamplesActivity.java
index 3e11672c..651c061c 100644
--- a/example/src/com/haarman/listviewanimations/appearanceexamples/AppearanceExamplesActivity.java
+++ b/example/src/com/haarman/listviewanimations/appearanceexamples/AppearanceExamplesActivity.java
@@ -15,8 +15,6 @@
  */
 package com.haarman.listviewanimations.appearanceexamples;
 
-import java.util.ArrayList;
-
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
@@ -27,137 +25,138 @@
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.haarman.listviewanimations.ArrayAdapter;
 import com.haarman.listviewanimations.MyListActivity;
 import com.haarman.listviewanimations.R;
-import com.haarman.listviewanimations.swinginadapters.AnimationAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.AlphaInAnimationAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.ScaleInAnimationAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.SwingBottomInAnimationAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.SwingLeftInAnimationAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.SwingRightInAnimationAdapter;
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.AnimationAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.AlphaInAnimationAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.ScaleInAnimationAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.SwingBottomInAnimationAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.SwingLeftInAnimationAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.SwingRightInAnimationAdapter;
+
+import java.util.ArrayList;
 
 public class AppearanceExamplesActivity extends MyListActivity implements OnNavigationListener {
 
-	private BaseAdapter mAdapter;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		mAdapter = new MyAdapter(this, getItems());
-		setAlphaAdapter();
-
-		getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-		getSupportActionBar().setListNavigationCallbacks(new AnimSelectionAdapter(), this);
-		getSupportActionBar().setDisplayShowTitleEnabled(false);
-	}
-
-	private void setAlphaAdapter() {
-		AnimationAdapter animAdapter = new AlphaInAnimationAdapter(mAdapter);
-		animAdapter.setAbsListView(getListView());
-		getListView().setAdapter(animAdapter);
-	}
-
-	private void setLeftAdapter() {
-		AnimationAdapter animAdapter = new SwingLeftInAnimationAdapter(mAdapter);
-		animAdapter.setAbsListView(getListView());
-		getListView().setAdapter(animAdapter);
-	}
-
-	private void setRightAdapter() {
-		AnimationAdapter animAdapter = new SwingRightInAnimationAdapter(mAdapter);
-		animAdapter.setAbsListView(getListView());
-		getListView().setAdapter(animAdapter);
-	}
-
-	private void setBottomAdapter() {
-		AnimationAdapter animAdapter = new SwingBottomInAnimationAdapter(mAdapter);
-		animAdapter.setAbsListView(getListView());
-		getListView().setAdapter(animAdapter);
-	}
-
-	private void setBottomRightAdapter() {
-		AnimationAdapter animAdapter = new SwingBottomInAnimationAdapter(new SwingRightInAnimationAdapter(mAdapter));
-		animAdapter.setAbsListView(getListView());
-		getListView().setAdapter(animAdapter);
-	}
-
-	private void setScaleAdapter() {
-		AnimationAdapter animAdapter = new ScaleInAnimationAdapter(mAdapter);
-		animAdapter.setAbsListView(getListView());
-		getListView().setAdapter(animAdapter);
-	}
-
-	private static class MyAdapter extends ArrayAdapter<Integer> {
-
-		private Context mContext;
-
-		public MyAdapter(Context context, ArrayList<Integer> items) {
-			super(items);
-			mContext = context;
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return getItem(position).hashCode();
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			TextView tv = (TextView) convertView;
-			if (tv == null) {
-				tv = (TextView) LayoutInflater.from(mContext).inflate(R.layout.list_row, parent, false);
-			}
-			tv.setText("This is row number " + getItem(position));
-			return tv;
-		}
-	}
+    private BaseAdapter mAdapter;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mAdapter = new MyAdapter(this, getItems());
+
+        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+        getSupportActionBar().setListNavigationCallbacks(new AnimSelectionAdapter(), this);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+    }
+
+    private void setAlphaAdapter() {
+        AnimationAdapter animAdapter = new AlphaInAnimationAdapter(mAdapter);
+        animAdapter.setAbsListView(getListView());
+        getListView().setAdapter(animAdapter);
+    }
+
+    private void setLeftAdapter() {
+        AnimationAdapter animAdapter = new SwingLeftInAnimationAdapter(mAdapter);
+        animAdapter.setAbsListView(getListView());
+        getListView().setAdapter(animAdapter);
+    }
+
+    private void setRightAdapter() {
+        AnimationAdapter animAdapter = new SwingRightInAnimationAdapter(mAdapter);
+        animAdapter.setAbsListView(getListView());
+        getListView().setAdapter(animAdapter);
+    }
+
+    private void setBottomAdapter() {
+        AnimationAdapter animAdapter = new SwingBottomInAnimationAdapter(mAdapter);
+        animAdapter.setAbsListView(getListView());
+        getListView().setAdapter(animAdapter);
+    }
+
+    private void setBottomRightAdapter() {
+        AnimationAdapter animAdapter = new SwingBottomInAnimationAdapter(new SwingRightInAnimationAdapter(mAdapter));
+        animAdapter.setAbsListView(getListView());
+        getListView().setAdapter(animAdapter);
+    }
+
+    private void setScaleAdapter() {
+        AnimationAdapter animAdapter = new ScaleInAnimationAdapter(mAdapter);
+        animAdapter.setAbsListView(getListView());
+        getListView().setAdapter(animAdapter);
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(final int itemPosition, final long itemId) {
+        switch (itemPosition) {
+            case 0:
+                setAlphaAdapter();
+                return true;
+            case 1:
+                setLeftAdapter();
+                return true;
+            case 2:
+                setRightAdapter();
+                return true;
+            case 3:
+                setBottomAdapter();
+                return true;
+            case 4:
+                setBottomRightAdapter();
+                return true;
+            case 5:
+                setScaleAdapter();
+                return true;
+            default:
+                return false;
+        }
+    }
 
 	/* Non-ListViewAnimations related stuff below */
 
-	@Override
-	public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-		switch (itemPosition) {
-		case 0:
-			setAlphaAdapter();
-			return true;
-		case 1:
-			setLeftAdapter();
-			return true;
-		case 2:
-			setRightAdapter();
-			return true;
-		case 3:
-			setBottomAdapter();
-			return true;
-		case 4:
-			setBottomRightAdapter();
-			return true;
-		case 5:
-			setScaleAdapter();
-			return true;
-		default:
-			return false;
-		}
-	}
-
-	private class AnimSelectionAdapter extends ArrayAdapter<String> {
-
-		public AnimSelectionAdapter() {
-			addAll("Alpha", "Left", "Right", "Bottom", "Bottom right", "Scale");
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			TextView tv = (TextView) convertView;
-			if (tv == null) {
-				tv = (TextView) LayoutInflater.from(AppearanceExamplesActivity.this).inflate(android.R.layout.simple_list_item_1, parent, false);
-			}
-
-			tv.setText(getItem(position));
-
-			return tv;
-		}
-	}
+    private static class MyAdapter extends ArrayAdapter<Integer> {
+
+        private final Context mContext;
+
+        public MyAdapter(final Context context, final ArrayList<Integer> items) {
+            super(items);
+            mContext = context;
+        }
+
+        @Override
+        public long getItemId(final int position) {
+            return getItem(position).hashCode();
+        }
+
+        @Override
+        public View getView(final int position, final View convertView, final ViewGroup parent) {
+            TextView tv = (TextView) convertView;
+            if (tv == null) {
+                tv = (TextView) LayoutInflater.from(mContext).inflate(R.layout.list_row, parent, false);
+            }
+            tv.setText("This is row number " + getItem(position));
+            return tv;
+        }
+    }
+
+    private class AnimSelectionAdapter extends ArrayAdapter<String> {
+
+        public AnimSelectionAdapter() {
+            addAll("Alpha", "Left", "Right", "Bottom", "Bottom right", "Scale");
+        }
+
+        @Override
+        public View getView(final int position, final View convertView, final ViewGroup parent) {
+            TextView tv = (TextView) convertView;
+            if (tv == null) {
+                tv = (TextView) LayoutInflater.from(AppearanceExamplesActivity.this).inflate(android.R.layout.simple_list_item_1, parent, false);
+            }
+
+            tv.setText(getItem(position));
+
+            return tv;
+        }
+    }
 }
diff --git a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateAdditionActivity.java b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateAdditionActivity.java
new file mode 100644
index 00000000..5ed73c6c
--- /dev/null
+++ b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateAdditionActivity.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.haarman.listviewanimations.itemmanipulationexamples;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.haarman.listviewanimations.MyListActivity;
+import com.haarman.listviewanimations.R;
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter;
+
+import java.util.ArrayList;
+
+public class AnimateAdditionActivity extends MyListActivity implements AdapterView.OnItemClickListener {
+
+    private int mAddedItemNumber;
+    private AnimateAdditionAdapter<String> mAnimateAdditionAdapter;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        MyAdapter myAdapter = new MyAdapter(this, getStringItems());
+
+        mAnimateAdditionAdapter = new AnimateAdditionAdapter<String>(myAdapter);
+        mAnimateAdditionAdapter.setListView(getListView());
+
+        getListView().setAdapter(mAnimateAdditionAdapter);
+        getListView().setOnItemClickListener(this);
+
+        Toast.makeText(this, "Tap on an item to insert a new item", Toast.LENGTH_LONG).show();
+    }
+
+    private static ArrayList<String> getStringItems() {
+        ArrayList<String> items = new ArrayList<String>();
+        for (int i = 0; i < 1000; i++) {
+            items.add("This is row number " + i);
+        }
+        return items;
+    }
+
+    @Override
+    public void onItemClick(final AdapterView<?> parent, final View view, final int position, final long id) {
+        mAnimateAdditionAdapter.insert(position, "This is newly added item " + mAddedItemNumber);
+        mAddedItemNumber++;
+    }
+
+    private static class MyAdapter extends ArrayAdapter<String> {
+
+        private final Context mContext;
+
+        public MyAdapter(final Context context, final ArrayList<String> items) {
+            super(items);
+            mContext = context;
+        }
+
+        @Override
+        public long getItemId(final int position) {
+            return getItem(position).hashCode();
+        }
+
+        @Override
+        public View getView(final int position, final View convertView, final ViewGroup parent) {
+            TextView tv = (TextView) convertView;
+            if (tv == null) {
+                tv = (TextView) LayoutInflater.from(mContext).inflate(R.layout.list_row, parent, false);
+            }
+            tv.setText(getItem(position));
+            return tv;
+        }
+    }
+}
diff --git a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateDismissActivity.java b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateDismissActivity.java
index adac6715..9edf74ec 100644
--- a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateDismissActivity.java
+++ b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/AnimateDismissActivity.java
@@ -15,9 +15,6 @@
  */
 package com.haarman.listviewanimations.itemmanipulationexamples;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,81 +27,84 @@
 import android.widget.CheckedTextView;
 import android.widget.ListView;
 
-import com.haarman.listviewanimations.ArrayAdapter;
 import com.haarman.listviewanimations.BaseActivity;
 import com.haarman.listviewanimations.MyListActivity;
 import com.haarman.listviewanimations.R;
-import com.haarman.listviewanimations.itemmanipulation.AnimateDismissAdapter;
-import com.haarman.listviewanimations.itemmanipulation.OnDismissCallback;
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.AnimateDismissAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.OnDismissCallback;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class AnimateDismissActivity extends BaseActivity {
 
-	private List<Integer> mSelectedPositions;
-	private MyListAdapter mAdapter;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_animateremoval);
-
-		mSelectedPositions = new ArrayList<Integer>();
-
-		ListView listView = (ListView) findViewById(R.id.activity_animateremoval_listview);
-		mAdapter = new MyListAdapter(MyListActivity.getItems());
-		final AnimateDismissAdapter<String> animateDismissAdapter = new AnimateDismissAdapter<String>(mAdapter, new MyOnDismissCallback());
-		animateDismissAdapter.setAbsListView(listView);
-		listView.setAdapter(animateDismissAdapter);
-
-		Button button = (Button) findViewById(R.id.activity_animateremoval_button);
-		button.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				animateDismissAdapter.animateDismiss(mSelectedPositions);
-				mSelectedPositions.clear();
-			}
-		});
-
-		listView.setOnItemClickListener(new OnItemClickListener() {
-
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				CheckedTextView tv = ((CheckedTextView) view);
-				tv.toggle();
-				if (tv.isChecked()) {
-					mSelectedPositions.add(position);
-				} else {
-					mSelectedPositions.remove((Integer) position);
-				}
-			}
-		});
-	}
-
-	private class MyOnDismissCallback implements OnDismissCallback {
-
-		@Override
-		public void onDismiss(AbsListView listView, int[] reverseSortedPositions) {
-			for (int position : reverseSortedPositions) {
-				mAdapter.remove(position);
-			}
-		}
-	}
-
-	private class MyListAdapter extends ArrayAdapter<Integer> {
-
-		public MyListAdapter(ArrayList<Integer> items) {
-			super(items);
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			CheckedTextView tv = (CheckedTextView) convertView;
-			if (tv == null) {
-				tv = (CheckedTextView) LayoutInflater.from(AnimateDismissActivity.this).inflate(R.layout.activity_animateremoval_row, parent, false);
-			}
-			tv.setText(String.valueOf(getItem(position)));
-			tv.setChecked(mSelectedPositions.contains(position));
-			return tv;
-		}
-	}
+    private List<Integer> mSelectedPositions;
+    private MyListAdapter mAdapter;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_animateremoval);
+
+        mSelectedPositions = new ArrayList<Integer>();
+
+        ListView listView = (ListView) findViewById(R.id.activity_animateremoval_listview);
+        mAdapter = new MyListAdapter(MyListActivity.getItems());
+        final AnimateDismissAdapter animateDismissAdapter = new AnimateDismissAdapter(mAdapter, new MyOnDismissCallback());
+        animateDismissAdapter.setAbsListView(listView);
+        listView.setAdapter(animateDismissAdapter);
+
+        Button button = (Button) findViewById(R.id.activity_animateremoval_button);
+        button.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(final View v) {
+                animateDismissAdapter.animateDismiss(mSelectedPositions);
+                mSelectedPositions.clear();
+            }
+        });
+
+        listView.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onItemClick(final AdapterView<?> parent, final View view, final int position, final long id) {
+                CheckedTextView tv = (CheckedTextView) view;
+                tv.toggle();
+                if (tv.isChecked()) {
+                    mSelectedPositions.add(position);
+                } else {
+                    mSelectedPositions.remove((Integer) position);
+                }
+            }
+        });
+    }
+
+    private class MyOnDismissCallback implements OnDismissCallback {
+
+        @Override
+        public void onDismiss(final AbsListView listView, final int[] reverseSortedPositions) {
+            for (int position : reverseSortedPositions) {
+                mAdapter.remove(position);
+            }
+        }
+    }
+
+    private class MyListAdapter extends ArrayAdapter<Integer> {
+
+        public MyListAdapter(final ArrayList<Integer> items) {
+            super(items);
+        }
+
+        @Override
+        public View getView(final int position, final View convertView, final ViewGroup parent) {
+            CheckedTextView tv = (CheckedTextView) convertView;
+            if (tv == null) {
+                tv = (CheckedTextView) LayoutInflater.from(AnimateDismissActivity.this).inflate(R.layout.activity_animateremoval_row, parent, false);
+            }
+            tv.setText(String.valueOf(getItem(position)));
+            tv.setChecked(mSelectedPositions.contains(position));
+            return tv;
+        }
+    }
 }
diff --git a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/DragAndDropActivity.java b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/DragAndDropActivity.java
index 04092d4b..848be33e 100644
--- a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/DragAndDropActivity.java
+++ b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/DragAndDropActivity.java
@@ -1,32 +1,56 @@
-package com.haarman.listviewanimations.itemmanipulationexamples;
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package com.haarman.listviewanimations.itemmanipulationexamples;
 
 import android.os.Bundle;
+import android.widget.TextView;
 import android.widget.Toast;
 
-import com.haarman.listviewanimations.ArrayAdapter;
 import com.haarman.listviewanimations.MyListActivity;
 import com.haarman.listviewanimations.R;
-import com.haarman.listviewanimations.swinginadapters.prepared.AlphaInAnimationAdapter;
-import com.haarman.listviewanimations.view.DynamicListView;
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.AlphaInAnimationAdapter;
+import com.nhaarman.listviewanimations.widget.DynamicListView;
 
 public class DragAndDropActivity extends MyListActivity {
 
-	private DynamicListView mListView;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+    @Override
+	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_draganddrop);
 
-		mListView = (DynamicListView) findViewById(R.id.activity_draganddrop_listview);
-		mListView.setDivider(null);
+        DynamicListView listView = (DynamicListView) findViewById(R.id.activity_draganddrop_listview);
+		listView.setDivider(null);
+
+        TextView headerView =new TextView(this);
+        headerView.setText("HEADER");
+        listView.addHeaderView(headerView);
 
-		ArrayAdapter<Integer> adapter = createListAdapter();
+		final ArrayAdapter<Integer> adapter = createListAdapter();
 		AlphaInAnimationAdapter animAdapter = new AlphaInAnimationAdapter(adapter);
 		animAdapter.setInitialDelayMillis(300);
-		animAdapter.setAbsListView(mListView);
-		mListView.setAdapter(animAdapter);
+		animAdapter.setAbsListView(listView);
+		listView.setAdapter(animAdapter);
 
 		Toast.makeText(this, "Long press an item to start dragging", Toast.LENGTH_LONG).show();
+        listView.setOnItemMovedListener(new DynamicListView.OnItemMovedListener() {
+            @Override
+            public void onItemMoved(final int newPosition) {
+                Toast.makeText(getApplicationContext(), adapter.getItem(newPosition) + " moved to position " + newPosition, Toast.LENGTH_SHORT).show();
+            }
+        });
 	}
 }
diff --git a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ExpandableListItemActivity.java b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ExpandableListItemActivity.java
index 1ee45f86..920a33e4 100644
--- a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ExpandableListItemActivity.java
+++ b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ExpandableListItemActivity.java
@@ -1,7 +1,20 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.haarman.listviewanimations.itemmanipulationexamples;
 
-import java.util.List;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -17,126 +30,125 @@
 
 import com.haarman.listviewanimations.MyListActivity;
 import com.haarman.listviewanimations.R;
-import com.haarman.listviewanimations.itemmanipulation.ExpandableListItemAdapter;
-import com.haarman.listviewanimations.swinginadapters.prepared.AlphaInAnimationAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.ExpandableListItemAdapter;
+import com.nhaarman.listviewanimations.swinginadapters.prepared.AlphaInAnimationAdapter;
+
+import java.util.List;
 
 public class ExpandableListItemActivity extends MyListActivity {
 
-	private MyExpandableListItemAdapter mExpandableListItemAdapter;
-	private boolean mLimited;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		mExpandableListItemAdapter = new MyExpandableListItemAdapter(this, getItems());
-		AlphaInAnimationAdapter alphaInAnimationAdapter = new AlphaInAnimationAdapter(mExpandableListItemAdapter);
-		alphaInAnimationAdapter.setAbsListView(getListView());
-		alphaInAnimationAdapter.setInitialDelayMillis(500);
-		getListView().setAdapter(alphaInAnimationAdapter);
-
-		Toast.makeText(this, R.string.explainexpand, Toast.LENGTH_LONG).show();
-	}
-
-	private static class MyExpandableListItemAdapter extends ExpandableListItemAdapter<Integer> {
-
-		private Context mContext;
-		private LruCache<Integer, Bitmap> mMemoryCache;
-
-		/**
-		 * Creates a new ExpandableListItemAdapter with the specified list, or an empty list if
-		 * items == null.
-		 */
-		private MyExpandableListItemAdapter(Context context, List<Integer> items) {
-			super(context, R.layout.activity_expandablelistitem_card, R.id.activity_expandablelistitem_card_title, R.id.activity_expandablelistitem_card_content, items);
-			mContext = context;
-
-			final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
-
-			// Use 1/8th of the available memory for this memory cache.
-			final int cacheSize = maxMemory;
-			mMemoryCache = new LruCache<Integer, Bitmap>(cacheSize) {
-				@Override
-				protected int sizeOf(Integer key, Bitmap bitmap) {
-					// The cache size will be measured in kilobytes rather than
-					// number of items.
-					return bitmap.getRowBytes() * bitmap.getHeight() / 1024;
-				}
-			};
-		}
-
-		@Override
-		public View getTitleView(int position, View convertView, ViewGroup parent) {
-			TextView tv = (TextView) convertView;
-			if (tv == null) {
-				tv = new TextView(mContext);
-			}
-			tv.setText(mContext.getString(R.string.expandorcollapsecard, getItem(position)));
-			return tv;
-		}
-
-		@Override
-		public View getContentView(int position, View convertView, ViewGroup parent) {
-			ImageView imageView = (ImageView) convertView;
-			if (imageView == null) {
-				imageView = new ImageView(mContext);
-				imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-			}
-
-			int imageResId;
-			switch (getItem(position) % 5) {
-			case 0:
-				imageResId = R.drawable.img_nature1;
-				break;
-			case 1:
-				imageResId = R.drawable.img_nature2;
-				break;
-			case 2:
-				imageResId = R.drawable.img_nature3;
-				break;
-			case 3:
-				imageResId = R.drawable.img_nature4;
-				break;
-			default:
-				imageResId = R.drawable.img_nature5;
-			}
-
-			Bitmap bitmap = getBitmapFromMemCache(imageResId);
-			if (bitmap == null) {
-				bitmap = BitmapFactory.decodeResource(mContext.getResources(), imageResId);
-				addBitmapToMemoryCache(imageResId, bitmap);
-			}
-			imageView.setImageBitmap(bitmap);
-
-			return imageView;
-		}
-
-		private void addBitmapToMemoryCache(int key, Bitmap bitmap) {
-			if (getBitmapFromMemCache(key) == null) {
-				mMemoryCache.put(key, bitmap);
-			}
-		}
-
-		private Bitmap getBitmapFromMemCache(int key) {
-			return mMemoryCache.get(key);
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.menu_expandablelistitem, menu);
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case R.id.menu_expandable_limit:
-			mLimited = !mLimited;
-			item.setChecked(mLimited);
-			mExpandableListItemAdapter.setLimit(mLimited ? 2 : 0);
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
+    private MyExpandableListItemAdapter mExpandableListItemAdapter;
+    private boolean mLimited;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mExpandableListItemAdapter = new MyExpandableListItemAdapter(this, getItems());
+        AlphaInAnimationAdapter alphaInAnimationAdapter = new AlphaInAnimationAdapter(mExpandableListItemAdapter);
+        alphaInAnimationAdapter.setAbsListView(getListView());
+        alphaInAnimationAdapter.setInitialDelayMillis(500);
+        getListView().setAdapter(alphaInAnimationAdapter);
+
+        Toast.makeText(this, R.string.explainexpand, Toast.LENGTH_LONG).show();
+    }
+
+    private static class MyExpandableListItemAdapter extends ExpandableListItemAdapter<Integer> {
+
+        private final Context mContext;
+        private final LruCache<Integer, Bitmap> mMemoryCache;
+
+        /**
+         * Creates a new ExpandableListItemAdapter with the specified list, or an empty list if
+         * items == null.
+         */
+        private MyExpandableListItemAdapter(final Context context, final List<Integer> items) {
+            super(context, R.layout.activity_expandablelistitem_card, R.id.activity_expandablelistitem_card_title, R.id.activity_expandablelistitem_card_content, items);
+            mContext = context;
+
+            final int cacheSize = (int) (Runtime.getRuntime().maxMemory() / 1024);
+            mMemoryCache = new LruCache<Integer, Bitmap>(cacheSize) {
+                @Override
+                protected int sizeOf(final Integer key, final Bitmap bitmap) {
+                    // The cache size will be measured in kilobytes rather than
+                    // number of items.
+                    return bitmap.getRowBytes() * bitmap.getHeight() / 1024;
+                }
+            };
+        }
+
+        @Override
+        public View getTitleView(final int position, final View convertView, final ViewGroup parent) {
+            TextView tv = (TextView) convertView;
+            if (tv == null) {
+                tv = new TextView(mContext);
+            }
+            tv.setText(mContext.getString(R.string.expandorcollapsecard, getItem(position)));
+            return tv;
+        }
+
+        @Override
+        public View getContentView(final int position, final View convertView, final ViewGroup parent) {
+            ImageView imageView = (ImageView) convertView;
+            if (imageView == null) {
+                imageView = new ImageView(mContext);
+                imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            }
+
+            int imageResId;
+            switch (getItem(position) % 5) {
+                case 0:
+                    imageResId = R.drawable.img_nature1;
+                    break;
+                case 1:
+                    imageResId = R.drawable.img_nature2;
+                    break;
+                case 2:
+                    imageResId = R.drawable.img_nature3;
+                    break;
+                case 3:
+                    imageResId = R.drawable.img_nature4;
+                    break;
+                default:
+                    imageResId = R.drawable.img_nature5;
+            }
+
+            Bitmap bitmap = getBitmapFromMemCache(imageResId);
+            if (bitmap == null) {
+                bitmap = BitmapFactory.decodeResource(mContext.getResources(), imageResId);
+                addBitmapToMemoryCache(imageResId, bitmap);
+            }
+            imageView.setImageBitmap(bitmap);
+
+            return imageView;
+        }
+
+        private void addBitmapToMemoryCache(final int key, final Bitmap bitmap) {
+            if (getBitmapFromMemCache(key) == null) {
+                mMemoryCache.put(key, bitmap);
+            }
+        }
+
+        private Bitmap getBitmapFromMemCache(final int key) {
+            return mMemoryCache.get(key);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_expandablelistitem, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_expandable_limit:
+                mLimited = !mLimited;
+                item.setChecked(mLimited);
+                mExpandableListItemAdapter.setLimit(mLimited ? 2 : 0);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ItemManipulationsExamplesActivity.java b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ItemManipulationsExamplesActivity.java
index 78a7eb5a..6a2f9cf6 100644
--- a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ItemManipulationsExamplesActivity.java
+++ b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/ItemManipulationsExamplesActivity.java
@@ -22,50 +22,56 @@
 import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
 import android.view.View;
+
 import com.haarman.listviewanimations.R;
 
 public class ItemManipulationsExamplesActivity extends ActionBarActivity {
 
-	@SuppressLint("InlinedApi")
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		if (Build.VERSION.SDK_INT >= 19) {
-			getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
-		}
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_examples_itemmanipulations);
+    @SuppressLint("InlinedApi")
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+        }
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_examples_itemmanipulations);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
 
-		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-	}
+    public void onDragAndDropClicked(final View view) {
+        Intent intent = new Intent(this, DragAndDropActivity.class);
+        startActivity(intent);
+    }
 
-	public void onDragAndDropClicked(View view) {
-		Intent intent = new Intent(this, DragAndDropActivity.class);
-		startActivity(intent);
-	}
+    public void onSwipeDismissClicked(final View view) {
+        Intent intent = new Intent(this, SwipeDismissActivity.class);
+        startActivity(intent);
+    }
 
-	public void onSwipeDismissClicked(View view) {
-		Intent intent = new Intent(this, SwipeDismissActivity.class);
-		startActivity(intent);
-	}
+    public void onAnimateRemovalClicked(final View view) {
+        Intent intent = new Intent(this, AnimateDismissActivity.class);
+        startActivity(intent);
+    }
 
-	public void onAnimateRemovalClicked(View view) {
-		Intent intent = new Intent(this, AnimateDismissActivity.class);
-		startActivity(intent);
-	}
+    public void onAnimateAdditionClicked(final View view) {
+        Intent intent = new Intent(this, AnimateAdditionActivity.class);
+        startActivity(intent);
+    }
 
-	public void onExpandListItemAdapterClicked(View view) {
-		Intent intent = new Intent(this, ExpandableListItemActivity.class);
-		startActivity(intent);
-	}
+    public void onExpandListItemAdapterClicked(final View view) {
+        Intent intent = new Intent(this, ExpandableListItemActivity.class);
+        startActivity(intent);
+    }
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case android.R.id.home:
-			finish();
-			return true;
-		default:
-			return super.onOptionsItemSelected(item);
-		}
-	}
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
diff --git a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/SwipeDismissActivity.java b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/SwipeDismissActivity.java
index 0236841f..c8bbb236 100644
--- a/example/src/com/haarman/listviewanimations/itemmanipulationexamples/SwipeDismissActivity.java
+++ b/example/src/com/haarman/listviewanimations/itemmanipulationexamples/SwipeDismissActivity.java
@@ -15,8 +15,6 @@
  */
 package com.haarman.listviewanimations.itemmanipulationexamples;
 
-import java.util.Arrays;
-
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBar.OnNavigationListener;
@@ -27,124 +25,123 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.haarman.listviewanimations.ArrayAdapter;
 import com.haarman.listviewanimations.MyListActivity;
 import com.haarman.listviewanimations.R;
-import com.haarman.listviewanimations.itemmanipulation.OnDismissCallback;
-import com.haarman.listviewanimations.itemmanipulation.SwipeDismissAdapter;
-import com.haarman.listviewanimations.itemmanipulation.contextualundo.ContextualUndoAdapter;
-import com.haarman.listviewanimations.itemmanipulation.contextualundo.ContextualUndoAdapter.CountDownFormatter;
-import com.haarman.listviewanimations.itemmanipulation.contextualundo.ContextualUndoAdapter.DeleteItemCallback;
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.OnDismissCallback;
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeDismissAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo.ContextualUndoAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo.ContextualUndoAdapter.CountDownFormatter;
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo.ContextualUndoAdapter.DeleteItemCallback;
+
+import java.util.Arrays;
 
 public class SwipeDismissActivity extends MyListActivity implements OnNavigationListener, OnDismissCallback, DeleteItemCallback {
 
-	private ArrayAdapter<Integer> mAdapter;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		mAdapter = createListAdapter();
-
-		setSwipeDismissAdapter();
-
-		getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
-		getSupportActionBar().setListNavigationCallbacks(new AnimSelectionAdapter(), this);
-		getSupportActionBar().setDisplayShowTitleEnabled(false);
-	}
-
-	private void setSwipeDismissAdapter() {
-		SwipeDismissAdapter adapter = new SwipeDismissAdapter(mAdapter, this);
-		adapter.setAbsListView(getListView());
-		getListView().setAdapter(adapter);
-	}
-
-	@Override
-	public void onDismiss(AbsListView listView, int[] reverseSortedPositions) {
-		for (int position : reverseSortedPositions) {
-			mAdapter.remove(position);
-		}
-		Toast.makeText(this, "Removed positions: " + Arrays.toString(reverseSortedPositions), Toast.LENGTH_SHORT).show();
-	}
-
-	private void setContextualUndoAdapter() {
-		ContextualUndoAdapter adapter = new ContextualUndoAdapter(mAdapter, R.layout.undo_row, R.id.undo_row_undobutton);
-		adapter.setAbsListView(getListView());
-		getListView().setAdapter(adapter);
-		adapter.setDeleteItemCallback(this);
-	}
-
-	@Override
-	public void deleteItem(int position) {
-		mAdapter.remove(position);
-		mAdapter.notifyDataSetChanged();
-	}
-
-	private void setContextualUndoWithTimedDeleteAdapter() {
-		ContextualUndoAdapter adapter = new ContextualUndoAdapter(mAdapter, R.layout.undo_row, R.id.undo_row_undobutton, 3000);
-		adapter.setAbsListView(getListView());
-		getListView().setAdapter(adapter);
-		adapter.setDeleteItemCallback(this);
-	}
-
-	private void setContextualUndoWithTimedDeleteAndCountDownAdapter() {
-		ContextualUndoAdapter adapter = new ContextualUndoAdapter(mAdapter, R.layout.undo_row, R.id.undo_row_undobutton, 3000, R.id.undo_row_texttv, new MyFormatCountDownCallback());
-		adapter.setAbsListView(getListView());
-		getListView().setAdapter(adapter);
-		adapter.setDeleteItemCallback(this);
-	}
-
-	private class MyFormatCountDownCallback implements CountDownFormatter {
-
-		@Override
-		public String getCountDownString(long millisUntilFinished) {
-			int seconds = (int) Math.ceil((millisUntilFinished / 1000.0));
-
-			if (seconds > 0) {
-				return getResources().getQuantityString(R.plurals.countdown_seconds, seconds, seconds);
-			}
-			return getString(R.string.countdown_dismissing);
-		}
-	}
+    private ArrayAdapter<Integer> mAdapter;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mAdapter = createListAdapter();
+
+        setSwipeDismissAdapter();
+
+        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+        getSupportActionBar().setListNavigationCallbacks(new AnimSelectionAdapter(), this);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+    }
+
+    private void setSwipeDismissAdapter() {
+        SwipeDismissAdapter adapter = new SwipeDismissAdapter(mAdapter, this);
+        adapter.setAbsListView(getListView());
+        getListView().setAdapter(adapter);
+    }
+
+    @Override
+    public void onDismiss(final AbsListView listView, final int[] reverseSortedPositions) {
+        for (int position : reverseSortedPositions) {
+            mAdapter.remove(position);
+        }
+        Toast.makeText(this, "Removed positions: " + Arrays.toString(reverseSortedPositions), Toast.LENGTH_SHORT).show();
+    }
+
+    private void setContextualUndoAdapter() {
+        ContextualUndoAdapter adapter = new ContextualUndoAdapter(mAdapter, R.layout.undo_row, R.id.undo_row_undobutton, this);
+        adapter.setAbsListView(getListView());
+        getListView().setAdapter(adapter);
+    }
+
+    @Override
+    public void deleteItem(final int position) {
+        mAdapter.remove(position);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    private void setContextualUndoWithTimedDeleteAdapter() {
+        ContextualUndoAdapter adapter = new ContextualUndoAdapter(mAdapter, R.layout.undo_row, R.id.undo_row_undobutton, 3000, this);
+        adapter.setAbsListView(getListView());
+        getListView().setAdapter(adapter);
+    }
+
+    private void setContextualUndoWithTimedDeleteAndCountDownAdapter() {
+        ContextualUndoAdapter adapter = new ContextualUndoAdapter(mAdapter, R.layout.undo_row, R.id.undo_row_undobutton, 3000, R.id.undo_row_texttv, this, new MyFormatCountDownCallback());
+        adapter.setAbsListView(getListView());
+        getListView().setAdapter(adapter);
+    }
+
+    private class MyFormatCountDownCallback implements CountDownFormatter {
+
+        @Override
+        public String getCountDownString(final long millisUntilFinished) {
+            int seconds = (int) Math.ceil(millisUntilFinished / 1000.0);
+
+            if (seconds > 0) {
+                return getResources().getQuantityString(R.plurals.countdown_seconds, seconds, seconds);
+            }
+            return getString(R.string.countdown_dismissing);
+        }
+    }
 
 	/* Non-ListViewAnimations related stuff below */
 
-	@Override
-	public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-		switch (itemPosition) {
-		case 0:
-			setSwipeDismissAdapter();
-			return true;
-		case 1:
-			setContextualUndoAdapter();
-			return true;
-		case 2:
-			setContextualUndoWithTimedDeleteAdapter();
-			return true;
-		case 3:
-			setContextualUndoWithTimedDeleteAndCountDownAdapter();
-			return true;
-		default:
-			return false;
-		}
-	}
-
-	private class AnimSelectionAdapter extends ArrayAdapter<String> {
-
-		public AnimSelectionAdapter() {
-			addAll("Swipe-To-Dismiss", "Contextual Undo", "CU - Timed Delete", "CU - Count Down");
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			TextView tv = (TextView) convertView;
-			if (tv == null) {
-				tv = (TextView) LayoutInflater.from(SwipeDismissActivity.this).inflate(android.R.layout.simple_list_item_1, parent, false);
-			}
-
-			tv.setText(getItem(position));
-
-			return tv;
-		}
-	}
+    @Override
+    public boolean onNavigationItemSelected(final int itemPosition, final long itemId) {
+        switch (itemPosition) {
+            case 0:
+                setSwipeDismissAdapter();
+                return true;
+            case 1:
+                setContextualUndoAdapter();
+                return true;
+            case 2:
+                setContextualUndoWithTimedDeleteAdapter();
+                return true;
+            case 3:
+                setContextualUndoWithTimedDeleteAndCountDownAdapter();
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    private class AnimSelectionAdapter extends ArrayAdapter<String> {
+
+        public AnimSelectionAdapter() {
+            addAll("Swipe-To-Dismiss", "Contextual Undo", "CU - Timed Delete", "CU - Count Down");
+        }
+
+        @Override
+        public View getView(final int position, final View convertView, final ViewGroup parent) {
+            TextView tv = (TextView) convertView;
+            if (tv == null) {
+                tv = (TextView) LayoutInflater.from(SwipeDismissActivity.this).inflate(android.R.layout.simple_list_item_1, parent, false);
+            }
+
+            tv.setText(getItem(position));
+
+            return tv;
+        }
+    }
 }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..7dda3478
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,13 @@
+VERSION_NAME=2.6.0
+GROUP=com.nhaarman.listviewanimations
+
+POM_DESCRIPTION=ListViewAnimations library
+POM_URL=https://github.com/nhaarman/ListViewAnimations
+POM_SCM_URL=https://github.com/nhaarman/ListViewAnimations
+POM_SCM_CONNECTION=scm:git@github.com:nhaarman/ListViewAnimations.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:nhaarman/ListViewAnimations.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=nhaarman
+POM_DEVELOPER_NAME=Niek Haarman
\ No newline at end of file
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index 5de45843..3aa03627 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -1,10 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.haarman.listviewanimations"
-    android:versionCode="201311071"
-    android:versionName="2.5.2" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
-
-</manifest>
\ No newline at end of file
+<manifest package="com.nhaarman.listviewanimations" />
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index c8ebf2be..8134bdc2 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,13 +1,18 @@
-apply plugin:'android-library'
+apply plugin: 'android-library'
+
 
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
-    compile 'com.nineoldandroids:library:2.4.+'
+    compile 'com.nineoldandroids:library:2.4.0'
+
+    instrumentTestCompile ('org.mockito:mockito-core:1.9.5')  { exclude group: 'org.hamcrest' }
+    instrumentTestCompile ('com.google.dexmaker:dexmaker-mockito:1.0')  { exclude group: 'org.hamcrest' }
+    instrumentTestCompile ('junit:junit:4.11')  { exclude group: 'org.hamcrest' }
+    instrumentTestCompile 'org.hamcrest:hamcrest-all:1.3'
 }
 
 android {
-    compileSdkVersion 18
-    buildToolsVersion '18.0.1'
+    compileSdkVersion 19
+    buildToolsVersion '19.0.1'
 
     sourceSets {
         main {
@@ -17,5 +22,23 @@ android {
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
+
+        instrumentTest.setRoot('tests')
+        instrumentTest {
+            java.srcDirs = ['tests/java']
+        }
+    }
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 19
+        versionName project.VERSION_NAME
+        versionCode Integer.parseInt(new Date().format('yyyyMMddHH'))
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
     }
 }
+
+apply from: '../maven_push.gradle'
\ No newline at end of file
diff --git a/library/gradle.properties b/library/gradle.properties
new file mode 100644
index 00000000..f7d39113
--- /dev/null
+++ b/library/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ListViewAnimations Library
+POM_ARTIFACT_ID=library
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/library/src/com/haarman/listviewanimations/ArrayAdapter.java b/library/src/com/haarman/listviewanimations/ArrayAdapter.java
deleted file mode 100644
index fd48035e..00000000
--- a/library/src/com/haarman/listviewanimations/ArrayAdapter.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-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;
-
-/**
- * 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 {
-
-	protected List<T> mItems;
-
-	/**
-	 * Creates a new ArrayAdapter with an empty list.
-	 */
-	public ArrayAdapter() {
-		this(null);
-	}
-
-	/**
-	 * 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() {
-		return mItems.size();
-	}
-
-	@Override
-	public T getItem(int position) {
-		return mItems.get(position);
-	}
-
-	@Override
-	public long getItemId(int position) {
-		return position;
-	}
-
-	/**
-	 * Appends the specified element to the end of the list.
-	 */
-	// @ requires item != null;
-	public void add(T item) {
-		mItems.add(item);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Inserts the specified element at the specified position in the list.
-	 */
-	public void add(int position, T item) {
-		mItems.add(position, item);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Appends all of the elements in the specified collection to the end of the
-	 * list, in the order that they are returned by the specified collection's
-	 * Iterator.
-	 */
-	public void addAll(Collection<? extends T> items) {
-		mItems.addAll(items);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Appends all of the elements to the end of the list, in the order that
-	 * they are specified.
-	 */
-	public void addAll(T... items) {
-		Collections.addAll(mItems, items);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Inserts all of the elements in the specified collection into the list,
-	 * starting at the specified position.
-	 */
-	public void addAll(int position, Collection<? extends T> items) {
-		mItems.addAll(position, items);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Inserts all of the elements into the list, starting at the specified
-	 * position.
-	 */
-	public void addAll(int position, T... items) {
-		for (int i = position; i < (items.length + position); i++) {
-			mItems.add(i, items[i]);
-		}
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Removes all of the elements from the list.
-	 */
-	public void clear() {
-		mItems.clear();
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Replaces the element at the specified position in this list with the
-	 * specified element.
-	 */
-	public void set(int position, T item) {
-		mItems.set(position, item);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Removes the specified element from the list
-	 */
-	public void remove(T item) {
-		mItems.remove(item);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Removes the element at the specified position in the list
-	 */
-	public void remove(int position) {
-		mItems.remove(position);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Removes all elements at the specified positions in the list
-	 */
-	public void removePositions(Collection<Integer> positions) {
-		ArrayList<Integer> positionsList = new ArrayList<Integer>(positions);
-		Collections.sort(positionsList);
-		Collections.reverse(positionsList);
-		for (int position : positionsList) {
-			mItems.remove(position);
-		}
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Removes all of the list's elements that are also contained in the
-	 * specified collection
-	 */
-	public void removeAll(Collection<T> items) {
-		mItems.removeAll(items);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Retains only the elements in the list that are contained in the specified
-	 * collection
-	 */
-	public void retainAll(Collection<T> items) {
-		mItems.retainAll(items);
-		notifyDataSetChanged();
-	}
-
-	/**
-	 * Returns the position of the first occurrence of the specified element in
-	 * this list, or -1 if this list does not contain the element. More
-	 * formally, returns the lowest position <tt>i</tt> such that
-	 * <tt>(o==null&nbsp;?&nbsp;get(i)==null&nbsp;:&nbsp;o.equals(get(i)))</tt>,
-	 * or -1 if there is no such position.
-	 */
-	public int indexOf(T item) {
-		return mItems.indexOf(item);
-	}
-
-	@Override
-	public void swapItems(int positionOne, int positionTwo) {
-		T temp = getItem(positionOne);
-		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/itemmanipulation/AnimateDismissAdapter.java b/library/src/com/haarman/listviewanimations/itemmanipulation/AnimateDismissAdapter.java
deleted file mode 100644
index 054d2413..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/AnimateDismissAdapter.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.itemmanipulation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-
-import com.haarman.listviewanimations.BaseAdapterDecorator;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.AnimatorSet;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.animation.ValueAnimator.AnimatorUpdateListener;
-
-/**
- * A {@link BaseAdapterDecorator} class that provides animations to the removal
- * of items in the given {@link BaseAdapter}.
- */
-public class AnimateDismissAdapter<T> extends BaseAdapterDecorator {
-
-	private OnDismissCallback mCallback;
-
-	/**
-	 * Create a new AnimateDismissAdapter based on the given {@link BaseAdapter}
-	 * .
-	 * 
-	 * @param callback
-	 *            The {@link OnDismissCallback} to trigger when the user has
-	 *            indicated that she would like to dismiss one or more list
-	 *            items.
-	 */
-	public AnimateDismissAdapter(BaseAdapter baseAdapter, OnDismissCallback callback) {
-		super(baseAdapter);
-		mCallback = callback;
-	}
-
-	/**
-	 * Animate dismissal of the item at given position.
-	 */
-	public void animateDismiss(int position) {
-		animateDismiss(Arrays.asList(position));
-	}
-
-	/**
-	 * Animate dismissal of the items at given positions.
-	 */
-	public void animateDismiss(Collection<Integer> positions) {
-		final List<Integer> positionsCopy = new ArrayList<Integer>(positions);
-		if (getAbsListView() == null) {
-			throw new IllegalStateException("Call setAbsListView() on this AnimateDismissAdapter before calling setAdapter()!");
-		}
-
-		List<View> views = getVisibleViewsForPositions(positionsCopy);
-
-		if (!views.isEmpty()) {
-			List<Animator> animators = new ArrayList<Animator>();
-			for (final View view : views) {
-				animators.add(createAnimatorForView(view));
-			}
-
-			AnimatorSet animatorSet = new AnimatorSet();
-
-			Animator[] animatorsArray = new Animator[animators.size()];
-			for (int i = 0; i < animatorsArray.length; i++) {
-				animatorsArray[i] = animators.get(i);
-			}
-
-			animatorSet.playTogether(animatorsArray);
-			animatorSet.addListener(new AnimatorListenerAdapter() {
-
-				@Override
-				public void onAnimationEnd(Animator animator) {
-					invokeCallback(positionsCopy);
-				}
-			});
-			animatorSet.start();
-		} else {
-			invokeCallback(positionsCopy);
-		}
-	}
-
-	private void invokeCallback(Collection<Integer> positions) {
-		ArrayList<Integer> positionsList = new ArrayList<Integer>(positions);
-		Collections.sort(positionsList);
-
-		int nrHeaders = 0;
-		if (getAbsListView() instanceof ListView) {
-			nrHeaders = ((ListView) getAbsListView()).getHeaderViewsCount();
-		}
-
-		int[] dismissPositions = new int[positionsList.size()];
-		for (int i = 0; i < positionsList.size(); i++) {
-			dismissPositions[i] = positionsList.get(positionsList.size() - 1 - i - nrHeaders);
-		}
-		mCallback.onDismiss(getAbsListView(), dismissPositions);
-	}
-
-	private List<View> getVisibleViewsForPositions(Collection<Integer> positions) {
-		List<View> views = new ArrayList<View>();
-		for (int i = 0; i < getAbsListView().getChildCount(); i++) {
-			View child = getAbsListView().getChildAt(i);
-			if (positions.contains(getAbsListView().getPositionForView(child))) {
-				views.add(child);
-			}
-		}
-		return views;
-	}
-
-	private Animator createAnimatorForView(final View view) {
-		final ViewGroup.LayoutParams lp = view.getLayoutParams();
-		final int originalHeight = view.getHeight();
-
-		ValueAnimator animator = ValueAnimator.ofInt(originalHeight, 0);
-		animator.addListener(new AnimatorListenerAdapter() {
-
-			@Override
-			public void onAnimationEnd(Animator animator) {
-				lp.height = 0;
-				view.setLayoutParams(lp);
-			}
-		});
-
-		animator.addUpdateListener(new AnimatorUpdateListener() {
-
-			@Override
-			public void onAnimationUpdate(ValueAnimator valueAnimator) {
-				lp.height = (Integer) valueAnimator.getAnimatedValue();
-				view.setLayoutParams(lp);
-			}
-		});
-
-		return animator;
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/ExpandableListItemAdapter.java b/library/src/com/haarman/listviewanimations/itemmanipulation/ExpandableListItemAdapter.java
deleted file mode 100644
index f10cc13a..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/ExpandableListItemAdapter.java
+++ /dev/null
@@ -1,333 +0,0 @@
-package com.haarman.listviewanimations.itemmanipulation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-import com.haarman.listviewanimations.ArrayAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ValueAnimator;
-
-/**
- * An {@link ArrayAdapter} which allows items to be expanded using an animation.
- */
-public abstract class ExpandableListItemAdapter<T> extends ArrayAdapter<T> {
-
-	private static final int DEFAULTTITLEPARENTRESID = 10000;
-	private static final int DEFAULTCONTENTPARENTRESID = 10001;
-
-	private Context mContext;
-	private int mViewLayoutResId;
-	private int mTitleParentResId;
-	private int mContentParentResId;
-	private int mActionViewResId;
-	private List<Long> mVisibleIds;
-
-	private int mLimit;
-	private Map<Long, View> mExpandedViews;
-
-	/**
-	 * Creates a new ExpandableListItemAdapter with an empty list.
-	 */
-	protected ExpandableListItemAdapter(Context context) {
-		this(context, null);
-	}
-
-	/**
-	 * Creates a new {@link ExpandableListItemAdapter} with the specified list,
-	 * or an empty list if items == null.
-	 */
-	protected ExpandableListItemAdapter(Context context, List<T> items) {
-		super(items);
-		mContext = context;
-		mTitleParentResId = DEFAULTTITLEPARENTRESID;
-		mContentParentResId = DEFAULTCONTENTPARENTRESID;
-
-		mVisibleIds = new ArrayList<Long>();
-	}
-
-	/**
-	 * Creates a new ExpandableListItemAdapter with an empty list. Uses given
-	 * layout resource for the view; titleParentResId and contentParentResId
-	 * should be identifiers for ViewGroups within that layout.
-	 */
-	protected ExpandableListItemAdapter(Context context, int layoutResId, int titleParentResId, int contentParentResId) {
-		this(context, layoutResId, titleParentResId, contentParentResId, null);
-	}
-
-	/**
-	 * Creates a new ExpandableListItemAdapter with the specified list, or an
-	 * empty list if items == null. Uses given layout resource for the view;
-	 * titleParentResId and contentParentResId should be identifiers for
-	 * ViewGroups within that layout.
-	 */
-	protected ExpandableListItemAdapter(Context context, int layoutResId, int titleParentResId, int contentParentResId, List<T> items) {
-		super(items);
-		mContext = context;
-		mViewLayoutResId = layoutResId;
-		mTitleParentResId = titleParentResId;
-		mContentParentResId = contentParentResId;
-
-		mVisibleIds = new ArrayList<Long>();
-		mExpandedViews = new HashMap<Long, View>();
-	}
-
-	/**
-	 * Set the resource id of the child {@link View} contained in the View returned by
-	 * {@link #getTitleView(int, View, ViewGroup)} that will be the actuator of the expand / collapse animations.<br>
-	 * If there is no View in the title View with given resId, a {@link NullPointerException} is thrown.</p>
-	 * Default behavior: the whole title View acts as the actuator.
-	 * @param resId the resource id.
-	 */
-	public void setActionViewResId(int resId) {
-		mActionViewResId = resId;
-	}
-
-	/**
-	 * Set the maximum number of items allowed to be expanded. When the (limit+1)th item is expanded, the first expanded item will collapse.
-	 * @param limit the maximum number of items allowed to be expanded. Use <= 0 for no limit.
-	 */
-	public void setLimit(int limit) {
-		mLimit = limit;
-		mVisibleIds.clear();
-		mExpandedViews.clear();
-		notifyDataSetChanged();
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		ViewGroup view = (ViewGroup) convertView;
-		ViewHolder viewHolder;
-
-		if (view == null) {
-			view = createView(parent);
-
-			viewHolder = new ViewHolder();
-			viewHolder.titleParent = (ViewGroup) view.findViewById(mTitleParentResId);
-			viewHolder.contentParent = (ViewGroup) view.findViewById(mContentParentResId);
-
-			view.setTag(viewHolder);
-		} else {
-			viewHolder = (ViewHolder) view.getTag();
-		}
-
-		if (mLimit > 0) {
-			if (mVisibleIds.contains(getItemId(position))) {
-				mExpandedViews.put(getItemId(position), view);
-			} else if (mExpandedViews.containsValue(view) && !mVisibleIds.contains(getItemId(position))) {
-				mExpandedViews.remove(getItemId(position));
-			}
-		}
-
-		View titleView = getTitleView(position, viewHolder.titleView, viewHolder.titleParent);
-		if (titleView != viewHolder.titleView) {
-			viewHolder.titleParent.removeAllViews();
-			viewHolder.titleParent.addView(titleView);
-
-			if (mActionViewResId == 0) {
-				view.setOnClickListener(new TitleViewOnClickListener(viewHolder.contentParent));
-			} else {
-				view.findViewById(mActionViewResId).setOnClickListener(new TitleViewOnClickListener(viewHolder.contentParent));
-			}
-		}
-		viewHolder.titleView = titleView;
-
-		View contentView = getContentView(position, viewHolder.contentView, viewHolder.contentParent);
-		if (contentView != viewHolder.contentView) {
-			viewHolder.contentParent.removeAllViews();
-			viewHolder.contentParent.addView(contentView);
-		}
-		viewHolder.contentView = contentView;
-
-		viewHolder.contentParent.setVisibility(mVisibleIds.contains(getItemId(position)) ? View.VISIBLE : View.GONE);
-		viewHolder.contentParent.setTag(getItemId(position));
-
-		ViewGroup.LayoutParams layoutParams = viewHolder.contentParent.getLayoutParams();
-		layoutParams.height = LayoutParams.WRAP_CONTENT;
-		viewHolder.contentParent.setLayoutParams(layoutParams);
-
-		return view;
-	}
-
-	private ViewGroup createView(ViewGroup parent) {
-		ViewGroup view;
-
-		if (mViewLayoutResId == 0) {
-			view = new RootView(mContext);
-		} else {
-			view = (ViewGroup) LayoutInflater.from(mContext).inflate(mViewLayoutResId, parent, false);
-		}
-
-		return view;
-	}
-
-	/**
-	 * Get a View that displays the <b>title of the data</b> at the specified position
-	 * in the data set. You can either create a View manually or inflate it from
-	 * an XML layout file. When the View is inflated, the parent View (GridView,
-	 * ListView...) will apply default layout parameters unless you use
-	 * {@link android.view.LayoutInflater#inflate(int, android.view.ViewGroup, boolean)}
-	 * to specify a root view and to prevent attachment to the root.
-	 * 
-	 * @param position
-	 *            The position of the item within the adapter's data set of the
-	 *            item whose view we want.
-	 * @param convertView
-	 *            The old view to reuse, if possible. Note: You should check
-	 *            that this view is non-null and of an appropriate type before
-	 *            using. If it is not possible to convert this view to display
-	 *            the correct data, this method can create a new view.
-	 * @param parent
-	 *            The parent that this view will eventually be attached to
-	 * @return A View corresponding to the title of the data at the specified
-	 *         position.
-	 */
-	public abstract View getTitleView(int position, View convertView, ViewGroup parent);
-
-	/**
-	 * Get a View that displays the <b>content of the data</b> at the specified
-	 * position in the data set. You can either create a View manually or
-	 * inflate it from an XML layout file. When the View is inflated, the parent
-	 * View (GridView, ListView...) will apply default layout parameters unless
-	 * you use
-	 * {@link android.view.LayoutInflater#inflate(int, android.view.ViewGroup, boolean)}
-	 * to specify a root view and to prevent attachment to the root.
-	 * 
-	 * @param position
-	 *            The position of the item within the adapter's data set of the
-	 *            item whose view we want.
-	 * @param convertView
-	 *            The old view to reuse, if possible. Note: You should check
-	 *            that this view is non-null and of an appropriate type before
-	 *            using. If it is not possible to convert this view to display
-	 *            the correct data, this method can create a new view.
-	 * @param parent
-	 *            The parent that this view will eventually be attached to
-	 * @return A View corresponding to the content of the data at the specified
-	 *         position.
-	 */
-	public abstract View getContentView(int position, View convertView, ViewGroup parent);
-
-	private static class ViewHolder {
-		ViewGroup titleParent;
-		ViewGroup contentParent;
-		View titleView;
-		View contentView;
-	}
-
-	private static class RootView extends LinearLayout {
-
-		private ViewGroup mTitleViewGroup;
-		private ViewGroup mContentViewGroup;
-
-		public RootView(Context context) {
-			super(context);
-			init();
-		}
-
-		private void init() {
-			setOrientation(VERTICAL);
-
-			mTitleViewGroup = new FrameLayout(getContext());
-			mTitleViewGroup.setId(DEFAULTTITLEPARENTRESID);
-			addView(mTitleViewGroup);
-
-			mContentViewGroup = new FrameLayout(getContext());
-			mContentViewGroup.setId(DEFAULTCONTENTPARENTRESID);
-			addView(mContentViewGroup);
-		}
-	}
-
-	private class TitleViewOnClickListener implements View.OnClickListener {
-
-		private View mContentParent;
-
-		private TitleViewOnClickListener(View contentParent) {
-			this.mContentParent = contentParent;
-		}
-
-		@Override
-		public void onClick(View view) {
-			boolean isVisible = mContentParent.getVisibility() == View.VISIBLE;
-			if (!isVisible && mLimit > 0 && mVisibleIds.size() >= mLimit) {
-				Long firstId = mVisibleIds.get(0);
-				View firstEV = mExpandedViews.get(firstId);
-				if (firstEV != null) {
-					ViewHolder firstVH = ((ViewHolder) firstEV.getTag());
-					ViewGroup contentParent = firstVH.contentParent;
-					ExpandCollapseHelper.animateCollapsing(contentParent);
-					mExpandedViews.remove(mVisibleIds.get(0));
-				}
-				mVisibleIds.remove(mVisibleIds.get(0));
-			}
-
-			if (isVisible) {
-				ExpandCollapseHelper.animateCollapsing(mContentParent);
-				mVisibleIds.remove(mContentParent.getTag());
-				mExpandedViews.remove(mContentParent.getTag());
-			} else {
-				ExpandCollapseHelper.animateExpanding(mContentParent);
-				mVisibleIds.add((Long) mContentParent.getTag());
-
-				if (mLimit > 0) {
-					View parent = (View) mContentParent.getParent();
-					mExpandedViews.put((Long) mContentParent.getTag(), parent);
-				}
-			}
-		}
-	}
-
-	private static class ExpandCollapseHelper {
-
-		public static void animateCollapsing(final View view) {
-			int origHeight = view.getHeight();
-
-			ValueAnimator animator = createHeightAnimator(view, origHeight, 0);
-			animator.addListener(new AnimatorListenerAdapter() {
-
-				@Override
-				public void onAnimationEnd(Animator animator) {
-					view.setVisibility(View.GONE);
-				}
-			});
-			animator.start();
-		}
-
-		public static void animateExpanding(final View view) {
-			view.setVisibility(View.VISIBLE);
-
-			final int widthSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-			final int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
-			view.measure(widthSpec, heightSpec);
-
-			ValueAnimator animator = createHeightAnimator(view, 0, view.getMeasuredHeight());
-			animator.start();
-		}
-
-		public static ValueAnimator createHeightAnimator(final View view, int start, int end) {
-			ValueAnimator animator = ValueAnimator.ofInt(start, end);
-			animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-
-				@Override
-				public void onAnimationUpdate(ValueAnimator valueAnimator) {
-					int value = (Integer) valueAnimator.getAnimatedValue();
-
-					ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
-					layoutParams.height = value;
-					view.setLayoutParams(layoutParams);
-				}
-			});
-			return animator;
-		}
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissAdapter.java b/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissAdapter.java
deleted file mode 100644
index 0af50006..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissAdapter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.itemmanipulation;
-
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-
-import com.haarman.listviewanimations.ArrayAdapter;
-import com.haarman.listviewanimations.BaseAdapterDecorator;
-
-/**
- * Adds an option to swipe items in a ListView away. This does nothing more than
- * setting a new SwipeDismissListViewTouchListener to the ListView.
- */
-public class SwipeDismissAdapter extends BaseAdapterDecorator {
-
-	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);
-		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);
-	}
-
-	@Override
-	public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
-		super.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
-		if (mSwipeDismissListViewTouchListener != null) {
-			mSwipeDismissListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
-		}
-	}
-
-	@Override
-	public void notifyDataSetChanged() {
-		super.notifyDataSetChanged();
-		if (mSwipeDismissListViewTouchListener != null) {
-			mSwipeDismissListViewTouchListener.notifyDataSetChanged();
-		}
-	}
-
-	@Override
-	public void setTouchChild(int childResId) {
-		super.setTouchChild(childResId);
-		if (mSwipeDismissListViewTouchListener != null) {
-			mSwipeDismissListViewTouchListener.setTouchChild(childResId);
-		}
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissListViewTouchListener.java b/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissListViewTouchListener.java
deleted file mode 100644
index 18efd4c1..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeDismissListViewTouchListener.java
+++ /dev/null
@@ -1,452 +0,0 @@
-// THIS IS A BETA! I DON'T RECOMMEND USING IT IN PRODUCTION CODE JUST YET
-
-/*
- * Copyright 2012 Roman Nurik
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.itemmanipulation;
-
-//import static com.nineoldandroids.view.ViewHelper.setAlpha;
-import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import android.annotation.SuppressLint;
-import android.graphics.Rect;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.ListView;
-
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-/**
- * A {@link android.view.View.OnTouchListener} that makes the list items in a
- * {@link ListView} dismissable. {@link ListView} is given special treatment
- * because by default it handles touches for its list items... i.e. it's in
- * charge of drawing the pressed state (the list selector), handling list item
- * clicks, etc.
- *
- * For performance reasons, do not use this class directly, but use the {@link SwipeDismissAdapter}.
- */
-@SuppressLint("Recycle")
-public class SwipeDismissListViewTouchListener implements SwipeOnTouchListener {
-
-	// Cached ViewConfiguration and system-wide constant values
-	private int mSlop;
-	private int mMinFlingVelocity;
-	private int mMaxFlingVelocity;
-	protected long mAnimationTime;
-
-	// Fixed properties
-	private AbsListView mListView;
-	private OnDismissCallback mCallback;
-	private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero
-
-	// Transient properties
-	protected List<PendingDismissData> mPendingDismisses = new ArrayList<PendingDismissData>();
-	private int mDismissAnimationRefCount = 0;
-	private float mDownX;
-	private float mDownY;
-	private boolean mSwiping;
-
-	/**
-	 * A state to help determine the first loop/time we are swiping
-	 */
-	private boolean mSwipeInitiated;
-	private VelocityTracker mVelocityTracker;
-	private boolean mPaused;
-	private PendingDismissData mCurrentDismissData;
-
-	private int mVirtualListCount = -1;
-
-	private boolean mDisallowSwipe;
-	private boolean mIsParentHorizontalScrollContainer;
-	private int mResIdOfTouchChild;
-	private boolean mTouchChildTouched;
-
-	/**
-	 * Constructs a new swipe-to-dismiss touch listener for the given list view.
-	 *
-	 * @param listView
-	 *            The list view whose items should be dismissable.
-	 * @param callback
-	 *            The callback to trigger when the user has indicated that she
-	 *            would like to dismiss one or more list items.
-	 */
-	public SwipeDismissListViewTouchListener(AbsListView listView, OnDismissCallback callback, SwipeOnScrollListener onScroll) {
-		ViewConfiguration vc = ViewConfiguration.get(listView.getContext());
-		mSlop = vc.getScaledTouchSlop();
-		mMinFlingVelocity = vc.getScaledMinimumFlingVelocity() * 16;
-		mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
-		mAnimationTime = listView.getContext().getResources().getInteger(android.R.integer.config_shortAnimTime);
-		mListView = listView;
-		mCallback = callback;
-
-		onScroll.setTouchListener(this);
-		mListView.setOnScrollListener(onScroll);
-	}
-
-	public void disallowSwipe() {
-		mDisallowSwipe = true;
-	}
-
-	public void allowSwipe() {
-		mDisallowSwipe = false;
-	}
-
-	@Override
-	public boolean onTouch(View view, MotionEvent motionEvent) {
-		if (mVirtualListCount == -1) {
-			mVirtualListCount = mListView.getAdapter().getCount();
-		}
-
-		if (mViewWidth < 2) {
-			mViewWidth = mListView.getWidth();
-		}
-
-		switch (motionEvent.getActionMasked()) {
-		case MotionEvent.ACTION_DOWN:
-
-			mDisallowSwipe = false;
-			view.onTouchEvent(motionEvent);
-			return handleDownEvent(motionEvent);
-
-		case MotionEvent.ACTION_MOVE:
-
-			return handleMoveEvent(motionEvent);
-
-		case MotionEvent.ACTION_UP:
-		case MotionEvent.ACTION_CANCEL:
-
-			mDisallowSwipe = false;
-			mTouchChildTouched = false;
-			return handleUpEvent(motionEvent);
-
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isSwiping() {
-		return mSwiping;
-	}
-
-	/**
-	 * Factory to allow override of dismiss data
-	 */
-	protected PendingDismissData createPendingDismissData(int position, View view) {
-		return new PendingDismissData(position, view);
-	}
-
-	private boolean handleDownEvent(MotionEvent motionEvent) {
-		if (mPaused) {
-			return false;
-		}
-
-		mSwipeInitiated = false;
-
-		// Find the child view that was touched (perform a hit test)
-		Rect rect = new Rect();
-		int childCount = mListView.getChildCount();
-		int[] listViewCoords = new int[2];
-		mListView.getLocationOnScreen(listViewCoords);
-		int x = (int) motionEvent.getRawX() - listViewCoords[0];
-		int y = (int) motionEvent.getRawY() - listViewCoords[1];
-		View downView = null;
-		for (int i = 0; i < childCount && downView == null; i++) {
-			View child = mListView.getChildAt(i);
-			child.getHitRect(rect);
-			if (rect.contains(x, y)) {
-				downView = child;
-			}
-		}
-
-		if (downView != null) {
-			Log.d("SwipeDismissListViewTouchListener", "hit child !");
-			mDownX = motionEvent.getRawX();
-			mDownY = motionEvent.getRawY();
-			int downPosition = mListView.getPositionForView(downView);
-
-			mCurrentDismissData = createPendingDismissData(downPosition, downView);
-
-			if (mPendingDismisses.contains(mCurrentDismissData) || downPosition >= mVirtualListCount) {
-				// Cancel, we're already processing this position
-				mCurrentDismissData = null;
-				return false;
-			} else {
-				mTouchChildTouched = !mIsParentHorizontalScrollContainer && (mResIdOfTouchChild == 0);
-
-				if (mResIdOfTouchChild != 0) {
-					mIsParentHorizontalScrollContainer = false;
-
-					final View childView = downView.findViewById(mResIdOfTouchChild);
-					if (childView != null) {
-						final Rect childRect = getChildViewRect(mListView, childView);
-						if (childRect.contains((int) mDownX, (int) mDownY)) {
-							mTouchChildTouched = true;
-							mListView.requestDisallowInterceptTouchEvent(true);
-						}
-					}
-				}
-
-				if (mIsParentHorizontalScrollContainer) {
-					// Do it now and don't wait until the user moves more than
-					// the slop factor.
-					mTouchChildTouched = true;
-					mListView.requestDisallowInterceptTouchEvent(true);
-				}
-
-				mVelocityTracker = VelocityTracker.obtain();
-				mVelocityTracker.addMovement(motionEvent);
-			}
-		}
-		return true;
-	}
-
-	private Rect getChildViewRect(View parentView, View childView) {
-		final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
-		if (parentView == childView) {
-			return childRect;
-
-		}
-
-		ViewGroup parent;
-		while ((parent = (ViewGroup) childView.getParent()) != parentView) {
-			childRect.offset(parent.getLeft(), parent.getTop());
-			childView = parent;
-		}
-
-		return childRect;
-	}
-
-	private boolean handleMoveEvent(MotionEvent motionEvent) {
-		if (mPaused || (mVelocityTracker == null)) {
-			return false;
-		}
-
-		mVelocityTracker.addMovement(motionEvent);
-		float deltaX = motionEvent.getRawX() - mDownX;
-		float deltaY = motionEvent.getRawY() - mDownY;
-		if (mTouchChildTouched && !mDisallowSwipe && Math.abs(deltaX) > mSlop && Math.abs(deltaX) > Math.abs(deltaY)) {
-			mSwiping = true;
-			mListView.requestDisallowInterceptTouchEvent(true);
-
-			// Cancel ListView's touch (un-highlighting the item)
-			MotionEvent cancelEvent = MotionEvent.obtain(motionEvent);
-			cancelEvent.setAction(MotionEvent.ACTION_CANCEL | (motionEvent.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
-			mListView.onTouchEvent(cancelEvent);
-		}
-
-		if (mSwiping) {
-			if (!mSwipeInitiated) {
-				Log.d("SwipeDismissListViewTouchListener", "swipe/begin");
-			}
-			mSwipeInitiated = true;
-			ViewHelper.setTranslationX(mCurrentDismissData.view, deltaX);
-			ViewHelper.setAlpha(mCurrentDismissData.view, Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / mViewWidth)));
-			return true;
-		}
-		return false;
-	}
-
-	private boolean handleUpEvent(MotionEvent motionEvent) {
-		if (mVelocityTracker == null) {
-			return false;
-		}
-
-		float deltaX = motionEvent.getRawX() - mDownX;
-		mVelocityTracker.addMovement(motionEvent);
-		mVelocityTracker.computeCurrentVelocity(1000);
-		float velocityX = Math.abs(mVelocityTracker.getXVelocity());
-		float velocityY = Math.abs(mVelocityTracker.getYVelocity());
-		boolean dismiss = false;
-		boolean dismissRight = false;
-		if (Math.abs(deltaX) > mViewWidth / 2) {
-			dismiss = true;
-			dismissRight = deltaX > 0;
-		} else if (mMinFlingVelocity <= velocityX && velocityX <= mMaxFlingVelocity && velocityY < velocityX) {
-			dismiss = true;
-			dismissRight = mVelocityTracker.getXVelocity() > 0;
-		}
-
-		if (mSwiping) {
-			if (dismiss) {
-				Log.d("SwipeDismissListViewTouchListener", "swipe/confimed");
-				// mDownView gets null'd before animation ends
-				final PendingDismissData pendingDismissData = mCurrentDismissData;
-				++mDismissAnimationRefCount;
-
-				animate(mCurrentDismissData.view).translationX(dismissRight ? mViewWidth : -mViewWidth).alpha(0).setDuration(mAnimationTime).setListener(new AnimatorListenerAdapter() {
-
-					@Override
-					public void onAnimationEnd(Animator animation) {
-						onDismiss(pendingDismissData);
-					}
-				});
-
-				mVirtualListCount--;
-				mPendingDismisses.add(mCurrentDismissData);
-			} else {
-				Log.d("SwipeDismissListViewTouchListener", "swipe/cancelled");
-				// cancel
-				animate(mCurrentDismissData.view).translationX(0).alpha(1).setDuration(mAnimationTime).setListener(null);
-			}
-		}
-
-		mVelocityTracker.recycle();
-		mVelocityTracker = null;
-		mDownX = 0;
-		mCurrentDismissData = null;
-		mSwiping = false;
-		return false;
-	}
-
-	protected class PendingDismissData implements Comparable<PendingDismissData> {
-		public int position;
-		public View view;
-
-		public PendingDismissData(int position, View view) {
-			this.position = position;
-			this.view = view;
-		}
-
-		@Override
-		public int compareTo(PendingDismissData other) {
-			// Sort by descending position
-			return other.position - position;
-		}
-
-		@Override
-		public int hashCode() {
-			final int prime = 31;
-			int result = 1;
-			result = prime * result + position;
-			return result;
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			if (obj == null)
-				return false;
-			if (((Object) this).getClass() != obj.getClass())
-				return false;
-			PendingDismissData other = (PendingDismissData) obj;
-			if (position != other.position)
-				return false;
-			return true;
-		}
-
-	}
-
-	protected void onDismiss(final PendingDismissData data) {
-		// default behaviour
-		performDismiss(data);
-	}
-
-	protected void performDismiss(final PendingDismissData data) {
-		// Animate the dismissed list item to zero-height and fire the
-		// dismiss callback when all dismissed list item animations have
-		// completed.
-
-		Log.d("SwipeDismissListViewTouchListener", "performDismiss");
-
-		final ViewGroup.LayoutParams lp = data.view.getLayoutParams();
-		final int originalHeight = data.view.getHeight();
-
-		ValueAnimator animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime);
-
-		animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-			@Override
-			public void onAnimationUpdate(ValueAnimator valueAnimator) {
-				lp.height = (Integer) valueAnimator.getAnimatedValue();
-				data.view.setLayoutParams(lp);
-			}
-		});
-
-		animator.addListener(new AnimatorListenerAdapter() {
-			@Override
-			public void onAnimationEnd(Animator animation) {
-				finalizeDismiss();
-			}
-		});
-		animator.start();
-	}
-
-	/**
-	 * Here you can manage dismissed View.
-	 */
-	protected void recycleDismissedViewsItems(List<PendingDismissData> pendingDismisses) {
-		ViewGroup.LayoutParams lp;
-		for (PendingDismissData pendingDismiss : pendingDismisses) {
-			// Reset view presentation
-			ViewHelper.setAlpha(pendingDismiss.view, 1f);
-			ViewHelper.setTranslationX(pendingDismiss.view, 0);
-			lp = pendingDismiss.view.getLayoutParams();
-			lp.height = 0;
-			pendingDismiss.view.setLayoutParams(lp);
-		}
-	}
-
-	protected void finalizeDismiss() {
-		--mDismissAnimationRefCount;
-		if (mDismissAnimationRefCount == 0) {
-			// No active animations, process all pending dismisses.
-			// Sort by descending position
-			Collections.sort(mPendingDismisses);
-
-			int nrHeaders = 0;
-			if (mListView instanceof ListView) {
-				nrHeaders = ((ListView) mListView).getHeaderViewsCount();
-			}
-
-			int[] dismissPositions = new int[mPendingDismisses.size()];
-			for (int i = mPendingDismisses.size() - 1; i >= 0; i--) {
-				dismissPositions[i] = mPendingDismisses.get(i).position - nrHeaders;
-			}
-			mCallback.onDismiss(mListView, dismissPositions);
-
-			recycleDismissedViewsItems(mPendingDismisses);
-
-			mPendingDismisses.clear();
-		}
-	}
-
-	void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
-		mIsParentHorizontalScrollContainer = (mResIdOfTouchChild == 0) ? isParentHorizontalScrollContainer : false;
-	}
-
-	void setTouchChild(int childResId) {
-		mResIdOfTouchChild = childResId;
-		if (childResId != 0) {
-			setIsParentHorizontalScrollContainer(false);
-		}
-	}
-
-	public void notifyDataSetChanged() {
-		mVirtualListCount = mListView.getAdapter().getCount();
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeOnScrollListener.java b/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeOnScrollListener.java
deleted file mode 100644
index a57647ac..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeOnScrollListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * External default OnScrollListener allowing to custom onScrollListening events like loading more items.
- * Author: David Berlioz
- */
-
-package com.haarman.listviewanimations.itemmanipulation;
-
-import android.widget.AbsListView;
-
-public class SwipeOnScrollListener implements AbsListView.OnScrollListener {
-	
-	SwipeDismissListViewTouchListener mTouchListener;
-	
-	public void setTouchListener(SwipeDismissListViewTouchListener touchListener) {
-		mTouchListener = touchListener;
-	}
-	
-	@Override
-	public void onScrollStateChanged(AbsListView view, int scrollState) {
-		if (scrollState != AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
-			mTouchListener.disallowSwipe();
-		}
-	}
-
-	@Override
-	public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoAdapter.java b/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoAdapter.java
deleted file mode 100644
index 6450a0da..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoAdapter.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright 2013 Frankie Sardo
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.itemmanipulation.contextualundo;
-
-import static com.nineoldandroids.view.ViewHelper.setAlpha;
-import static com.nineoldandroids.view.ViewHelper.setTranslationX;
-import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.haarman.listviewanimations.BaseAdapterDecorator;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-/**
- * Warning: a stable id for each item in the adapter is required. The decorated
- * adapter should not try to cast convertView to a particular view. The
- * undoLayout should have the same height as the content row.
- * <p>
- * Usage: <br>
- * * Create a new instance of this class providing the {@link BaseAdapter} to wrap, the undo layout, and the undo button id, optionally a delay time millis, a count down TextView res id, and a delay in milliseconds before deleting the item .<br>
- * * Call {@link #setDeleteItemCallback(DeleteItemCallback)} to be notified of when items should be removed from your collection.<br>
- * * Set your {@link ListView} to this ContextualUndoAdapter, and set this ContextualUndoAdapter to your ListView.<br>
- */
-public class ContextualUndoAdapter extends BaseAdapterDecorator implements ContextualUndoListViewTouchListener.Callback {
-
-	private static final int ANIMATION_DURATION = 150;
-	private static final String EXTRA_ACTIVE_REMOVED_ID = "removedId";
-
-	private final int mUndoLayoutId;
-	private final int mUndoActionId;
-	private final int mCountDownTextViewResId;
-	private final int mAutoDeleteDelayMillis;
-
-	private long mDismissStartMillis;
-
-	private ContextualUndoView mCurrentRemovedView;
-	private long mCurrentRemovedId;
-
-	private Map<View, Animator> mActiveAnimators = new ConcurrentHashMap<View, Animator>();
-
-	private Handler mHandler;
-
-	private CountDownRunnable mCountDownRunnable;
-
-	private DeleteItemCallback mDeleteItemCallback;
-	private CountDownFormatter mCountDownFormatter;
-
-	private ContextualUndoListViewTouchListener mContextualUndoListViewTouchListener;
-
-	/**
-	 * Create a new ContextualUndoAdapter based on given parameters.
-	 *
-	 * @param baseAdapter  The {@link BaseAdapter} to wrap
-	 * @param undoLayoutId The layout resource id to show as undo
-	 * @param undoActionId The id of the component which undoes the dismissal
-	 *            The layout resource id to show as undo
-	 * @param undoActionId
-	 *            The id of the component which undoes the dismissal
-	 */
-	public ContextualUndoAdapter(BaseAdapter baseAdapter, int undoLayoutId, int undoActionId) {
-		this(baseAdapter, undoLayoutId, undoActionId, -1, -1, null);
-	}
-
-	/**
-	 * Create a new ContextualUndoAdapter based on given parameters.
-	 * Will automatically remove the swiped item after autoDeleteTimeMillis milliseconds.
-	 *
-	 * @param baseAdapter  The {@link BaseAdapter} to wrap
-	 * @param undoLayoutResId The layout resource id to show as undo
-	 * @param undoActionResId The id of the component which undoes the dismissal
-	 * @param autoDeleteTimeMillis The time in milliseconds that the adapter will wait for he user to hit undo before automatically deleting the item
-	 */
-	public ContextualUndoAdapter(BaseAdapter baseAdapter, int undoLayoutResId, int undoActionResId, int autoDeleteTimeMillis) {
-		this(baseAdapter, undoLayoutResId, undoActionResId, autoDeleteTimeMillis, -1, null);
-	}
-
-	/**
-	 * Create a new ContextualUndoAdapter based on given parameters.
-	 * Will automatically remove the swiped item after autoDeleteTimeMillis milliseconds.
-	 *
-	 * @param baseAdapter  The {@link BaseAdapter} to wrap
-	 * @param undoLayoutResId The layout resource id to show as undo
-	 * @param undoActionResId The resource id of the component which undoes the dismissal
-	 * @param autoDeleteTime The time in milliseconds that adapter will wait for user to hit undo before automatically deleting item
-	 * @param countDownTextViewResId The resource id of the {@link TextView} in the undoLayoutResId that will show the time left
-	 * @param countDownFormatter the {@link CountDownFormatter} which provides text to be shown in the {@link TextView} as specified by countDownTextViewResId
-	 */
-	public ContextualUndoAdapter(BaseAdapter baseAdapter, int undoLayoutResId, int undoActionResId, int autoDeleteTime, int countDownTextViewResId, CountDownFormatter countDownFormatter) {
-		super(baseAdapter);
-
-		mHandler = new Handler();
-		mCountDownRunnable = new CountDownRunnable();
-
-		mUndoLayoutId = undoLayoutResId;
-		mUndoActionId = undoActionResId;
-		mCurrentRemovedId = -1;
-		mAutoDeleteDelayMillis = autoDeleteTime;
-		mCountDownTextViewResId = countDownTextViewResId;
-		mCountDownFormatter = countDownFormatter;
-	}
-
-	@Override
-	public final View getView(int position, View convertView, ViewGroup parent) {
-		ContextualUndoView contextualUndoView = (ContextualUndoView) convertView;
-		if (contextualUndoView == null) {
-			contextualUndoView = new ContextualUndoView(parent.getContext(), mUndoLayoutId, mCountDownTextViewResId);
-			contextualUndoView.findViewById(mUndoActionId).setOnClickListener(new UndoListener(contextualUndoView));
-		}
-
-		View contentView = super.getView(position, contextualUndoView.getContentView(), contextualUndoView);
-		contextualUndoView.updateContentView(contentView);
-
-		long itemId = getItemId(position);
-
-		if (itemId == mCurrentRemovedId) {
-			contextualUndoView.displayUndo();
-			mCurrentRemovedView = contextualUndoView;
-			long millisLeft = mAutoDeleteDelayMillis - (System.currentTimeMillis() - mDismissStartMillis);
-			if (mCountDownFormatter != null) {
-				mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(millisLeft));
-			}
-		} else {
-			contextualUndoView.displayContentView();
-		}
-
-		contextualUndoView.setItemId(itemId);
-		return contextualUndoView;
-	}
-
-	@Override
-	public void setAbsListView(AbsListView listView) {
-		super.setAbsListView(listView);
-		mContextualUndoListViewTouchListener = new ContextualUndoListViewTouchListener(listView, this);
-		mContextualUndoListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer());
-		mContextualUndoListViewTouchListener.setTouchChild(getTouchChild());
-		listView.setOnTouchListener(mContextualUndoListViewTouchListener);
-		listView.setOnScrollListener(mContextualUndoListViewTouchListener.makeScrollListener());
-		listView.setRecyclerListener(new RecycleViewListener());
-	}
-
-	@Override
-	public void onViewSwiped(View dismissView, int dismissPosition) {
-		ContextualUndoView contextualUndoView = (ContextualUndoView) dismissView;
-		if (contextualUndoView.isContentDisplayed()) {
-			restoreViewPosition(contextualUndoView);
-			contextualUndoView.displayUndo();
-			removePreviousContextualUndoIfPresent();
-			setCurrentRemovedView(contextualUndoView);
-
-			if (mAutoDeleteDelayMillis > 0) {
-				startAutoDeleteTimer();
-			}
-		} else {
-			performRemovalIfNecessary();
-		}
-	}
-
-	private void startAutoDeleteTimer() {
-		mHandler.removeCallbacks(mCountDownRunnable);
-
-		if (mCountDownFormatter != null) {
-			mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(mAutoDeleteDelayMillis));
-		}
-
-		mDismissStartMillis = System.currentTimeMillis();
-		mHandler.postDelayed(mCountDownRunnable, Math.min(1000, mAutoDeleteDelayMillis));
-	}
-
-	private void restoreViewPosition(View view) {
-		setAlpha(view, 1f);
-		setTranslationX(view, 0);
-	}
-
-	private void removePreviousContextualUndoIfPresent() {
-		if (mCurrentRemovedView != null) {
-			performRemovalIfNecessary();
-		}
-	}
-
-	private void setCurrentRemovedView(ContextualUndoView currentRemovedView) {
-		mCurrentRemovedView = currentRemovedView;
-		mCurrentRemovedId = currentRemovedView.getItemId();
-	}
-
-	private void clearCurrentRemovedView() {
-		mCurrentRemovedView = null;
-		mCurrentRemovedId = -1;
-		mHandler.removeCallbacks(mCountDownRunnable);
-	}
-
-	@Override
-	public void onListScrolled() {
-		performRemovalIfNecessary();
-	}
-
-	private void performRemovalIfNecessary() {
-		if (mCurrentRemovedView != null && mCurrentRemovedView.getParent() != null) {
-			ValueAnimator animator = ValueAnimator.ofInt(mCurrentRemovedView.getHeight(), 1).setDuration(ANIMATION_DURATION);
-			animator.addListener(new RemoveViewAnimatorListenerAdapter(mCurrentRemovedView));
-			animator.addUpdateListener(new RemoveViewAnimatorUpdateListener(mCurrentRemovedView));
-			animator.start();
-			mActiveAnimators.put(mCurrentRemovedView, animator);
-			clearCurrentRemovedView();
-		}
-	}
-
-	/**
-	 * Set the DeleteItemCallback for this ContextualUndoAdapter. This is called when an item should be deleted from your collection.
-	 */
-	public void setDeleteItemCallback(DeleteItemCallback deleteItemCallback) {
-		mDeleteItemCallback = deleteItemCallback;
-	}
-
-	/**
-	 * This method should be called in your {@link Activity}'s {@link Activity#onSaveInstanceState(Bundle)} to remember dismissed statuses.
-	 * @param outState the {@link Bundle} provided by Activity.onSaveInstanceState(Bundle).
-	 */
-	public void onSaveInstanceState(Bundle outState) {
-		outState.putLong(EXTRA_ACTIVE_REMOVED_ID, mCurrentRemovedId);
-	}
-
-	/**
-	 * This method should be called in your {@link Activity#onRestoreInstanceState(Bundle)} to remember dismissed statuses.
-	 * @param savedInstanceState
-	 */
-	public void onRestoreInstanceState(Bundle savedInstanceState) {
-		mCurrentRemovedId = savedInstanceState.getLong(EXTRA_ACTIVE_REMOVED_ID, -1);
-	}
-
-	/**
-	 * Animate the item at given position away and show the undo {@link View}.
-	 * @param position the position.
-	 */
-	public void swipeViewAtPosition(int position) {
-		mCurrentRemovedId = getItemId(position);
-		for (int i = 0; i < getAbsListView().getChildCount(); i++) {
-			int positionForView = getAbsListView().getPositionForView(getAbsListView().getChildAt(i));
-			if (positionForView == position) {
-				swipeView(getAbsListView().getChildAt(i), positionForView);
-			}
-		}
-	}
-
-	private void swipeView(final View view, final int dismissPosition) {
-		ObjectAnimator animator = ObjectAnimator.ofFloat(view, "x", view.getMeasuredWidth());
-		animator.addListener(new AnimatorListenerAdapter() {
-
-			@Override
-			public void onAnimationEnd(Animator animator) {
-				onViewSwiped(view, dismissPosition);
-			}
-		});
-		animator.start();
-	}
-
-	@Override
-	public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
-		super.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
-		if (mContextualUndoListViewTouchListener != null) {
-			mContextualUndoListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
-		}
-	}
-
-	@Override
-	public void setTouchChild(int childResId) {
-		super.setTouchChild(childResId);
-		if (mContextualUndoListViewTouchListener != null) {
-			mContextualUndoListViewTouchListener.setTouchChild(childResId);
-		}
-	}
-
-	/**
-	 * A callback interface which is used to notify when items should be removed from the collection.
-	 */
-	public interface DeleteItemCallback {
-		/**
-		 * Called when an item should be removed from the collection.
-		 *
-		 * @param position
-		 *            the position of the item that should be removed.
-		 */
-		public void deleteItem(int position);
-	}
-
-	/**
-	 * A callback interface which is used to provide the text to display when counting down.
-	 */
-	public interface CountDownFormatter {
-		/**
-		 * Called each tick of the CountDownTimer
-		 * @param millisLeft time in milliseconds remaining before the item is automatically removed
-		 */
-		public String getCountDownString(final long millisLeft);
-	}
-
-	private class CountDownRunnable implements Runnable {
-
-		@Override
-		public void run() {
-			long millisRemaining = mAutoDeleteDelayMillis - (System.currentTimeMillis() - mDismissStartMillis);
-			if (mCountDownFormatter != null) {
-				mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(millisRemaining));
-			}
-
-			if (millisRemaining <= 0) {
-				performRemovalIfNecessary();
-			} else {
-				mHandler.postDelayed(this, Math.min(millisRemaining, 1000));
-			}
-		}
-	}
-
-	private class RemoveViewAnimatorListenerAdapter extends AnimatorListenerAdapter {
-
-		private final View mDismissView;
-		private final int mOriginalHeight;
-
-		public RemoveViewAnimatorListenerAdapter(View dismissView) {
-			mDismissView = dismissView;
-			mOriginalHeight = dismissView.getHeight();
-		}
-
-		@Override
-		public void onAnimationEnd(Animator animation) {
-			mActiveAnimators.remove(mDismissView);
-			restoreViewPosition(mDismissView);
-			restoreViewDimension(mDismissView);
-			deleteCurrentItem();
-		}
-
-		private void restoreViewDimension(View view) {
-			ViewGroup.LayoutParams lp;
-			lp = view.getLayoutParams();
-			lp.height = mOriginalHeight;
-			view.setLayoutParams(lp);
-		}
-
-		private void deleteCurrentItem() {
-			int position = getAbsListView().getPositionForView(mDismissView);
-
-			if (getAbsListView() instanceof ListView) {
-				position -= ((ListView) getAbsListView()).getHeaderViewsCount();
-			}
-
-			mDeleteItemCallback.deleteItem(position);
-		}
-	}
-
-	private class RemoveViewAnimatorUpdateListener implements ValueAnimator.AnimatorUpdateListener {
-
-		private final View mDismissView;
-		private final ViewGroup.LayoutParams mLayoutParams;
-
-		public RemoveViewAnimatorUpdateListener(View dismissView) {
-			mDismissView = dismissView;
-			mLayoutParams = dismissView.getLayoutParams();
-		}
-
-		@Override
-		public void onAnimationUpdate(ValueAnimator valueAnimator) {
-			mLayoutParams.height = (Integer) valueAnimator.getAnimatedValue();
-			mDismissView.setLayoutParams(mLayoutParams);
-		}
-	}
-
-	private class UndoListener implements View.OnClickListener {
-
-		private final ContextualUndoView mContextualUndoView;
-
-		public UndoListener(ContextualUndoView contextualUndoView) {
-			mContextualUndoView = contextualUndoView;
-		}
-
-		@Override
-		public void onClick(View v) {
-			clearCurrentRemovedView();
-			mContextualUndoView.displayContentView();
-			moveViewOffScreen();
-			animateViewComingBack();
-		}
-
-		private void moveViewOffScreen() {
-			ViewHelper.setTranslationX(mContextualUndoView, mContextualUndoView.getWidth());
-		}
-
-		private void animateViewComingBack() {
-			animate(mContextualUndoView).translationX(0).setDuration(ANIMATION_DURATION).setListener(null);
-		}
-	}
-
-	private class RecycleViewListener implements AbsListView.RecyclerListener {
-		@Override
-		public void onMovedToScrapHeap(View view) {
-			Animator animator = mActiveAnimators.get(view);
-			if (animator != null) {
-				animator.cancel();
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoListViewTouchListener.java b/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoListViewTouchListener.java
deleted file mode 100644
index 8e2da56e..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoListViewTouchListener.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2012 Roman Nurik
- * Copyright 2013 Frankie Sardo
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.haarman.listviewanimations.itemmanipulation.contextualundo;
-
-import static com.nineoldandroids.view.ViewHelper.setAlpha;
-import static com.nineoldandroids.view.ViewHelper.setTranslationX;
-import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
-import android.graphics.Rect;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-
-import com.haarman.listviewanimations.itemmanipulation.SwipeOnTouchListener;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-
-/**
- * An {@link OnTouchListener} for the {@link ContextualUndoAdapter}. Don't use
- * this class directly, use ContextualUndoAdapter to wrap your
- * {@link BaseAdapter}s.
- */
-public class ContextualUndoListViewTouchListener implements SwipeOnTouchListener {
-	// Cached ViewConfiguration and system-wide constant values
-	private int mSlop;
-	private int mMinFlingVelocity;
-	private int mMaxFlingVelocity;
-	private long mAnimationTime;
-
-	// Fixed properties
-	private AbsListView mListView;
-	private Callback mCallback;
-	private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero
-
-	// Transient properties
-	private float mDownX;
-	private float mDownY;
-	private boolean mSwiping;
-	private VelocityTracker mVelocityTracker;
-	private int mDownPosition;
-	private View mDownView;
-	private boolean mPaused;
-	private boolean mDisallowSwipe;
-
-	private boolean mIsParentHorizontalScrollContainer;
-	private int mResIdOfTouchChild;
-	private boolean mTouchChildTouched;
-
-	public interface Callback {
-
-		void onViewSwiped(View dismissView, int dismissPosition);
-
-		void onListScrolled();
-	}
-
-	public ContextualUndoListViewTouchListener(AbsListView listView, Callback callback) {
-		ViewConfiguration vc = ViewConfiguration.get(listView.getContext());
-		mSlop = vc.getScaledTouchSlop();
-		mMinFlingVelocity = vc.getScaledMinimumFlingVelocity();
-		mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
-		mAnimationTime = listView.getContext().getResources().getInteger(android.R.integer.config_shortAnimTime);
-		mListView = listView;
-		mCallback = callback;
-	}
-
-	public void setEnabled(boolean enabled) {
-		mPaused = !enabled;
-	}
-
-	public AbsListView.OnScrollListener makeScrollListener() {
-		return new AbsListView.OnScrollListener() {
-			@Override
-			public void onScrollStateChanged(AbsListView absListView, int scrollState) {
-				setEnabled(scrollState != AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
-				if (mPaused) {
-					mCallback.onListScrolled();
-				}
-				if (scrollState != AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
-					mDisallowSwipe = true;
-				}
-
-			}
-
-			@Override
-			public void onScroll(AbsListView absListView, int i, int i1, int i2) {
-			}
-		};
-	}
-
-	@Override
-	public boolean onTouch(View view, MotionEvent motionEvent) {
-		if (mViewWidth < 2) {
-			mViewWidth = mListView.getWidth();
-		}
-
-		switch (motionEvent.getActionMasked()) {
-		case MotionEvent.ACTION_DOWN: {
-			mDisallowSwipe = false;
-			if (mPaused) {
-				return false;
-			}
-
-			// Find the child view that was touched (perform a hit test)
-			Rect rect = new Rect();
-			int childCount = mListView.getChildCount();
-			int[] listViewCoords = new int[2];
-			mListView.getLocationOnScreen(listViewCoords);
-			int x = (int) motionEvent.getRawX() - listViewCoords[0];
-			int y = (int) motionEvent.getRawY() - listViewCoords[1];
-			View child;
-			for (int i = 0; i < childCount; i++) {
-				child = mListView.getChildAt(i);
-				child.getHitRect(rect);
-				if (rect.contains(x, y)) {
-					mDownView = child;
-					break;
-				}
-			}
-
-			if (mDownView != null && mDownView instanceof ContextualUndoView) {
-				mDownX = motionEvent.getRawX();
-				mDownY = motionEvent.getRawY();
-
-				mTouchChildTouched = !mIsParentHorizontalScrollContainer && (mResIdOfTouchChild == 0);
-
-				if (mResIdOfTouchChild != 0) {
-					mIsParentHorizontalScrollContainer = false;
-
-					final View childView = mDownView.findViewById(mResIdOfTouchChild);
-					if (childView != null) {
-						final Rect childRect = getChildViewRect(mListView, childView);
-						if (childRect.contains((int) mDownX, (int) mDownY)) {
-							mTouchChildTouched = true;
-							mListView.requestDisallowInterceptTouchEvent(true);
-						}
-					}
-				}
-
-				if (mIsParentHorizontalScrollContainer) {
-					// Do it now and don't wait until the user moves more than
-					// the slop factor.
-					mTouchChildTouched = true;
-					mListView.requestDisallowInterceptTouchEvent(true);
-				}
-
-				mDownY = motionEvent.getRawY();
-				mDownPosition = mListView.getPositionForView(mDownView);
-
-				mVelocityTracker = VelocityTracker.obtain();
-				mVelocityTracker.addMovement(motionEvent);
-			}
-			view.onTouchEvent(motionEvent);
-			return true;
-		}
-
-		case MotionEvent.ACTION_UP:
-		case MotionEvent.ACTION_CANCEL: {
-			mDisallowSwipe = false;
-			if (mVelocityTracker == null) {
-				break;
-			}
-
-			float deltaX = motionEvent.getRawX() - mDownX;
-			mVelocityTracker.addMovement(motionEvent);
-			mVelocityTracker.computeCurrentVelocity(1000);
-			float velocityX = Math.abs(mVelocityTracker.getXVelocity());
-			float velocityY = Math.abs(mVelocityTracker.getYVelocity());
-			boolean dismiss = false;
-			boolean dismissRight = false;
-			final float absDeltaX = Math.abs(deltaX);
-			if (absDeltaX > mViewWidth / 2) {
-				dismiss = true;
-				dismissRight = deltaX > 0;
-			} else if (mMinFlingVelocity <= velocityX && velocityX <= mMaxFlingVelocity && velocityY < velocityX && absDeltaX > mSlop) {
-				dismiss = true;
-				dismissRight = mVelocityTracker.getXVelocity() > 0;
-			}
-			if (dismiss) {
-				// dismiss
-				final View downView = mDownView; // mDownView gets none'd
-				// before animation ends
-				final int downPosition = mDownPosition;
-				animate(mDownView).translationX(dismissRight ? mViewWidth : -mViewWidth).alpha(0).setDuration(mAnimationTime).setListener(new AnimatorListenerAdapter() {
-					@Override
-					public void onAnimationEnd(Animator animation) {
-						mCallback.onViewSwiped(downView, downPosition);
-					}
-				});
-			} else {
-				// cancel
-				animate(mDownView).translationX(0).alpha(1).setDuration(mAnimationTime).setListener(null);
-			}
-
-			mVelocityTracker.recycle();
-			mVelocityTracker = null;
-			mDownX = 0;
-			mDownView = null;
-			mDownPosition = ListView.INVALID_POSITION;
-			mSwiping = false;
-			break;
-		}
-
-		case MotionEvent.ACTION_MOVE: {
-			if (mVelocityTracker == null || mPaused) {
-				break;
-			}
-
-			mVelocityTracker.addMovement(motionEvent);
-			float deltaX = motionEvent.getRawX() - mDownX;
-			float deltaY = motionEvent.getRawY() - mDownY;
-			if (mTouchChildTouched && !mDisallowSwipe && Math.abs(deltaX) > mSlop && Math.abs(deltaX) > Math.abs(deltaY)) {
-				mSwiping = true;
-				mListView.requestDisallowInterceptTouchEvent(true);
-
-				// Cancel ListView's touch (un-highlighting the item)
-				MotionEvent cancelEvent = MotionEvent.obtain(motionEvent);
-				cancelEvent.setAction(MotionEvent.ACTION_CANCEL | (motionEvent.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
-				mListView.onTouchEvent(cancelEvent);
-				cancelEvent.recycle();
-			}
-
-			if (mSwiping) {
-				setTranslationX(mDownView, deltaX);
-				setAlpha(mDownView, Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / mViewWidth)));
-				return true;
-			}
-			break;
-		}
-
-		}
-		return false;
-	}
-
-	@Override
-	public boolean isSwiping() {
-		return mSwiping;
-	}
-
-	private Rect getChildViewRect(View parentView, View childView) {
-		final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
-		if (parentView == childView) {
-			return childRect;
-
-		}
-
-		ViewGroup parent;
-		while ((parent = (ViewGroup) childView.getParent()) != parentView) {
-			childRect.offset(parent.getLeft(), parent.getTop());
-			childView = parent;
-		}
-
-		return childRect;
-	}
-
-	void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
-		mIsParentHorizontalScrollContainer = (mResIdOfTouchChild == 0) ? isParentHorizontalScrollContainer : false;
-	}
-
-	void setTouchChild(int childResId) {
-		mResIdOfTouchChild = childResId;
-		if (childResId != 0) {
-			setIsParentHorizontalScrollContainer(false);
-		}
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoView.java b/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoView.java
deleted file mode 100644
index e435a057..00000000
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/contextualundo/ContextualUndoView.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2013 Frankie Sardo
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.itemmanipulation.contextualundo;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-@SuppressLint("ViewConstructor")
-public class ContextualUndoView extends FrameLayout {
-
-	private View mUndoView;
-	private View mContentView;
-	private TextView mCountDownTV;
-
-	private long mItemId;
-
-	public ContextualUndoView(Context context, int undoLayoutResId, int countDownTextViewResId) {
-		super(context);
-		initUndo(undoLayoutResId, countDownTextViewResId);
-	}
-
-	private void initUndo(int undoLayoutResId, final int countDownTextViewResId) {
-		mUndoView = View.inflate(getContext(), undoLayoutResId, null);
-		addView(mUndoView);
-
-		if (countDownTextViewResId != -1) {
-			mCountDownTV = (TextView) mUndoView.findViewById(countDownTextViewResId);
-		}
-	}
-
-	public void updateCountDownTimer(String timerText) {
-		if (mCountDownTV != null) {
-			mCountDownTV.setText(timerText);
-		}
-	}
-
-	public void updateContentView(View contentView) {
-		if (mContentView == null) {
-			addView(contentView);
-		}
-		mContentView = contentView;
-	}
-
-	public View getContentView() {
-		return mContentView;
-	}
-
-	public void setItemId(long itemId) {
-		this.mItemId = itemId;
-	}
-
-	public long getItemId() {
-		return mItemId;
-	}
-
-	public boolean isContentDisplayed() {
-		return mContentView.getVisibility() == View.VISIBLE;
-	}
-
-	public void displayUndo() {
-		updateCountDownTimer("");
-		mContentView.setVisibility(View.GONE);
-		mUndoView.setVisibility(View.VISIBLE);
-	}
-
-	public void displayContentView() {
-		mContentView.setVisibility(View.VISIBLE);
-		mUndoView.setVisibility(View.GONE);
-	}
-}
\ No newline at end of file
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/AnimationAdapter.java b/library/src/com/haarman/listviewanimations/swinginadapters/AnimationAdapter.java
deleted file mode 100644
index fa9e75c0..00000000
--- a/library/src/com/haarman/listviewanimations/swinginadapters/AnimationAdapter.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.swinginadapters;
-
-import android.annotation.SuppressLint;
-import android.os.Build;
-import android.util.SparseArray;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-
-import com.haarman.listviewanimations.BaseAdapterDecorator;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorSet;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-/**
- * A {@link BaseAdapterDecorator} class which applies multiple {@link Animator}s at once to
- * views when they are first shown. The Animators applied include the animations
- * specified in {@link #getAnimators(ViewGroup, View)}, plus an alpha transition.
- */
-public abstract class AnimationAdapter extends BaseAdapterDecorator {
-
-	protected static final long DEFAULTANIMATIONDELAYMILLIS = 100;
-	protected static final long DEFAULTANIMATIONDURATIONMILLIS = 300;
-	private static final long INITIALDELAYMILLIS = 150;
-
-	private SparseArray<Animator> mAnimators;
-	private long mAnimationStartMillis;
-	private int mFirstAnimatedPosition;
-	private int mLastAnimatedPosition;
-	private boolean mHasParentAnimationAdapter;
-	private boolean mShouldAnimate = true;
-
-	private long mInitialDelayMillis = INITIALDELAYMILLIS;
-	private long mAnimationDelayMillis = DEFAULTANIMATIONDELAYMILLIS;
-	private long mAnimationDurationMillis = DEFAULTANIMATIONDURATIONMILLIS;
-
-	public AnimationAdapter(BaseAdapter baseAdapter) {
-		super(baseAdapter);
-		mAnimators = new SparseArray<Animator>();
-
-		mAnimationStartMillis = -1;
-		mLastAnimatedPosition = -1;
-
-		if (baseAdapter instanceof AnimationAdapter) {
-			((AnimationAdapter) baseAdapter).setHasParentAnimationAdapter(true);
-		}
-	}
-
-	/**
-	 * Call this method to reset animation status on all views. The next time
-	 * {@link #notifyDataSetChanged()} is called on the base adapter, all views will
-	 * animate again. Will also call {@link #setShouldAnimate(boolean)} with a value of true.
-	 */
-	public void reset() {
-		mAnimators.clear();
-		mFirstAnimatedPosition = 0;
-		mLastAnimatedPosition = -1;
-		mAnimationStartMillis = -1;
-		mShouldAnimate = true;
-
-		if (getDecoratedBaseAdapter() instanceof AnimationAdapter) {
-			((AnimationAdapter) getDecoratedBaseAdapter()).reset();
-		}
-	}
-
-	/**
-	 * Set whether to animate the {@link View}s or not.
-	 * @param shouldAnimate true if the Views should be animated.
-	 */
-	public void setShouldAnimate(boolean shouldAnimate) {
-		mShouldAnimate = shouldAnimate;
-	}
-
-	/**
-	 * Set the starting position for which items should animate. Given position will animate as well.
-	 * Will also call setShouldAnimate(true).
-	 * @param position the position.
-	 */
-	public void setShouldAnimateFromPosition(int position) {
-		mShouldAnimate = true;
-		mFirstAnimatedPosition = position - 1;
-		mLastAnimatedPosition = position - 1;
-	}
-
-	/**
-	 * Set the starting position for which items should animate as the first position which isn't currently visible on screen.
-	 * This call is also valid when the {@link View}s haven't been drawn yet.
-	 * Will also call setShouldAnimate(true).
-	 */
-	public void setShouldAnimateNotVisible() {
-		if (getAbsListView() == null) {
-			throw new IllegalStateException("Call setListView() on this AnimationAdapter before setShouldAnimateNotVisible()!");
-		}
-
-		mShouldAnimate = true;
-		mFirstAnimatedPosition = getAbsListView().getLastVisiblePosition();
-		mLastAnimatedPosition = getAbsListView().getLastVisiblePosition();
-	}
-
-	@Override
-	public final View getView(int position, View convertView, ViewGroup parent) {
-		if (!mHasParentAnimationAdapter) {
-			if (getAbsListView() == null) {
-				throw new IllegalStateException("Call setListView() on this AnimationAdapter before setAdapter()!");
-			}
-
-			if (convertView != null) {
-				cancelExistingAnimation(position, convertView);
-			}
-		}
-
-		View itemView = super.getView(position, convertView, parent);
-
-		if (!mHasParentAnimationAdapter) {
-			animateViewIfNecessary(position, itemView, parent);
-		}
-		return itemView;
-	}
-
-	private void cancelExistingAnimation(int position, View convertView) {
-		int hashCode = convertView.hashCode();
-		Animator animator = mAnimators.get(hashCode);
-		if (animator != null) {
-			animator.end();
-			mAnimators.remove(hashCode);
-		}
-	}
-
-	private void animateViewIfNecessary(int position, View view, ViewGroup parent) {
-		boolean isMeasuringGridViewItem = parent.getHeight() == 0;
-
-		if (position > mLastAnimatedPosition && mShouldAnimate && !isMeasuringGridViewItem) {
-			animateView(position, parent, view);
-			mLastAnimatedPosition = position;
-		}
-	}
-
-	private void animateView(int position, ViewGroup parent, View view) {
-		if (mAnimationStartMillis == -1) {
-			mAnimationStartMillis = System.currentTimeMillis();
-		}
-
-		ViewHelper.setAlpha(view, 0);
-
-		Animator[] childAnimators;
-		if (mDecoratedBaseAdapter instanceof AnimationAdapter) {
-			childAnimators = ((AnimationAdapter) mDecoratedBaseAdapter).getAnimators(parent, view);
-		} else {
-			childAnimators = new Animator[0];
-		}
-		Animator[] animators = getAnimators(parent, view);
-		Animator alphaAnimator = ObjectAnimator.ofFloat(view, "alpha", 0, 1);
-
-		AnimatorSet set = new AnimatorSet();
-		set.playTogether(concatAnimators(childAnimators, animators, alphaAnimator));
-		set.setStartDelay(calculateAnimationDelay());
-		set.setDuration(getAnimationDurationMillis());
-		set.start();
-
-		mAnimators.put(view.hashCode(), set);
-	}
-
-	private Animator[] concatAnimators(Animator[] childAnimators, Animator[] animators, Animator alphaAnimator) {
-		Animator[] allAnimators = new Animator[childAnimators.length + animators.length + 1];
-		int i;
-
-		for (i = 0; i < animators.length; ++i) {
-			allAnimators[i] = animators[i];
-		}
-
-		for (int j = 0; j < childAnimators.length; ++j) {
-			allAnimators[i] = childAnimators[j];
-			++i;
-		}
-
-		allAnimators[allAnimators.length - 1] = alphaAnimator;
-		return allAnimators;
-	}
-
-	@SuppressLint("NewApi")
-	private long calculateAnimationDelay() {
-		long delay;
-		int numberOfItems = getAbsListView().getLastVisiblePosition() - getAbsListView().getFirstVisiblePosition();
-		if (numberOfItems + 1 < mLastAnimatedPosition) {
-			delay = getAnimationDelayMillis();
-
-			if (getAbsListView() instanceof GridView && Build.VERSION.SDK_INT >= 11) {
-				delay += getAnimationDelayMillis() * ((mLastAnimatedPosition + 1) % ((GridView) getAbsListView()).getNumColumns());
-			}
-		} else {
-			long delaySinceStart = (mLastAnimatedPosition - mFirstAnimatedPosition + 1) * getAnimationDelayMillis();
-			delay = mAnimationStartMillis + getInitialDelayMillis() + delaySinceStart - System.currentTimeMillis();
-		}
-		return Math.max(0, delay);
-	}
-
-	/**
-	 * Set whether this AnimationAdapter is encapsulated by another
-	 * AnimationAdapter. When this is set to true, this AnimationAdapter does
-	 * not apply any animations to the views. Should not be set explicitly, the
-	 * AnimationAdapter class manages this by itself.
-	 */
-	public void setHasParentAnimationAdapter(boolean hasParentAnimationAdapter) {
-		mHasParentAnimationAdapter = hasParentAnimationAdapter;
-	}
-
-	/**
-	 * Get the delay in milliseconds before the first animation should start. Defaults to {@value #INITIALDELAYMILLIS}.
-	 */
-	protected long getInitialDelayMillis() {
-		return mInitialDelayMillis;
-	}
-
-	/**
-	 * Set the delay in milliseconds before the first animation should start. Defaults to {@value #INITIALDELAYMILLIS}.
-	 * @param delayMillis the time in milliseconds.
-	 */
-	public void setInitialDelayMillis(long delayMillis) {
-		mInitialDelayMillis = delayMillis;
-	}
-
-	/**
-	 * Get the delay in milliseconds before an animation of a view should start. Defaults to {@value #DEFAULTANIMATIONDELAYMILLIS}.
-	 */
-	protected long getAnimationDelayMillis() {
-		return mAnimationDelayMillis;
-	}
-
-	/**
-	 * Set the delay in milliseconds before an animation of a view should start. Defaults to {@value #DEFAULTANIMATIONDELAYMILLIS}.
-	 * @param delayMillis the time in milliseconds.
-	 */
-	public void setAnimationDelayMillis(long delayMillis) {
-		mAnimationDelayMillis = delayMillis;
-	}
-
-	/**
-	 * Get the duration of the animation in milliseconds. Defaults to {@value #DEFAULTANIMATIONDURATIONMILLIS}.
-	 */
-	protected long getAnimationDurationMillis() {
-		return mAnimationDurationMillis;
-	}
-
-	/**
-	 * Set the duration of the animation in milliseconds. Defaults to {@value #DEFAULTANIMATIONDURATIONMILLIS}.
-	 * @param durationMillis the time in milliseconds.
-	 */
-	public void setAnimationDurationMillis(long durationMillis) {
-		mAnimationDurationMillis = durationMillis;
-	}
-
-	/**
-	 * Get the Animators to apply to the views. In addition to the returned
-	 * Animators, an alpha transition will be applied to the view.
-	 * 
-	 * @param parent
-	 *            The parent of the view
-	 * @param view
-	 *            The view that will be animated, as retrieved by getView()
-	 */
-	public abstract Animator[] getAnimators(ViewGroup parent, View view);
-}
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java b/library/src/com/haarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java
deleted file mode 100644
index 353faece..00000000
--- a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.haarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.haarman.listviewanimations.swinginadapters.AnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-
-public class AlphaInAnimationAdapter extends AnimationAdapter {
-
-	public AlphaInAnimationAdapter(BaseAdapter baseAdapter) {
-		super(baseAdapter);
-	}
-
-	@Override
-	protected long getAnimationDelayMillis() {
-		return DEFAULTANIMATIONDELAYMILLIS;
-	}
-
-	@Override
-	protected long getAnimationDurationMillis() {
-		return DEFAULTANIMATIONDURATIONMILLIS;
-	}
-
-	@Override
-	public Animator[] getAnimators(ViewGroup parent, View view) {
-		return new Animator[0];
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/ScaleInAnimationAdapter.java b/library/src/com/haarman/listviewanimations/swinginadapters/prepared/ScaleInAnimationAdapter.java
deleted file mode 100644
index 72ec1fec..00000000
--- a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/ScaleInAnimationAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.haarman.listviewanimations.swinginadapters.AnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ObjectAnimator;
-
-public class ScaleInAnimationAdapter extends AnimationAdapter {
-
-	private static final float DEFAULTSCALEFROM = 0.8f;
-
-	private float mScaleFrom;
-	private long mAnimationDelayMillis;
-	private long mAnimationDurationMillis;
-
-	public ScaleInAnimationAdapter(BaseAdapter baseAdapter) {
-		this(baseAdapter, DEFAULTSCALEFROM);
-	}
-
-	public ScaleInAnimationAdapter(BaseAdapter baseAdapter, float scaleFrom) {
-		this(baseAdapter, scaleFrom, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public ScaleInAnimationAdapter(BaseAdapter baseAdapter, float scaleFrom, long animationDelayMillis, long animationDurationMillis) {
-		super(baseAdapter);
-		mScaleFrom = scaleFrom;
-		mAnimationDelayMillis = animationDelayMillis;
-		mAnimationDurationMillis = animationDurationMillis;
-	}
-
-	@Override
-	protected long getAnimationDelayMillis() {
-		return mAnimationDelayMillis;
-	}
-
-	@Override
-	protected long getAnimationDurationMillis() {
-		return mAnimationDurationMillis;
-	}
-
-	@Override
-	public Animator[] getAnimators(ViewGroup parent, View view) {
-		ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, "scaleX", mScaleFrom, 1f);
-		ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, "scaleY", mScaleFrom, 1f);
-		return new ObjectAnimator[] { scaleX, scaleY };
-	}
-
-}
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java b/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java
deleted file mode 100644
index f525e71b..00000000
--- a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.haarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ObjectAnimator;
-
-/**
- * An implementation of the AnimationAdapter class which applies a
- * swing-in-from-bottom-animation to views.
- */
-public class SwingBottomInAnimationAdapter extends SingleAnimationAdapter {
-
-	private final long mAnimationDelayMillis;
-	private final long mAnimationDurationMillis;
-
-	public SwingBottomInAnimationAdapter(BaseAdapter baseAdapter) {
-		this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public SwingBottomInAnimationAdapter(BaseAdapter baseAdapter, long animationDelayMillis) {
-		this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public SwingBottomInAnimationAdapter(BaseAdapter baseAdapter, long animationDelayMillis, long animationDurationMillis) {
-		super(baseAdapter);
-		mAnimationDelayMillis = animationDelayMillis;
-		mAnimationDurationMillis = animationDurationMillis;
-	}
-
-	@Override
-	protected long getAnimationDelayMillis() {
-		return mAnimationDelayMillis;
-	}
-
-	@Override
-	protected long getAnimationDurationMillis() {
-		return mAnimationDurationMillis;
-	}
-
-	@Override
-	protected Animator getAnimator(ViewGroup parent, View view) {
-		return ObjectAnimator.ofFloat(view, "translationY", 500, 0);
-	}
-
-}
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingLeftInAnimationAdapter.java b/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingLeftInAnimationAdapter.java
deleted file mode 100644
index 2a45c78a..00000000
--- a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingLeftInAnimationAdapter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.haarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ObjectAnimator;
-
-/**
- * An implementation of the AnimationAdapter class which applies a
- * swing-in-from-the-left-animation to views.
- */
-public class SwingLeftInAnimationAdapter extends SingleAnimationAdapter {
-
-	private final long mAnimationDelayMillis;
-	private final long mAnimationDurationMillis;
-
-	public SwingLeftInAnimationAdapter(BaseAdapter baseAdapter) {
-		this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public SwingLeftInAnimationAdapter(BaseAdapter baseAdapter, long animationDelayMillis) {
-		this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public SwingLeftInAnimationAdapter(BaseAdapter baseAdapter, long animationDelayMillis, long animationDurationMillis) {
-		super(baseAdapter);
-		mAnimationDelayMillis = animationDelayMillis;
-		mAnimationDurationMillis = animationDurationMillis;
-	}
-
-	@Override
-	protected long getAnimationDelayMillis() {
-		return mAnimationDelayMillis;
-	}
-
-	@Override
-	protected long getAnimationDurationMillis() {
-		return mAnimationDurationMillis;
-	}
-
-	@Override
-	protected Animator getAnimator(ViewGroup parent, View view) {
-		return ObjectAnimator.ofFloat(view, "translationX", 0 - parent.getWidth(), 0);
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java b/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java
deleted file mode 100644
index 30e40b2a..00000000
--- a/library/src/com/haarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013 Niek Haarman
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.haarman.listviewanimations.swinginadapters.prepared;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.haarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.ObjectAnimator;
-
-/**
- * An implementation of the AnimationAdapter class which applies a
- * swing-in-from-the-right-animation to views.
- */
-public class SwingRightInAnimationAdapter extends SingleAnimationAdapter {
-
-	private final long mAnimationDelayMillis;
-	private final long mAnimationDurationMillis;
-
-	public SwingRightInAnimationAdapter(BaseAdapter baseAdapter) {
-		this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public SwingRightInAnimationAdapter(BaseAdapter baseAdapter, long animationDelayMillis) {
-		this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
-	}
-
-	public SwingRightInAnimationAdapter(BaseAdapter baseAdapter, long animationDelayMillis, long animationDurationMillis) {
-		super(baseAdapter);
-		mAnimationDelayMillis = animationDelayMillis;
-		mAnimationDurationMillis = animationDurationMillis;
-	}
-
-	@Override
-	protected long getAnimationDelayMillis() {
-		return mAnimationDelayMillis;
-	}
-
-	@Override
-	protected long getAnimationDurationMillis() {
-		return mAnimationDurationMillis;
-	}
-
-	@Override
-	protected Animator getAnimator(ViewGroup parent, View view) {
-		return ObjectAnimator.ofFloat(view, "translationX", parent.getWidth(), 0);
-	}
-}
diff --git a/library/src/com/haarman/listviewanimations/view/DynamicListView.java b/library/src/com/haarman/listviewanimations/view/DynamicListView.java
deleted file mode 100644
index 20ec2093..00000000
--- a/library/src/com/haarman/listviewanimations/view/DynamicListView.java
+++ /dev/null
@@ -1,750 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.haarman.listviewanimations.view;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.HeaderViewListAdapter;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-
-import com.haarman.listviewanimations.itemmanipulation.SwipeOnTouchListener;
-import com.nineoldandroids.animation.Animator;
-import com.nineoldandroids.animation.AnimatorListenerAdapter;
-import com.nineoldandroids.animation.ObjectAnimator;
-import com.nineoldandroids.animation.TypeEvaluator;
-import com.nineoldandroids.animation.ValueAnimator;
-import com.nineoldandroids.view.ViewHelper;
-
-/**
- * The DynamicListView is an extension of {@link ListView} that supports cell dragging
- * and swapping.
- * </p>
- * Make sure your adapter has stable ids, and override {@link ListAdapter#hasStableIds()} to return true.</br>
- * </p>
- * This layout is in charge of positioning the hover cell in the correct location
- * on the screen in response to user touch events. It uses the position of the
- * hover cell to determine when two cells should be swapped. If two cells should
- * be swapped, all the corresponding data set and layout changes are handled here.
- * </p>
- * If no cell is selected, all the touch events are passed down to the ListView
- * and behave normally. If one of the items in the ListView experiences a
- * long press event, the contents of its current visible state are captured as
- * a bitmap and its visibility is set to INVISIBLE. A hover cell is then created and
- * added to this layout as an overlaying BitmapDrawable above the ListView. Once the
- * hover cell is translated some distance to signify an item swap, a data set change
- * accompanied by animation takes place. When the user releases the hover cell,
- * it animates into its corresponding position in the ListView.
- * </p>
- * When the hover cell is either above or below the bounds of the ListView, this
- * ListView also scrolls on its own so as to reveal additional content.
- * </p>
- * See http://youtu.be/_BZIvjMgH-Q
- */
-public class DynamicListView extends ListView {
-
-	public interface OnHoverCellListener {
-		public Drawable onHoverCellCreated(Drawable hoverCellDrawable);
-	}
-
-	private final int SMOOTH_SCROLL_AMOUNT_AT_EDGE = 15;
-	private final int MOVE_DURATION = 150;
-
-	private int mLastEventY = -1, mLastEventX = -1;
-
-	private int mDownY = -1;
-	private int mDownX = -1;
-
-	private int mTotalOffset = 0;
-
-	private boolean mCellIsMobile = false;
-	private boolean mIsMobileScrolling = false;
-	private int mSmoothScrollAmountAtEdge = 0;
-
-	private final int INVALID_ID = -1;
-	private long mAboveItemId = INVALID_ID;
-	private long mMobileItemId = INVALID_ID;
-	private long mBelowItemId = INVALID_ID;
-
-	private Drawable mHoverCell;
-	private Rect mHoverCellCurrentBounds;
-	private Rect mHoverCellOriginalBounds;
-
-	private final int INVALID_POINTER_ID = -1;
-	private int mActivePointerId = INVALID_POINTER_ID;
-
-	private boolean mIsWaitingForScrollFinish = false;
-	private int mScrollState = OnScrollListener.SCROLL_STATE_IDLE;
-
-	private OnTouchListener mOnTouchListener;
-	private boolean mIsParentHorizontalScrollContainer;
-	private int mResIdOfDynamicTouchChild;
-	private boolean mDynamicTouchChildTouched;
-	private int mSlop;
-
-	private boolean mSkipCallingOnTouchListener;
-
-	private OnHoverCellListener mOnHoverCellListener;
-
-	public DynamicListView(Context context) {
-		super(context);
-		init(context);
-	}
-
-	public DynamicListView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		init(context);
-	}
-
-	public DynamicListView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		init(context);
-	}
-
-	public void init(Context context) {
-		setOnItemLongClickListener(mOnItemLongClickListener);
-		setOnScrollListener(mScrollListener);
-		DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-		mSmoothScrollAmountAtEdge = (int) (SMOOTH_SCROLL_AMOUNT_AT_EDGE / metrics.density);
-		ViewConfiguration vc = ViewConfiguration.get(getContext());
-		mSlop = vc.getScaledTouchSlop();
-	}
-
-	public void setAdapter(BaseAdapter adapter) {
-		super.setAdapter(adapter);
-	}
-
-	@Override
-	@Deprecated
-	/**
-	 * @deprecated use #setAdapter(BaseAdapter) instead.
-	 */
-	public void setAdapter(ListAdapter adapter) {
-		throw new IllegalArgumentException("DynamicListView needs a BaseAdapter!");
-	}
-
-	/**
-	 * Listens for long clicks on any items in the listview. When a cell has
-	 * been selected, the hover cell is created and set up.
-	 */
-	private OnItemLongClickListener mOnItemLongClickListener = new OnItemLongClickListener() {
-		public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int pos, long id) {
-			if (mResIdOfDynamicTouchChild == 0) {
-				mDynamicTouchChildTouched = true;
-				makeCellMobile();
-				return true;
-			}
-			return false;
-		}
-	};
-
-	private void makeCellMobile() {
-		int position = pointToPosition(mDownX, mDownY);
-		int itemNum = position - getFirstVisiblePosition();
-		View selectedView = getChildAt(itemNum);
-		if (selectedView == null) {
-			return;
-		}
-
-		mTotalOffset = 0;
-
-		mMobileItemId = getAdapter().getItemId(position);
-		mHoverCell = getAndAddHoverView(selectedView);
-		if (mOnHoverCellListener != null) {
-			mHoverCell = mOnHoverCellListener.onHoverCellCreated(mHoverCell);
-		}
-		selectedView.setVisibility(INVISIBLE);
-
-		mCellIsMobile = true;
-		getParent().requestDisallowInterceptTouchEvent(true);
-
-		updateNeighborViewsForID(mMobileItemId);
-
-	}
-
-	/**
-	 * Creates the hover cell with the appropriate bitmap and of appropriate
-	 * size. The hover cell's BitmapDrawable is drawn on top of the bitmap every
-	 * single time an invalidate call is made.
-	 */
-	private BitmapDrawable getAndAddHoverView(View v) {
-
-		int w = v.getWidth();
-		int h = v.getHeight();
-		int top = v.getTop();
-		int left = v.getLeft();
-
-		Bitmap b = getBitmapFromView(v);
-
-		BitmapDrawable drawable = new BitmapDrawable(getResources(), b);
-
-		mHoverCellOriginalBounds = new Rect(left, top, left + w, top + h);
-		mHoverCellCurrentBounds = new Rect(mHoverCellOriginalBounds);
-
-		drawable.setBounds(mHoverCellCurrentBounds);
-
-		return drawable;
-	}
-
-	/** Returns a bitmap showing a screenshot of the view passed in. */
-	private Bitmap getBitmapFromView(View v) {
-		Bitmap bitmap = Bitmap.createBitmap(v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
-		Canvas canvas = new Canvas(bitmap);
-		v.draw(canvas);
-		return bitmap;
-	}
-
-	/**
-	 * Stores a reference to the views above and below the item currently
-	 * corresponding to the hover cell. It is important to note that if this
-	 * item is either at the top or bottom of the list, mAboveItemId or mBelowItemId
-	 * may be invalid.
-	 */
-	private void updateNeighborViewsForID(long itemID) {
-		int position = getPositionForID(itemID);
-		ListAdapter adapter = getAdapter();
-		if (!adapter.hasStableIds()) {
-			throw new IllegalStateException("Adapter doesn't have stable ids! Make sure your adapter has stable ids, and override hasStableIds() to return true.");
-		}
-
-		mAboveItemId = position - 1 >= 0 ? adapter.getItemId(position - 1) : INVALID_ROW_ID;
-		mBelowItemId = position + 1 < adapter.getCount() ? adapter.getItemId(position + 1) : INVALID_ROW_ID;
-	}
-
-	/** Retrieves the view in the list corresponding to itemID */
-	public View getViewForID(long itemID) {
-		int firstVisiblePosition = getFirstVisiblePosition();
-		ListAdapter adapter = getAdapter();
-		if (!adapter.hasStableIds()) {
-			throw new IllegalStateException("Adapter doesn't have stable ids! Make sure your adapter has stable ids, and override hasStableIds() to return true.");
-		}
-
-		for (int i = 0; i < getChildCount(); i++) {
-			View v = getChildAt(i);
-			int position = firstVisiblePosition + i;
-			long id = adapter.getItemId(position);
-			if (id == itemID) {
-				return v;
-			}
-		}
-		return null;
-	}
-
-	/** Retrieves the position in the list corresponding to itemID */
-	public int getPositionForID(long itemID) {
-		View v = getViewForID(itemID);
-		if (v == null) {
-			return -1;
-		} else {
-			return getPositionForView(v);
-		}
-	}
-
-	/**
-	 *  dispatchDraw gets invoked when all the child views are about to be drawn.
-	 *  By overriding this method, the hover cell (BitmapDrawable) can be drawn
-	 *  over the listview's items whenever the listview is redrawn.
-	 */
-	@Override
-	protected void dispatchDraw(Canvas canvas) {
-		super.dispatchDraw(canvas);
-		if (mHoverCell != null) {
-			mHoverCell.draw(canvas);
-		}
-	}
-
-	@Override
-	public void setOnTouchListener(OnTouchListener l) {
-		mOnTouchListener = l;
-	}
-
-	public void setOnHoverCellListener(OnHoverCellListener onHoverCellListener) {
-		mOnHoverCellListener = onHoverCellListener;
-	}
-
-	private Rect getChildViewRect(View parentView, View childView) {
-		final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
-		if (parentView == childView) {
-			return childRect;
-		}
-
-		ViewGroup parent;
-		while ((parent = (ViewGroup) childView.getParent()) != parentView) {
-			childRect.offset(parent.getLeft(), parent.getTop());
-			childView = parent;
-		}
-
-		return childRect;
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		if (mSkipCallingOnTouchListener) {
-			return super.onTouchEvent(event);
-		}
-
-		if (mOnTouchListener instanceof SwipeOnTouchListener) {
-			if (((SwipeOnTouchListener) mOnTouchListener).isSwiping()) {
-				mSkipCallingOnTouchListener = true;
-				boolean retVal = mOnTouchListener.onTouch(this, event);
-				mSkipCallingOnTouchListener = false;
-				return retVal ? true : super.onTouchEvent(event);
-			}
-		}
-
-		switch (event.getAction() & MotionEvent.ACTION_MASK) {
-		case MotionEvent.ACTION_DOWN:
-			mDownX = (int) event.getX();
-			mDownY = (int) event.getY();
-			mActivePointerId = event.getPointerId(0);
-
-			mDynamicTouchChildTouched = false;
-			if (mResIdOfDynamicTouchChild != 0) {
-				mIsParentHorizontalScrollContainer = false;
-
-				int position = pointToPosition(mDownX, mDownY);
-				int childNum = (position != INVALID_POSITION) ? position - getFirstVisiblePosition() : -1;
-				View itemView = (childNum >= 0) ? getChildAt(childNum) : null;
-				View childView = (itemView != null) ? itemView.findViewById(mResIdOfDynamicTouchChild) : null;
-				if (childView != null) {
-					final Rect childRect = getChildViewRect(this, childView);
-					if (childRect.contains(mDownX, mDownY)) {
-						mDynamicTouchChildTouched = true;
-						getParent().requestDisallowInterceptTouchEvent(true);
-					}
-				}
-			}
-
-			if (mIsParentHorizontalScrollContainer) {
-				// Do it now and don't wait until the user moves more than the
-				// slop factor.
-				getParent().requestDisallowInterceptTouchEvent(true);
-			}
-			break;
-		case MotionEvent.ACTION_MOVE:
-			if (mActivePointerId == INVALID_POINTER_ID) {
-				break;
-			}
-
-			int pointerIndex = event.findPointerIndex(mActivePointerId);
-
-			mLastEventY = (int) event.getY(pointerIndex);
-			mLastEventX = (int) event.getX(pointerIndex);
-			int deltaY = mLastEventY - mDownY;
-			int deltaX = mLastEventX - mDownX;
-
-			if (!mCellIsMobile && mDynamicTouchChildTouched) {
-				if ((Math.abs(deltaY) > mSlop) && (Math.abs(deltaY) > Math.abs(deltaX))) {
-					makeCellMobile();
-
-					// Cancel ListView's touch (un-highlighting the item)
-					MotionEvent cancelEvent = MotionEvent.obtain(event);
-					cancelEvent.setAction(MotionEvent.ACTION_CANCEL | (event.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
-					super.onTouchEvent(cancelEvent);
-					cancelEvent.recycle();
-				}
-			}
-
-			if (mCellIsMobile) {
-				mHoverCellCurrentBounds.offsetTo(mHoverCellOriginalBounds.left, mHoverCellOriginalBounds.top + deltaY + mTotalOffset);
-				mHoverCell.setBounds(mHoverCellCurrentBounds);
-				invalidate();
-
-				handleCellSwitch();
-
-				mIsMobileScrolling = false;
-				handleMobileCellScroll();
-			}
-			break;
-		case MotionEvent.ACTION_UP:
-			mDynamicTouchChildTouched = false;
-			touchEventsEnded();
-			break;
-		case MotionEvent.ACTION_CANCEL:
-			mDynamicTouchChildTouched = false;
-			touchEventsCancelled();
-			break;
-		case MotionEvent.ACTION_POINTER_UP:
-			/*
-			 * If a multitouch event took place and the original touch dictating
-			 * the movement of the hover cell has ended, then the dragging event
-			 * ends and the hover cell is animated to its corresponding position
-			 * in the listview.
-			 */
-			pointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
-			final int pointerId = event.getPointerId(pointerIndex);
-			if (pointerId == mActivePointerId) {
-				mDynamicTouchChildTouched = false;
-				touchEventsEnded();
-			}
-			break;
-		default:
-			break;
-		}
-
-		if (mCellIsMobile) {
-			return false;
-		} else if (mOnTouchListener != null) {
-			mSkipCallingOnTouchListener = true;
-			boolean retVal = mOnTouchListener.onTouch(this, event);
-			mSkipCallingOnTouchListener = false;
-			if (retVal) {
-				return true;
-			}
-		}
-		return super.onTouchEvent(event);
-	}
-
-	/**
-	 * This method determines whether the hover cell has been shifted far enough
-	 * to invoke a cell swap. If so, then the respective cell swap candidate is
-	 * determined and the data set is changed. Upon posting a notification of the
-	 * data set change, a layout is invoked to place the cells in the right place.
-	 * Using a ViewTreeObserver and a corresponding OnPreDrawListener, we can
-	 * offset the cell being swapped to where it previously was and then animate it to
-	 * its new position.
-	 */
-	private void handleCellSwitch() {
-		final int deltaY = mLastEventY - mDownY;
-		int deltaYTotal = mHoverCellOriginalBounds.top + mTotalOffset + deltaY;
-
-		View belowView = getViewForID(mBelowItemId);
-		View mobileView = getViewForID(mMobileItemId);
-		View aboveView = getViewForID(mAboveItemId);
-
-		boolean isBelow = (belowView != null) && (deltaYTotal > belowView.getTop());
-		boolean isAbove = (aboveView != null) && (deltaYTotal < aboveView.getTop());
-
-		if (isBelow || isAbove) {
-
-			final long switchItemID = isBelow ? mBelowItemId : mAboveItemId;
-			View switchView = isBelow ? belowView : aboveView;
-			final int originalItem = getPositionForView(mobileView);
-
-			if (switchView == null) {
-				updateNeighborViewsForID(mMobileItemId);
-				return;
-			}
-
-			swapElements(originalItem, getPositionForView(switchView));
-
-			BaseAdapter adapter;
-			if (getAdapter() instanceof HeaderViewListAdapter) {
-				adapter = (BaseAdapter) ((HeaderViewListAdapter) getAdapter()).getWrappedAdapter();
-			} else {
-				adapter = (BaseAdapter) getAdapter();
-			}
-			adapter.notifyDataSetChanged();
-
-			mDownY = mLastEventY;
-			mDownX = mLastEventX;
-
-			final int switchViewStartTop = switchView.getTop();
-
-			mobileView.setVisibility(View.VISIBLE);
-			switchView.setVisibility(View.INVISIBLE);
-
-			updateNeighborViewsForID(mMobileItemId);
-
-			final ViewTreeObserver observer = getViewTreeObserver();
-			observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-				public boolean onPreDraw() {
-					observer.removeOnPreDrawListener(this);
-
-					View switchView = getViewForID(switchItemID);
-
-					mTotalOffset += deltaY;
-
-					int switchViewNewTop = switchView.getTop();
-					int delta = switchViewStartTop - switchViewNewTop;
-
-					ViewHelper.setTranslationY(switchView, delta);
-
-					ObjectAnimator animator = ObjectAnimator.ofFloat(switchView, "translationY", 0);
-					animator.setDuration(MOVE_DURATION);
-					animator.start();
-
-					return true;
-				}
-			});
-		}
-	}
-
-	private void swapElements(int indexOne, int indexTwo) {
-		ListAdapter adapter = getAdapter();
-
-		if (adapter instanceof HeaderViewListAdapter) {
-			adapter = ((HeaderViewListAdapter) adapter).getWrappedAdapter();
-		}
-
-		if (adapter instanceof Swappable) {
-			((Swappable) adapter).swapItems(indexOne - getHeaderViewsCount(), indexTwo - getHeaderViewsCount());
-		}
-	}
-
-	/**
-	 * Resets all the appropriate fields to a default state while also animating
-	 * the hover cell back to its correct location.
-	 */
-	private void touchEventsEnded() {
-		final View mobileView = getViewForID(mMobileItemId);
-		if (mCellIsMobile || mIsWaitingForScrollFinish) {
-			mCellIsMobile = false;
-			mIsWaitingForScrollFinish = false;
-			mIsMobileScrolling = false;
-			mActivePointerId = INVALID_POINTER_ID;
-
-			// If the autoscroller has not completed scrolling, we need to wait
-			// for it to
-			// finish in order to determine the final location of where the
-			// hover cell
-			// should be animated to.
-			if (mScrollState != OnScrollListener.SCROLL_STATE_IDLE) {
-				mIsWaitingForScrollFinish = true;
-				return;
-			}
-
-			mHoverCellCurrentBounds.offsetTo(mHoverCellOriginalBounds.left, mobileView.getTop());
-
-			ObjectAnimator hoverViewAnimator = ObjectAnimator.ofObject(mHoverCell, "bounds", sBoundEvaluator, mHoverCellCurrentBounds);
-			hoverViewAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-				@Override
-				public void onAnimationUpdate(ValueAnimator valueAnimator) {
-					invalidate();
-				}
-			});
-			hoverViewAnimator.addListener(new AnimatorListenerAdapter() {
-				@Override
-				public void onAnimationStart(Animator animation) {
-					setEnabled(false);
-				}
-
-				@Override
-				public void onAnimationEnd(Animator animation) {
-					mAboveItemId = INVALID_ID;
-					mMobileItemId = INVALID_ID;
-					mBelowItemId = INVALID_ID;
-					mobileView.setVisibility(VISIBLE);
-					mHoverCell = null;
-					setEnabled(true);
-					invalidate();
-				}
-			});
-			hoverViewAnimator.start();
-		} else {
-			touchEventsCancelled();
-		}
-	}
-
-	/**
-	 * Resets all the appropriate fields to a default state.
-	 */
-	private void touchEventsCancelled() {
-		View mobileView = getViewForID(mMobileItemId);
-		if (mCellIsMobile) {
-			mAboveItemId = INVALID_ID;
-			mMobileItemId = INVALID_ID;
-			mBelowItemId = INVALID_ID;
-			mobileView.setVisibility(VISIBLE);
-			mHoverCell = null;
-			invalidate();
-		}
-		mCellIsMobile = false;
-		mIsMobileScrolling = false;
-		mActivePointerId = INVALID_POINTER_ID;
-	}
-
-	/**
-	 * This TypeEvaluator is used to animate the BitmapDrawable back to its
-	 * final location when the user lifts his finger by modifying the
-	 * BitmapDrawable's bounds.
-	 */
-	private final static TypeEvaluator<Rect> sBoundEvaluator = new TypeEvaluator<Rect>() {
-		public Rect evaluate(float fraction, Rect startValue, Rect endValue) {
-			return new Rect(interpolate(startValue.left, endValue.left, fraction), interpolate(startValue.top, endValue.top, fraction), interpolate(startValue.right, endValue.right, fraction),
-					interpolate(startValue.bottom, endValue.bottom, fraction));
-		}
-
-		public int interpolate(int start, int end, float fraction) {
-			return (int) (start + fraction * (end - start));
-		}
-	};
-
-	/**
-	 *  Determines whether this listview is in a scrolling state invoked
-	 *  by the fact that the hover cell is out of the bounds of the listview;
-	 */
-	private void handleMobileCellScroll() {
-		mIsMobileScrolling = handleMobileCellScroll(mHoverCellCurrentBounds);
-	}
-
-	/**
-	 * This method is in charge of determining if the hover cell is above
-	 * or below the bounds of the listview. If so, the listview does an appropriate
-	 * upward or downward smooth scroll so as to reveal new items.
-	 */
-	public boolean handleMobileCellScroll(Rect r) {
-		int offset = computeVerticalScrollOffset();
-		int height = getHeight();
-		int extent = computeVerticalScrollExtent();
-		int range = computeVerticalScrollRange();
-		int hoverViewTop = r.top;
-		int hoverHeight = r.height();
-
-		if (hoverViewTop <= 0 && offset > 0) {
-			smoothScrollBy(-mSmoothScrollAmountAtEdge, 0);
-			return true;
-		}
-
-		if (hoverViewTop + hoverHeight >= height && (offset + extent) < range) {
-			smoothScrollBy(mSmoothScrollAmountAtEdge, 0);
-			return true;
-		}
-
-		return false;
-	}
-
-	public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
-		mIsParentHorizontalScrollContainer = (mResIdOfDynamicTouchChild == 0) ? isParentHorizontalScrollContainer : false;
-	}
-
-	public boolean isParentHorizontalScrollContainer() {
-		return mIsParentHorizontalScrollContainer;
-	}
-
-	public void setDynamicTouchChild(int childResId) {
-		mResIdOfDynamicTouchChild = childResId;
-		if (childResId != 0) {
-			setIsParentHorizontalScrollContainer(false);
-		}
-	}
-
-	/**
-	 * This scroll listener is added to the listview in order to handle cell swapping
-	 * when the cell is either at the top or bottom edge of the listview. If the hover
-	 * cell is at either edge of the listview, the listview will begin scrolling. As
-	 * scrolling takes place, the listview continuously checks if new cells became visible
-	 * and determines whether they are potential candidates for a cell swap.
-	 */
-	private OnScrollListener mScrollListener = new OnScrollListener() {
-
-		private int mPreviousFirstVisibleItem = -1;
-		private int mPreviousVisibleItemCount = -1;
-		private int mCurrentFirstVisibleItem;
-		private int mCurrentVisibleItemCount;
-		private int mCurrentScrollState;
-
-		public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-			mCurrentFirstVisibleItem = firstVisibleItem;
-			mCurrentVisibleItemCount = visibleItemCount;
-
-			mPreviousFirstVisibleItem = (mPreviousFirstVisibleItem == -1) ? mCurrentFirstVisibleItem : mPreviousFirstVisibleItem;
-			mPreviousVisibleItemCount = (mPreviousVisibleItemCount == -1) ? mCurrentVisibleItemCount : mPreviousVisibleItemCount;
-
-			checkAndHandleFirstVisibleCellChange();
-			checkAndHandleLastVisibleCellChange();
-
-			mPreviousFirstVisibleItem = mCurrentFirstVisibleItem;
-			mPreviousVisibleItemCount = mCurrentVisibleItemCount;
-		}
-
-		@Override
-		public void onScrollStateChanged(AbsListView view, int scrollState) {
-			mCurrentScrollState = scrollState;
-			mScrollState = scrollState;
-			isScrollCompleted();
-		}
-
-		/**
-		 * This method is in charge of invoking 1 of 2 actions. Firstly, if the listview
-		 * is in a state of scrolling invoked by the hover cell being outside the bounds
-		 * of the listview, then this scrolling event is continued. Secondly, if the hover
-		 * cell has already been released, this invokes the animation for the hover cell
-		 * to return to its correct position after the listview has entered an idle scroll
-		 * state.
-		 */
-		private void isScrollCompleted() {
-			if (mCurrentVisibleItemCount > 0 && mCurrentScrollState == SCROLL_STATE_IDLE) {
-				if (mCellIsMobile && mIsMobileScrolling) {
-					handleMobileCellScroll();
-				} else if (mIsWaitingForScrollFinish) {
-					touchEventsEnded();
-				}
-			}
-		}
-
-		/**
-		 * Determines if the listview scrolled up enough to reveal a new cell at the
-		 * top of the list. If so, then the appropriate parameters are updated.
-		 */
-		public void checkAndHandleFirstVisibleCellChange() {
-			if (mCurrentFirstVisibleItem != mPreviousFirstVisibleItem) {
-				if (mCellIsMobile && mMobileItemId != INVALID_ID) {
-					updateNeighborViewsForID(mMobileItemId);
-					handleCellSwitch();
-				}
-			}
-		}
-
-		/**
-		 * Determines if the listview scrolled down enough to reveal a new cell at the
-		 * bottom of the list. If so, then the appropriate parameters are updated.
-		 */
-		public void checkAndHandleLastVisibleCellChange() {
-			int currentLastVisibleItem = mCurrentFirstVisibleItem + mCurrentVisibleItemCount;
-			int previousLastVisibleItem = mPreviousFirstVisibleItem + mPreviousVisibleItemCount;
-			if (currentLastVisibleItem != previousLastVisibleItem) {
-				if (mCellIsMobile && mMobileItemId != INVALID_ID) {
-					updateNeighborViewsForID(mMobileItemId);
-					handleCellSwitch();
-				}
-			}
-		}
-	};
-
-	/**
-	 * Interface, usually implemented by a {@link com.haarman.listviewanimations.BaseAdapterDecorator},
-	 * that indicates that it can swap the visual position of two list items.
-	 *
-	 * @author Anton Spaans on 9/11/13.
-	 */
-	public interface Swappable {
-
-		/**
-		 * Swaps the item on the first adapter position with the item on the second adapter position.
-		 * Be sure to call {@link android.widget.BaseAdapter#notifyDataSetChanged()} if appropriate.
-		 *
-		 * @param positionOne First adapter position.
-		 * @param positionTwo Second adapter position.
-		 */
-		public void swapItems(int positionOne, int positionTwo);
-	}
-}
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/ArrayAdapter.java b/library/src/com/nhaarman/listviewanimations/ArrayAdapter.java
new file mode 100644
index 00000000..84e16bbb
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/ArrayAdapter.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations;
+
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter;
+import com.nhaarman.listviewanimations.widget.DynamicListView;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * A {@code true} {@link ArrayList} adapter providing access to all ArrayList methods.
+ * Also implements {@link DynamicListView.Swappable} for easy object swapping, and {@link AnimateAdditionAdapter.Insertable} for inserting objects.
+ */
+@SuppressWarnings("UnusedDeclaration")
+public abstract class ArrayAdapter<T> extends BaseAdapter implements List<T>, DynamicListView.Swappable, AnimateAdditionAdapter.Insertable<T> {
+
+    protected List<T> mItems;
+
+    /**
+     * Creates a new ArrayAdapter with an empty {@code List} .
+     */
+    public ArrayAdapter() {
+        this(null);
+    }
+
+    /**
+     * Creates a new {@link ArrayAdapter} using given {@code List} , or an empty {@code List}  if objects == null.
+     */
+    public ArrayAdapter(final List<T> objects) {
+        this(objects, false);
+    }
+
+    /**
+     * Creates a new {@link ArrayAdapter}, using (a copy of) given {@code List} , or an empty {@code List}  if objects = null.
+     * @param copyList {@code true} to create a copy of the {@code List} , {@code false} to reuse the reference.
+     */
+    public ArrayAdapter(final List<T> objects, final boolean copyList) {
+        if (objects != null) {
+            if (copyList) {
+                mItems = new ArrayList<T>(objects);
+            } else {
+                mItems = objects;
+            }
+        } else {
+            mItems = new ArrayList<T>();
+        }
+    }
+
+
+    @Override
+    public int getCount() {
+        return mItems.size();
+    }
+
+    @Override
+    public T getItem(final int location) {
+        return mItems.get(location);
+    }
+
+    @Override
+    public long getItemId(final int location) {
+        return location;
+    }
+
+    /**
+     * Appends the specified element to the end of the {@code List} .
+     * @param object the object to add.
+     * @return always true.
+     */
+    @Override
+    public boolean add(final T object) {
+        boolean result = mItems.add(object);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    @Override
+    public void add(final int location, final T object) {
+        mItems.add(location, object);
+        notifyDataSetChanged();
+    }
+
+    /**
+     * Adds the objects in the specified collection to the end of this List. The objects are added in the order in which they are returned from the collection's iterator.
+     * @param collection the collection of objects.
+     * @return {@code true} if this {@code List} is modified, {@code false} otherwise.
+     */
+    @Override
+    public boolean addAll(final Collection<? extends T> collection) {
+        boolean result = mItems.addAll(collection);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    /**
+     * Appends all of the elements in the specified collection to the end of the
+     * {@code List} , in the order that they are specified.
+     * @param objects the array of objects.
+     * @return {@code true} if the collection changed during insertion.
+     */
+    public boolean addAll(final T... objects) {
+        boolean result = Collections.addAll(mItems, objects);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    @Override
+    public boolean addAll(final int location, final Collection<? extends T> objects) {
+        boolean result = mItems.addAll(location, objects);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    /**
+     * Inserts the objects in the specified collection at the specified location in this List. The objects are added in the order that they specified.
+     * @param location the index at which to insert.
+     * @param objects the array of objects.
+     */
+    public void addAll(final int location, final T... objects) {
+        for (int i = location; i < objects.length + location; i++) {
+            mItems.add(i, objects[i]);
+        }
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public void clear() {
+        mItems.clear();
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean contains(final Object object) {
+        return mItems.contains(object);
+    }
+
+    @Override
+    public boolean containsAll(final Collection<?> collection) {
+        return mItems.containsAll(collection);
+    }
+
+    @Override
+    public T get(final int location) {
+        return mItems.get(location);
+    }
+
+    @Override
+    public T set(final int location, final T object) {
+        T result = mItems.set(location, object);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    @Override
+    public int size() {
+        return mItems.size();
+    }
+
+    @Override
+    public List<T> subList(final int start, final int end) {
+        return mItems.subList(start, end);
+    }
+
+    @Override
+    public Object[] toArray() {
+        return mItems.toArray();
+    }
+
+    @Override
+    public <T1> T1[] toArray(final T1[] array) {
+        //noinspection SuspiciousToArrayCall
+        return mItems.toArray(array);
+    }
+
+    @Override
+    public boolean remove(final Object object) {
+        boolean result = mItems.remove(object);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    @Override
+    public T remove(final int location) {
+        T result = mItems.remove(location);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    /**
+     * Removes all elements at the specified locations in the {@code List} .
+     * @param locations the collection of indexes to remove.
+     * @return a collection containing the removed objects.
+     */
+    public Collection<T> removePositions(final Collection<Integer> locations) {
+        ArrayList<T> removedItems = new ArrayList<T>();
+
+        ArrayList<Integer> locationsList = new ArrayList<Integer>(locations);
+        Collections.sort(locationsList);
+        Collections.reverse(locationsList);
+        for (int location : locationsList) {
+            removedItems.add(mItems.remove(location));
+        }
+        notifyDataSetChanged();
+        return removedItems;
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> objects) {
+        boolean result = mItems.removeAll(objects);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> objects) {
+        boolean result = mItems.retainAll(objects);
+        notifyDataSetChanged();
+        return result;
+    }
+
+    @Override
+    public int indexOf(final Object object) {
+        return mItems.indexOf(object);
+    }
+
+    @Override
+    public Iterator<T> iterator() {
+        return mItems.iterator();
+    }
+
+    @Override
+    public int lastIndexOf(final Object object) {
+        return mItems.lastIndexOf(object);
+    }
+
+    @Override
+    public ListIterator<T> listIterator() {
+        return mItems.listIterator();
+    }
+
+    @Override
+    public ListIterator<T> listIterator(final int location) {
+        return mItems.listIterator(location);
+    }
+
+    @Override
+    public void swapItems(final int locationOne, final int locationTwo) {
+        T temp = getItem(locationOne);
+        set(locationOne, getItem(locationTwo));
+        set(locationTwo, temp);
+    }
+
+    private BaseAdapter mDataSetChangedSlavedAdapter;
+
+    public void propagateNotifyDataSetChanged(final 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/nhaarman/listviewanimations/BaseAdapterDecorator.java
similarity index 79%
rename from library/src/com/haarman/listviewanimations/BaseAdapterDecorator.java
rename to library/src/com/nhaarman/listviewanimations/BaseAdapterDecorator.java
index c0a0285f..44aa2e15 100644
--- a/library/src/com/haarman/listviewanimations/BaseAdapterDecorator.java
+++ b/library/src/com/nhaarman/listviewanimations/BaseAdapterDecorator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.haarman.listviewanimations;
+package com.nhaarman.listviewanimations;
 
 import android.database.DataSetObserver;
 import android.view.View;
@@ -22,8 +22,8 @@
 import android.widget.BaseAdapter;
 import android.widget.SectionIndexer;
 
-import com.haarman.listviewanimations.view.DynamicListView;
-import com.haarman.listviewanimations.view.DynamicListView.Swappable;
+import com.nhaarman.listviewanimations.widget.DynamicListView;
+import com.nhaarman.listviewanimations.widget.DynamicListView.Swappable;
 
 /**
  * A decorator class that enables decoration of an instance of the BaseAdapter
@@ -32,7 +32,7 @@
  * Classes extending this class can override methods and provide extra
  * functionality before or after calling the super method.
  */
-public abstract class BaseAdapterDecorator extends BaseAdapter implements SectionIndexer, DynamicListView.Swappable {
+public abstract class BaseAdapterDecorator extends BaseAdapter implements SectionIndexer, DynamicListView.Swappable, ListViewSetter {
 
 	protected final BaseAdapter mDecoratedBaseAdapter;
 
@@ -41,15 +41,16 @@ public abstract class BaseAdapterDecorator extends BaseAdapter implements Sectio
 	private boolean mIsParentHorizontalScrollContainer;
 	private int mResIdTouchChild;
 
-	public BaseAdapterDecorator(BaseAdapter baseAdapter) {
+	public BaseAdapterDecorator(final BaseAdapter baseAdapter) {
 		mDecoratedBaseAdapter = baseAdapter;
 	}
 
-	public void setAbsListView(AbsListView listView) {
+	@Override
+	public void setAbsListView(final AbsListView listView) {
 		mListView = listView;
 
-		if (mDecoratedBaseAdapter instanceof BaseAdapterDecorator) {
-			((BaseAdapterDecorator) mDecoratedBaseAdapter).setAbsListView(listView);
+		if (mDecoratedBaseAdapter instanceof ListViewSetter) {
+			((ListViewSetter) mDecoratedBaseAdapter).setAbsListView(listView);
 		}
 
 		if (mListView instanceof DynamicListView) {
@@ -69,17 +70,17 @@ public int getCount() {
 	}
 
 	@Override
-	public Object getItem(int position) {
+	public Object getItem(final int position) {
 		return mDecoratedBaseAdapter.getItem(position);
 	}
 
 	@Override
-	public long getItemId(int position) {
+	public long getItemId(final int position) {
 		return mDecoratedBaseAdapter.getItemId(position);
 	}
 
 	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
+	public View getView(final int position, final View convertView, final ViewGroup parent) {
 		return mDecoratedBaseAdapter.getView(position, convertView, parent);
 	}
 
@@ -89,12 +90,12 @@ public boolean areAllItemsEnabled() {
 	}
 
 	@Override
-	public View getDropDownView(int position, View convertView, ViewGroup parent) {
+	public View getDropDownView(final int position, final View convertView, final ViewGroup parent) {
 		return mDecoratedBaseAdapter.getDropDownView(position, convertView, parent);
 	}
 
 	@Override
-	public int getItemViewType(int position) {
+	public int getItemViewType(final int position) {
 		return mDecoratedBaseAdapter.getItemViewType(position);
 	}
 
@@ -114,7 +115,7 @@ public boolean isEmpty() {
 	}
 
 	@Override
-	public boolean isEnabled(int position) {
+	public boolean isEnabled(final int position) {
 		return mDecoratedBaseAdapter.isEnabled(position);
 	}
 
@@ -129,10 +130,10 @@ public void notifyDataSetChanged() {
 	
 	/**
 	 * Helper function if you want to force notifyDataSetChanged()
-	 * @param force
 	 */
-	public void notifyDataSetChanged(Boolean force) {
-		if ((force) || (!(mDecoratedBaseAdapter instanceof ArrayAdapter<?>))) {
+	@SuppressWarnings("UnusedDeclaration")
+    public void notifyDataSetChanged(final boolean force) {
+		if (force || !(mDecoratedBaseAdapter instanceof ArrayAdapter<?>)) {
 			// leads to an infinite loop when trying because ArrayAdapter triggers notifyDataSetChanged itself
 			mDecoratedBaseAdapter.notifyDataSetChanged();
 		}
@@ -144,17 +145,17 @@ public void notifyDataSetInvalidated() {
 	}
 
 	@Override
-	public void registerDataSetObserver(DataSetObserver observer) {
+	public void registerDataSetObserver(final DataSetObserver observer) {
 		mDecoratedBaseAdapter.registerDataSetObserver(observer);
 	}
 
 	@Override
-	public void unregisterDataSetObserver(DataSetObserver observer) {
+	public void unregisterDataSetObserver(final DataSetObserver observer) {
 		mDecoratedBaseAdapter.unregisterDataSetObserver(observer);
 	}
 
 	@Override
-	public int getPositionForSection(int section) {
+	public int getPositionForSection(final int section) {
 		if (mDecoratedBaseAdapter instanceof SectionIndexer) {
 			return ((SectionIndexer) mDecoratedBaseAdapter).getPositionForSection(section);
 		}
@@ -162,7 +163,7 @@ public int getPositionForSection(int section) {
 	}
 
 	@Override
-	public int getSectionForPosition(int position) {
+	public int getSectionForPosition(final int position) {
 		if (mDecoratedBaseAdapter instanceof SectionIndexer) {
 			return ((SectionIndexer) mDecoratedBaseAdapter).getSectionForPosition(position);
 		}
@@ -182,7 +183,7 @@ public BaseAdapter getDecoratedBaseAdapter() {
 	}
 
 	@Override
-	public void swapItems(int positionOne, int positionTwo) {
+	public void swapItems(final int positionOne, final int positionTwo) {
 		if (mDecoratedBaseAdapter instanceof Swappable) {
 			((Swappable) mDecoratedBaseAdapter).swapItems(positionOne, positionTwo);
 		}
@@ -194,10 +195,8 @@ public void swapItems(int positionOne, int positionTwo) {
 	 *
 	 * Call this method with the value 'true' to fix this behavior.
 	 * Note that this will prevent the parent from scrolling horizontally when the user touches anywhere in a list-item.
-	 *
-	 * @param isParentHorizontalScrollContainer
 	 */
-	public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
+	public void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
 		mIsParentHorizontalScrollContainer = isParentHorizontalScrollContainer;
 		if (mListView instanceof DynamicListView) {
 			DynamicListView dynListView = (DynamicListView) mListView;
@@ -219,7 +218,7 @@ public boolean isParentHorizontalScrollContainer() {
 	 *
 	 * @param childResId The resource-ID of the list-items' child that the user should touch to be able to swipe the list-items.
 	 */
-	public void setTouchChild(int childResId) {
+	public void setTouchChild(final int childResId) {
 		mResIdTouchChild = childResId;
 		if (mListView instanceof DynamicListView) {
 			DynamicListView dynListView = (DynamicListView) mListView;
diff --git a/library/src/com/nhaarman/listviewanimations/ListViewSetter.java b/library/src/com/nhaarman/listviewanimations/ListViewSetter.java
new file mode 100644
index 00000000..a4972caa
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/ListViewSetter.java
@@ -0,0 +1,8 @@
+package com.nhaarman.listviewanimations;
+
+import android.widget.AbsListView;
+
+public interface ListViewSetter {
+
+    void setAbsListView(AbsListView listView);
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/AnimateAdditionAdapter.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/AnimateAdditionAdapter.java
new file mode 100644
index 00000000..91b5d239
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/AnimateAdditionAdapter.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.nhaarman.listviewanimations.itemmanipulation;
+
+import android.util.Pair;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+
+import com.nhaarman.listviewanimations.BaseAdapterDecorator;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.nineoldandroids.animation.AnimatorSet;
+import com.nineoldandroids.animation.ObjectAnimator;
+import com.nineoldandroids.animation.ValueAnimator;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * An EXPERIMENTAL adapter for inserting rows into the {@link android.widget.ListView} with an animation. The root {@link BaseAdapter} should implement {@link Insertable},
+ * otherwise an {@link java.lang.IllegalArgumentException} is thrown. This class only works with an instance of {@code ListView}!
+ * <p>
+ * Usage:<br>
+ * - Wrap a new instance of this class around a {@link android.widget.BaseAdapter}. <br>
+ * - Set a {@code ListView} to this class using {@link #setListView(android.widget.ListView)}.<br>
+ * - Call {@link com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter#insert(int, Object)} to animate the addition of an item.
+ * <p>
+ * Extend this class and override {@link com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter#getAdditionalAnimators(android.view.View,
+ * android.view.ViewGroup)} to provide extra {@link com.nineoldandroids.animation.Animator}s.
+ */
+@SuppressWarnings("unchecked")
+public class AnimateAdditionAdapter<T> extends BaseAdapterDecorator {
+
+    private static final long DEFAULT_SCROLLDOWN_ANIMATION_MS = 300;
+    private static final long DEFAULT_INSERTION_ANIMATION_MS = 300;
+    private static final String ALPHA = "alpha";
+
+    private final Insertable<T> mInsertable;
+    private final InsertQueue<T> mInsertQueue;
+
+    private boolean mShouldAnimateDown = true;
+
+    private long mInsertionAnimationDurationMs = DEFAULT_INSERTION_ANIMATION_MS;
+    private long mScrolldownAnimationDurationMs = DEFAULT_SCROLLDOWN_ANIMATION_MS;
+
+    /**
+     * Create a new {@link com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter} with given {@link android.widget.BaseAdapter}.
+     *
+     * @param baseAdapter should implement {@link com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter.Insertable},
+     *                    or be a {@link com.nhaarman.listviewanimations.BaseAdapterDecorator} whose BaseAdapter implements the interface.
+     */
+    public AnimateAdditionAdapter(final BaseAdapter baseAdapter) {
+        super(baseAdapter);
+
+        BaseAdapter rootAdapter = getRootAdapter();
+        if (!(rootAdapter instanceof Insertable)) {
+            throw new IllegalArgumentException("BaseAdapter should implement Insertable!");
+        }
+
+        mInsertable = (Insertable<T>) rootAdapter;
+        mInsertQueue = new InsertQueue<T>(mInsertable);
+    }
+
+    private BaseAdapter getRootAdapter() {
+        BaseAdapter adapter = getDecoratedBaseAdapter();
+        while (adapter instanceof BaseAdapterDecorator) {
+            adapter = ((BaseAdapterDecorator) adapter).getDecoratedBaseAdapter();
+        }
+
+        return adapter;
+    }
+
+    @Override
+    @Deprecated
+    /**
+     * @deprecated AnimateAdditionAdapter requires a ListView instance. Use {@link #setListView(android.widget.ListView)} instead.
+     */
+    public void setAbsListView(final AbsListView listView) {
+        if (!(listView instanceof ListView)) {
+            throw new IllegalArgumentException("AnimateAdditionAdapter requires a ListView instance!");
+        }
+        super.setAbsListView(listView);
+    }
+
+    public void setListView(final ListView listView) {
+        super.setAbsListView(listView);
+    }
+
+    /**
+     * Set whether the list should animate downwards when items are added above the first visible item.
+     * @param shouldAnimateDown defaults to {@code true}.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setShouldAnimateDown(final boolean shouldAnimateDown) {
+        mShouldAnimateDown = shouldAnimateDown;
+    }
+
+    /**
+     * Set the duration of the scrolldown animation <i>per item</i> for when items are inserted above the first visible item.
+     * @param scrolldownAnimationDurationMs the duration in ms.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setScrolldownAnimationDuration(final long scrolldownAnimationDurationMs) {
+        mScrolldownAnimationDurationMs = scrolldownAnimationDurationMs;
+    }
+
+    /**
+     * Set the duration of the insertion animation.
+     * @param insertionAnimationDurationMs the duration in ms.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setInsertionAnimationDuration(final long insertionAnimationDurationMs) {
+        mInsertionAnimationDurationMs = insertionAnimationDurationMs;
+    }
+
+    /**
+     * Insert an item at given index. Will show an entrance animation for the new item if the newly added item is visible.
+     * Will also call {@link Insertable#add(int, Object)} of the root {@link BaseAdapter}.
+     *
+     * @param index the index the new item should be inserted at
+     * @param item  the item to insert
+     */
+    public void insert(final int index, final T item) {
+        insert(new Pair<Integer, T>(index, item));
+    }
+
+    /**
+     * Insert items at given indexes. Will show an entrance animation for the new items if the newly added item is visible.
+     * Will also call {@link Insertable#add(int, Object)} of the root {@link BaseAdapter}.
+     *
+     * @param indexItemPairs the index-item pairs to insert. The first argument of the {@code Pair} is the index, the second argument is the item.
+     */
+    public void insert(final Pair<Integer, T>... indexItemPairs) {
+        insert(Arrays.asList(indexItemPairs));
+    }
+
+    /**
+     * Insert items at given indexes. Will show an entrance animation for the new items if the newly added item is visible.
+     * Will also call {@link Insertable#add(int, Object)} of the root {@link BaseAdapter}.
+     *
+     * @param indexItemPairs the index-item pairs to insert. The first argument of the {@code Pair} is the index, the second argument is the item.
+     */
+    public void insert(final List<Pair<Integer, T>> indexItemPairs) {
+        List<Pair<Integer, T>> visibleViews = new ArrayList<Pair<Integer, T>>();
+        List<Integer> insertedPositions = new ArrayList<Integer>();
+        List<Integer> insertedBelowPositions = new ArrayList<Integer>();
+
+        int scrollDistance = 0;
+        int numInsertedAbove = 0;
+
+        for (Pair<Integer, T> pair : indexItemPairs) {
+            if (getAbsListView().getFirstVisiblePosition() > pair.first) {
+                /* Inserting an item above the first visible position */
+                int index = pair.first;
+
+                /* Correct the index for already inserted positions above the first visible view. */
+                for (int insertedPosition : insertedPositions) {
+                    if (index >= insertedPosition) {
+                        index++;
+                    }
+                }
+
+                mInsertable.add(index, pair.second);
+                insertedPositions.add(index);
+                numInsertedAbove++;
+
+                if (mShouldAnimateDown) {
+                    View view = getView(pair.first, null, getAbsListView());
+                    view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+                    scrollDistance -= view.getMeasuredHeight();
+                }
+            } else if (getAbsListView().getLastVisiblePosition() >= pair.first) {
+                /* Inserting an item that becomes visible on screen */
+                int index = pair.first;
+
+                /* Correct the index for already inserted positions above the first visible view */
+                for (int insertedPosition : insertedPositions) {
+                    if (index >= insertedPosition) {
+                        index++;
+                    }
+                }
+                Pair<Integer, T> newPair = new Pair<Integer, T>(index, pair.second);
+                visibleViews.add(newPair);
+            } else {
+                /* Inserting an item below the last visible item */
+                int index = pair.first;
+
+                /* Correct the index for already inserted positions above the first visible view */
+                for (int insertedPosition : insertedPositions) {
+                    if (index >= insertedPosition) {
+                        index++;
+                    }
+                }
+
+                /* Correct the index for already inserted positions below the last visible view */
+                for (int queuedPosition : insertedBelowPositions) {
+                    if (index >= queuedPosition) {
+                        index++;
+                    }
+                }
+
+                insertedBelowPositions.add(index);
+                mInsertable.add(index, pair.second);
+            }
+        }
+
+        if (mShouldAnimateDown) {
+            getAbsListView().smoothScrollBy(scrollDistance, (int) (mScrolldownAnimationDurationMs * numInsertedAbove));
+        }
+
+        mInsertQueue.insert(visibleViews);
+        ((ListView) getAbsListView()).setSelectionFromTop(getAbsListView().getFirstVisiblePosition() + numInsertedAbove, getAbsListView().getChildAt(0).getTop());
+    }
+
+
+    @Override
+    public View getView(final int position, final View convertView, final ViewGroup parent) {
+        final View view = super.getView(position, convertView, parent);
+
+        if (mInsertQueue.getActiveIndexes().contains(position)) {
+            int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(ViewGroup.LayoutParams.MATCH_PARENT, View.MeasureSpec.AT_MOST);
+            int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(ViewGroup.LayoutParams.WRAP_CONTENT, View.MeasureSpec.AT_MOST);
+            view.measure(widthMeasureSpec, heightMeasureSpec);
+
+            int originalHeight = view.getMeasuredHeight();
+
+            ValueAnimator heightAnimator = ValueAnimator.ofInt(1, originalHeight);
+            heightAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(final ValueAnimator animation) {
+                    ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
+                    layoutParams.height = (Integer) animation.getAnimatedValue();
+                    view.setLayoutParams(layoutParams);
+                }
+            });
+
+            ObjectAnimator alphaAnimator = ObjectAnimator.ofFloat(view, ALPHA, 0, 1);
+
+            AnimatorSet animatorSet = new AnimatorSet();
+            Animator[] customAnimators = getAdditionalAnimators(view, parent);
+            Animator[] animators = new Animator[customAnimators.length + 2];
+            animators[0] = heightAnimator;
+            animators[1] = alphaAnimator;
+            System.arraycopy(customAnimators, 0, animators, 2, customAnimators.length);
+            animatorSet.playTogether(animators);
+            animatorSet.setDuration(mInsertionAnimationDurationMs);
+            animatorSet.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(final Animator animation) {
+                    mInsertQueue.removeActiveIndex(position);
+                }
+            });
+            animatorSet.start();
+        }
+
+        return view;
+    }
+
+    /**
+     * Override this method to provide additional animators on top of the default height and alpha animation.
+     *
+     * @param view   The {@link View} that will get animated.
+     * @param parent The parent that this view will eventually be attached to.
+     * @return a non-null array of Animators.
+     */
+    @SuppressWarnings("UnusedParameters")
+    protected Animator[] getAdditionalAnimators(final View view, final ViewGroup parent) {
+        return new Animator[]{};
+    }
+
+    /**
+     * An interface for inserting items at a certain index.
+     */
+    public interface Insertable<T> {
+
+        /**
+         * Will be called to insert given {@code item} at given {@code index} in the list.
+         *
+         * @param index the index the new item should be inserted at
+         * @param item  the item to insert
+         */
+        public void add(int index, T item);
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/AnimateDismissAdapter.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/AnimateDismissAdapter.java
new file mode 100644
index 00000000..1bd84bdd
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/AnimateDismissAdapter.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.itemmanipulation;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.BaseAdapterDecorator;
+import com.nhaarman.listviewanimations.util.AdapterViewUtil;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.nineoldandroids.animation.AnimatorSet;
+import com.nineoldandroids.animation.ValueAnimator;
+import com.nineoldandroids.animation.ValueAnimator.AnimatorUpdateListener;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A {@link BaseAdapterDecorator} class that provides animations to the removal
+ * of items in the given {@link BaseAdapter}.
+ */
+public class AnimateDismissAdapter extends BaseAdapterDecorator {
+
+    private final OnDismissCallback mCallback;
+
+    /**
+     * Create a new AnimateDismissAdapter based on the given {@link BaseAdapter}.
+     *
+     * @param callback
+     *            The {@link OnDismissCallback} to trigger when the user has
+     *            indicated that she would like to dismiss one or more list
+     *            items.
+     */
+    public AnimateDismissAdapter(final BaseAdapter baseAdapter, final OnDismissCallback callback) {
+        super(baseAdapter);
+        mCallback = callback;
+    }
+
+    /**
+     * Animate dismissal of the item at given position.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void animateDismiss(final int position) {
+        animateDismiss(Arrays.asList(position));
+    }
+
+    /**
+     * Animate dismissal of the items at given positions.
+     */
+    public void animateDismiss(final Collection<Integer> positions) {
+        final List<Integer> positionsCopy = new ArrayList<Integer>(positions);
+        if (getAbsListView() == null) {
+            throw new IllegalStateException("Call setAbsListView() on this AnimateDismissAdapter before calling setAdapter()!");
+        }
+
+        List<View> views = getVisibleViewsForPositions(positionsCopy);
+
+        if (!views.isEmpty()) {
+            List<Animator> animators = new ArrayList<Animator>();
+            for (final View view : views) {
+                animators.add(createAnimatorForView(view));
+            }
+
+            AnimatorSet animatorSet = new AnimatorSet();
+
+            Animator[] animatorsArray = new Animator[animators.size()];
+            for (int i = 0; i < animatorsArray.length; i++) {
+                animatorsArray[i] = animators.get(i);
+            }
+
+            animatorSet.playTogether(animatorsArray);
+            animatorSet.addListener(new AnimatorListenerAdapter() {
+
+                @Override
+                public void onAnimationEnd(final Animator animator) {
+                    invokeCallback(positionsCopy);
+                }
+            });
+            animatorSet.start();
+        } else {
+            invokeCallback(positionsCopy);
+        }
+    }
+
+    private void invokeCallback(final Collection<Integer> positions) {
+        ArrayList<Integer> positionsList = new ArrayList<Integer>(positions);
+        Collections.sort(positionsList);
+
+        int[] dismissPositions = new int[positionsList.size()];
+        for (int i = 0; i < positionsList.size(); i++) {
+            dismissPositions[i] = positionsList.get(positionsList.size() - 1 - i);
+        }
+        mCallback.onDismiss(getAbsListView(), dismissPositions);
+    }
+
+    private List<View> getVisibleViewsForPositions(final Collection<Integer> positions) {
+        List<View> views = new ArrayList<View>();
+        for (int i = 0; i < getAbsListView().getChildCount(); i++) {
+            View child = getAbsListView().getChildAt(i);
+            if (positions.contains(AdapterViewUtil.getPositionForView(getAbsListView(), child))) {
+                views.add(child);
+            }
+        }
+        return views;
+    }
+
+    private Animator createAnimatorForView(final View view) {
+        final ViewGroup.LayoutParams lp = view.getLayoutParams();
+        final int originalHeight = view.getHeight();
+
+        ValueAnimator animator = ValueAnimator.ofInt(originalHeight, 0);
+        animator.addListener(new AnimatorListenerAdapter() {
+
+            @Override
+            public void onAnimationEnd(final Animator animator) {
+                lp.height = 0;
+                view.setLayoutParams(lp);
+            }
+        });
+
+        animator.addUpdateListener(new AnimatorUpdateListener() {
+
+            @Override
+            public void onAnimationUpdate(final ValueAnimator valueAnimator) {
+                lp.height = (Integer) valueAnimator.getAnimatedValue();
+                view.setLayoutParams(lp);
+            }
+        });
+
+        return animator;
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/ExpandCollapseListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/ExpandCollapseListener.java
new file mode 100644
index 00000000..07bc638c
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/ExpandCollapseListener.java
@@ -0,0 +1,10 @@
+package com.nhaarman.listviewanimations.itemmanipulation;
+
+// TODO integrate in ExpandableListItemAdapter
+public interface ExpandCollapseListener {
+
+    public void onItemExpanded(int position);
+
+    public void onItemCollapsed(int position);
+
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/ExpandableListItemAdapter.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/ExpandableListItemAdapter.java
new file mode 100644
index 00000000..81398f5b
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/ExpandableListItemAdapter.java
@@ -0,0 +1,535 @@
+package com.nhaarman.listviewanimations.itemmanipulation;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.AbsListView;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.ListViewSetter;
+import com.nhaarman.listviewanimations.util.AdapterViewUtil;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.nineoldandroids.animation.ValueAnimator;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * An {@link ArrayAdapter} which allows items to be expanded using an animation.
+ */
+@SuppressWarnings("UnusedDeclaration")
+public abstract class ExpandableListItemAdapter<T> extends ArrayAdapter<T> implements ListViewSetter {
+
+    private static final int DEFAULTTITLEPARENTRESID = 10000;
+    private static final int DEFAULTCONTENTPARENTRESID = 10001;
+
+    private final Context mContext;
+    private int mViewLayoutResId;
+    private final int mTitleParentResId;
+    private final int mContentParentResId;
+    private int mActionViewResId;
+    private final List<Long> mExpandedIds;
+
+    private int mLimit;
+
+    private AbsListView mAbsListView;
+
+    private ExpandCollapseListener mExpandCollapseListener;
+
+    /**
+     * Creates a new ExpandableListItemAdapter with an empty list.
+     */
+    public ExpandableListItemAdapter(final Context context) {
+        this(context, null);
+    }
+
+    /**
+     * Creates a new {@link ExpandableListItemAdapter} with the specified list,
+     * or an empty list if items == null.
+     */
+    public ExpandableListItemAdapter(final Context context, final List<T> items) {
+        super(items);
+        mContext = context;
+        mTitleParentResId = DEFAULTTITLEPARENTRESID;
+        mContentParentResId = DEFAULTCONTENTPARENTRESID;
+
+        mExpandedIds = new ArrayList<Long>();
+    }
+
+    /**
+     * Creates a new ExpandableListItemAdapter with an empty list. Uses given
+     * layout resource for the view; titleParentResId and contentParentResId
+     * should be identifiers for ViewGroups within that layout.
+     */
+    public ExpandableListItemAdapter(final Context context, final int layoutResId, final int titleParentResId, final int contentParentResId) {
+        this(context, layoutResId, titleParentResId, contentParentResId, null);
+    }
+
+    /**
+     * Creates a new ExpandableListItemAdapter with the specified list, or an
+     * empty list if items == null. Uses given layout resource for the view;
+     * titleParentResId and contentParentResId should be identifiers for
+     * ViewGroups within that layout.
+     */
+    public ExpandableListItemAdapter(final Context context, final int layoutResId, final int titleParentResId, final int contentParentResId, final List<T> items) {
+        super(items);
+        mContext = context;
+        mViewLayoutResId = layoutResId;
+        mTitleParentResId = titleParentResId;
+        mContentParentResId = contentParentResId;
+
+        mExpandedIds = new ArrayList<Long>();
+    }
+
+    @Override
+    public void setAbsListView(final AbsListView listView) {
+        mAbsListView = listView;
+    }
+
+    /**
+     * Set the resource id of the child {@link View} contained in the View
+     * returned by {@link #getTitleView(int, View, ViewGroup)} that will be the
+     * actuator of the expand / collapse animations.<br>
+     * If there is no View in the title View with given resId, a
+     * {@link NullPointerException} is thrown.</p> Default behavior: the whole
+     * title View acts as the actuator.
+     *
+     * @param resId the resource id.
+     */
+    public void setActionViewResId(final int resId) {
+        mActionViewResId = resId;
+    }
+
+    /**
+     * Set the maximum number of items allowed to be expanded. When the
+     * (limit+1)th item is expanded, the first expanded item will collapse.
+     *
+     * @param limit the maximum number of items allowed to be expanded. Use <= 0
+     *              for no limit.
+     */
+    public void setLimit(final int limit) {
+        mLimit = limit;
+        mExpandedIds.clear();
+        notifyDataSetChanged();
+    }
+
+    /**
+     * Set the {@link com.nhaarman.listviewanimations.itemmanipulation.ExpandCollapseListener} that should be notified of expand / collapse events.
+     */
+    public void setExpandCollapseListener(final ExpandCollapseListener expandCollapseListener) {
+        mExpandCollapseListener = expandCollapseListener;
+    }
+
+    @Override
+    public View getView(final int position, final View convertView, final ViewGroup parent) {
+        ViewGroup view = (ViewGroup) convertView;
+        ViewHolder viewHolder;
+
+        if (view == null) {
+            view = createView(parent);
+
+            viewHolder = new ViewHolder();
+            viewHolder.titleParent = (ViewGroup) view.findViewById(mTitleParentResId);
+            viewHolder.contentParent = (ViewGroup) view.findViewById(mContentParentResId);
+
+            view.setTag(viewHolder);
+        } else {
+            viewHolder = (ViewHolder) view.getTag();
+        }
+
+        View titleView = getTitleView(position, viewHolder.titleView, viewHolder.titleParent);
+        if (titleView != viewHolder.titleView) {
+            viewHolder.titleParent.removeAllViews();
+            viewHolder.titleParent.addView(titleView);
+
+            if (mActionViewResId == 0) {
+                view.setOnClickListener(new TitleViewOnClickListener(viewHolder.contentParent));
+            } else {
+                view.findViewById(mActionViewResId).setOnClickListener(new TitleViewOnClickListener(viewHolder.contentParent));
+            }
+        }
+        viewHolder.titleView = titleView;
+
+        View contentView = getContentView(position, viewHolder.contentView, viewHolder.contentParent);
+        if (contentView != viewHolder.contentView) {
+            viewHolder.contentParent.removeAllViews();
+            viewHolder.contentParent.addView(contentView);
+        }
+        viewHolder.contentView = contentView;
+
+        viewHolder.contentParent.setVisibility(mExpandedIds.contains(getItemId(position)) ? View.VISIBLE : View.GONE);
+        viewHolder.contentParent.setTag(getItemId(position));
+
+        ViewGroup.LayoutParams layoutParams = viewHolder.contentParent.getLayoutParams();
+        layoutParams.height = LayoutParams.WRAP_CONTENT;
+        viewHolder.contentParent.setLayoutParams(layoutParams);
+
+        return view;
+    }
+
+    private ViewGroup createView(final ViewGroup parent) {
+        ViewGroup view;
+
+        if (mViewLayoutResId == 0) {
+            view = new RootView(mContext);
+        } else {
+            view = (ViewGroup) LayoutInflater.from(mContext).inflate(mViewLayoutResId, parent, false);
+        }
+
+        return view;
+    }
+
+    /**
+     * Get a View that displays the <b>title of the data</b> at the specified
+     * position in the data set. You can either create a View manually or
+     * inflate it from an XML layout file. When the View is inflated, the parent
+     * View (GridView, ListView...) will apply default layout parameters unless
+     * you use
+     * {@link android.view.LayoutInflater#inflate(int, android.view.ViewGroup, boolean)}
+     * to specify a root view and to prevent attachment to the root.
+     *
+     * @param position    The position of the item within the adapter's data set of the
+     *                    item whose view we want.
+     * @param convertView The old view to reuse, if possible. Note: You should check
+     *                    that this view is non-null and of an appropriate type before
+     *                    using. If it is not possible to convert this view to display
+     *                    the correct data, this method can create a new view.
+     * @param parent      The parent that this view will eventually be attached to
+     * @return A View corresponding to the title of the data at the specified
+     * position.
+     */
+    public abstract View getTitleView(int position, View convertView, ViewGroup parent);
+
+    /**
+     * Get a View that displays the <b>content of the data</b> at the specified
+     * position in the data set. You can either create a View manually or
+     * inflate it from an XML layout file. When the View is inflated, the parent
+     * View (GridView, ListView...) will apply default layout parameters unless
+     * you use
+     * {@link android.view.LayoutInflater#inflate(int, android.view.ViewGroup, boolean)}
+     * to specify a root view and to prevent attachment to the root.
+     *
+     * @param position    The position of the item within the adapter's data set of the
+     *                    item whose view we want.
+     * @param convertView The old view to reuse, if possible. Note: You should check
+     *                    that this view is non-null and of an appropriate type before
+     *                    using. If it is not possible to convert this view to display
+     *                    the correct data, this method can create a new view.
+     * @param parent      The parent that this view will eventually be attached to
+     * @return A View corresponding to the content of the data at the specified
+     * position.
+     */
+    public abstract View getContentView(int position, View convertView, ViewGroup parent);
+
+    /**
+     * Indicates if the item at the specified position is expanded.
+     *
+     * @param position Index of the view whose state we want.
+     * @return true if the view is expanded, false otherwise.
+     */
+    public boolean isExpanded(final int position) {
+        long itemId = getItemId(position);
+        return mExpandedIds.contains(itemId);
+    }
+
+    /**
+     * Return the title view at the specified position.
+     *
+     * @param position Index of the view we want.
+     * @return the view if it exist, null otherwise.
+     */
+    public View getTitleView(final int position) {
+        View titleView = null;
+
+        View parentView = findViewForPosition(position);
+        Object tag = parentView.getTag();
+        if (tag instanceof ViewHolder) {
+            titleView = ((ViewHolder) tag).titleView;
+        }
+
+        return titleView;
+    }
+
+    /**
+     * Return the content view at the specified position.
+     *
+     * @param position Index of the view we want.
+     * @return the view if it exist, null otherwise.
+     */
+    public View getContentView(final int position) {
+        View contentView = null;
+
+        View parentView = findViewForPosition(position);
+        if (parentView != null) {
+            Object tag = parentView.getTag();
+            if (tag instanceof ViewHolder) {
+                contentView = ((ViewHolder) tag).contentView;
+            }
+        }
+
+        return contentView;
+    }
+
+    @Override
+    public void notifyDataSetChanged() {
+        super.notifyDataSetChanged();
+
+        Set<Long> removedIds = new HashSet<Long>(mExpandedIds);
+
+        for (int i = 0; i < getCount(); ++i) {
+            long id = getItemId(i);
+            removedIds.remove(id);
+        }
+
+        mExpandedIds.removeAll(removedIds);
+    }
+
+    /**
+     * Return the content parent at the specified position.
+     *
+     * @param position Index of the view we want.
+     * @return the view if it exist, null otherwise.
+     */
+    private View getContentParent(final int position) {
+        View contentParent = null;
+
+        View parentView = findViewForPosition(position);
+        if (parentView != null) {
+            Object tag = parentView.getTag();
+            if (tag instanceof ViewHolder) {
+                contentParent = ((ViewHolder) tag).contentParent;
+            }
+        }
+
+        return contentParent;
+    }
+
+    /**
+     * Expand the view at given position. Will do nothing if the view is already expanded.
+     *
+     * @param position the position to expand.
+     */
+    public void expand(final int position) {
+        long itemId = getItemId(position);
+        if (mExpandedIds.contains(itemId)) {
+            return;
+        }
+
+        toggle(position);
+    }
+
+    /**
+     * Collapse the view at given position. Will do nothing if the view is already collapsed.
+     *
+     * @param position the position to collapse.
+     */
+    public void collapse(final int position) {
+        long itemId = getItemId(position);
+        if (!mExpandedIds.contains(itemId)) {
+            return;
+        }
+
+        toggle(position);
+    }
+
+    private View findViewForPosition(final int position) {
+        View result = null;
+        for (int i = 0; i < mAbsListView.getChildCount() && result == null; i++) {
+            View childView = mAbsListView.getChildAt(i);
+            if (AdapterViewUtil.getPositionForView(mAbsListView, childView) == position) {
+                result = childView;
+            }
+        }
+        return result;
+    }
+
+    private int findPositionForId(final long id) {
+        for (int i = 0; i < getCount(); i++) {
+            if (getItemId(i) == id) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Toggle the {@link View} at given position, ignores header or footer Views.
+     *
+     * @param position the position of the view to toggle.
+     */
+    public void toggle(final int position) {
+        long itemId = getItemId(position);
+        boolean isExpanded = mExpandedIds.contains(itemId);
+
+        View contentParent = getContentParent(position);
+        if (contentParent != null) {
+            toggle(contentParent);
+        }
+
+        if (contentParent == null && isExpanded) {
+            mExpandedIds.remove(itemId);
+        } else if (contentParent == null && !isExpanded) {
+            mExpandedIds.add(itemId);
+        }
+    }
+
+    private void toggle(final View contentParent) {
+        boolean isVisible = contentParent.getVisibility() == View.VISIBLE;
+        boolean shouldCollapseOther = !isVisible && mLimit > 0 && mExpandedIds.size() >= mLimit;
+        if (shouldCollapseOther) {
+            Long firstId = mExpandedIds.get(0);
+
+            int firstPosition = findPositionForId(firstId);
+            View firstEV = getContentParent(firstPosition);
+            if (firstEV != null) {
+                ExpandCollapseHelper.animateCollapsing(firstEV);
+            }
+            mExpandedIds.remove(firstId);
+
+            if (mExpandCollapseListener != null) {
+                mExpandCollapseListener.onItemCollapsed(firstPosition);
+            }
+        }
+
+        Long id = (Long) contentParent.getTag();
+        int position = findPositionForId(id);
+        if (isVisible) {
+            ExpandCollapseHelper.animateCollapsing(contentParent);
+            mExpandedIds.remove(id);
+
+            if (mExpandCollapseListener != null) {
+                mExpandCollapseListener.onItemCollapsed(position);
+            }
+
+        } else {
+            ExpandCollapseHelper.animateExpanding(contentParent, mAbsListView);
+            mExpandedIds.add(id);
+
+            if (mExpandCollapseListener != null) {
+                mExpandCollapseListener.onItemExpanded(position);
+            }
+        }
+    }
+
+    private class TitleViewOnClickListener implements View.OnClickListener {
+
+        private final View mContentParent;
+
+        private TitleViewOnClickListener(final View contentParent) {
+            mContentParent = contentParent;
+        }
+
+        @Override
+        public void onClick(final View view) {
+            toggle(mContentParent);
+        }
+    }
+
+    private static class RootView extends LinearLayout {
+
+        private ViewGroup mTitleViewGroup;
+        private ViewGroup mContentViewGroup;
+
+        public RootView(final Context context) {
+            super(context);
+            init();
+        }
+
+        private void init() {
+            setOrientation(VERTICAL);
+
+            mTitleViewGroup = new FrameLayout(getContext());
+            mTitleViewGroup.setId(DEFAULTTITLEPARENTRESID);
+            addView(mTitleViewGroup);
+
+            mContentViewGroup = new FrameLayout(getContext());
+            mContentViewGroup.setId(DEFAULTCONTENTPARENTRESID);
+            addView(mContentViewGroup);
+        }
+    }
+
+    private static class ViewHolder {
+        ViewGroup titleParent;
+        ViewGroup contentParent;
+        View titleView;
+        View contentView;
+    }
+
+    private static class ExpandCollapseHelper {
+
+        public static void animateCollapsing(final View view) {
+            int origHeight = view.getHeight();
+
+            ValueAnimator animator = createHeightAnimator(view, origHeight, 0);
+            animator.addListener(new AnimatorListenerAdapter() {
+
+                @Override
+                public void onAnimationEnd(final Animator animator) {
+                    view.setVisibility(View.GONE);
+                }
+            });
+            animator.start();
+        }
+
+        public static void animateExpanding(final View view, final AbsListView listView) {
+            view.setVisibility(View.VISIBLE);
+
+            View parent = (View) view.getParent();
+            final int widthSpec = View.MeasureSpec.makeMeasureSpec(parent.getMeasuredWidth() - parent.getPaddingLeft() - parent.getPaddingRight(), View.MeasureSpec.AT_MOST);
+            final int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+            view.measure(widthSpec, heightSpec);
+
+            ValueAnimator animator = createHeightAnimator(view, 0, view.getMeasuredHeight());
+            animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                final int listViewHeight = listView.getHeight();
+                final int listViewBottomPadding = listView.getPaddingBottom();
+                final View v = findDirectChild(view, listView);
+
+                @Override
+                public void onAnimationUpdate(final ValueAnimator valueAnimator) {
+                    final int bottom = v.getBottom();
+                    if (bottom > listViewHeight) {
+                        final int top = v.getTop();
+                        if (top > 0) {
+                            listView.smoothScrollBy(Math.min(bottom - listViewHeight + listViewBottomPadding, top), 0);
+                        }
+                    }
+                }
+            });
+            animator.start();
+        }
+
+        private static View findDirectChild(final View view, final AbsListView listView) {
+            View result = view;
+            View parent = (View) result.getParent();
+            while (parent != listView) {
+                result = parent;
+                parent = (View) result.getParent();
+            }
+            return result;
+        }
+
+        public static ValueAnimator createHeightAnimator(final View view, final int start, final int end) {
+            ValueAnimator animator = ValueAnimator.ofInt(start, end);
+            animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+
+                @Override
+                public void onAnimationUpdate(final ValueAnimator valueAnimator) {
+                    int value = (Integer) valueAnimator.getAnimatedValue();
+
+                    ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
+                    layoutParams.height = value;
+                    view.setLayoutParams(layoutParams);
+                }
+            });
+            return animator;
+        }
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/InsertQueue.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/InsertQueue.java
new file mode 100644
index 00000000..2f67bd45
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/InsertQueue.java
@@ -0,0 +1,127 @@
+package com.nhaarman.listviewanimations.itemmanipulation;
+
+import android.util.Pair;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * A class to insert items only when there are no active items.
+ * A pending index-item pair can have two states: active and pending. When inserting new items, the {@link com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter.Insertable#add
+ * (int, Object)} method will be called directly if there are no active index-item pairs.
+ * Otherwise, pairs will be queued until the active list is empty.
+ */
+public class InsertQueue<T> {
+
+    private final AnimateAdditionAdapter.Insertable<T> mInsertable;
+
+    private final Set<AtomicInteger> mActiveIndexes = new HashSet<AtomicInteger>();
+    private final List<Pair<Integer, T>> mPendingItemsToInsert = new ArrayList<Pair<Integer, T>>();
+
+    public InsertQueue(final AnimateAdditionAdapter.Insertable<T> insertable) {
+        mInsertable = insertable;
+    }
+
+    /**
+     * Insert an item into the queue at given index. Will directly call {@link com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter.Insertable#add(int,
+     * Object)} if there are no active index-item pairs. Otherwise, the pair will be queued.
+     * @param index the index at which the item should be inserted.
+     * @param item the item to insert.
+     */
+    public void insert(final int index, final T item) {
+        if (mActiveIndexes.isEmpty() && mPendingItemsToInsert.isEmpty()) {
+            mActiveIndexes.add(new AtomicInteger(index));
+            //noinspection unchecked
+            mInsertable.add(index, item);
+        } else {
+            mPendingItemsToInsert.add(new Pair<Integer, T>(index, item));
+        }
+    }
+
+    @SuppressWarnings("UnusedDeclaration")
+    public void insert(final Pair<Integer, T>... indexItemPair) {
+        insert(Arrays.asList(indexItemPair));
+    }
+
+    public void insert(final List<Pair<Integer, T>> indexItemPairs) {
+        if (mActiveIndexes.isEmpty() && mPendingItemsToInsert.isEmpty()) {
+            for (Pair<Integer, T> pair : indexItemPairs) {
+                for (AtomicInteger existing : mActiveIndexes) {
+                    if (existing.intValue() >= pair.first) {
+                        existing.incrementAndGet();
+                    }
+                }
+                mActiveIndexes.add(new AtomicInteger(pair.first));
+
+                mInsertable.add(pair.first, pair.second);
+            }
+        } else {
+            mPendingItemsToInsert.addAll(indexItemPairs);
+        }
+    }
+
+    /**
+     * Clears the active states and inserts any pending pairs if applicable.
+     */
+    public void clearActive() {
+        mActiveIndexes.clear();
+        insertPending();
+    }
+
+    /**
+     * Clear the active state for given index. Will insert any pending pairs if this call leads to a state where there are no active pairs.
+     * @param index the index to remove.
+     */
+    public void removeActiveIndex(final int index) {
+        boolean found = false;
+        for (Iterator<AtomicInteger> iterator = mActiveIndexes.iterator(); iterator.hasNext() && !found; ) {
+            if (iterator.next().get() == index) {
+                iterator.remove();
+                found = true;
+            }
+        }
+        if (mActiveIndexes.isEmpty()) {
+            insertPending();
+        }
+    }
+
+    /**
+     * Inserts pending items into the Insertable, and adds them to the active positions (correctly managing position shifting). Clears the pending items.
+     */
+    private void insertPending() {
+        for (Pair<Integer, T> pi : mPendingItemsToInsert) {
+            for (AtomicInteger existing : mActiveIndexes) {
+                if (existing.intValue() >= pi.first) {
+                    existing.incrementAndGet();
+                }
+            }
+            mActiveIndexes.add(new AtomicInteger(pi.first));
+            mInsertable.add(pi.first, pi.second);
+        }
+        mPendingItemsToInsert.clear();
+    }
+
+    /**
+     * Returns a collection of currently active indexes.
+     */
+    public Collection<Integer> getActiveIndexes() {
+        HashSet<Integer> result = new HashSet<Integer>();
+        for (AtomicInteger i : mActiveIndexes) {
+            result.add(i.get());
+        }
+        return result;
+    }
+
+    /**
+     * Returns a {@code List} of {@code Pair}s with the index and items that are pending to be inserted, in the order they were requested.
+     */
+    public List<Pair<Integer, T>> getPendingItemsToInsert() {
+        return mPendingItemsToInsert;
+    }
+}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/OnDismissCallback.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/OnDismissCallback.java
similarity index 55%
rename from library/src/com/haarman/listviewanimations/itemmanipulation/OnDismissCallback.java
rename to library/src/com/nhaarman/listviewanimations/itemmanipulation/OnDismissCallback.java
index 432fc732..752b6008 100644
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/OnDismissCallback.java
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/OnDismissCallback.java
@@ -13,26 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.haarman.listviewanimations.itemmanipulation;
+package com.nhaarman.listviewanimations.itemmanipulation;
 
 import android.widget.AbsListView;
 import android.widget.ListView;
 
 /**
- * The callback interface used by {@link SwipeDismissListViewTouchListener} to
+ * The callback interface used by {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeDismissListViewTouchListener} to
  * inform its client about a successful dismissal of one or more list item
  * positions.
  */
 public interface OnDismissCallback {
-	/**
-	 * Called when the user has indicated they she would like to dismiss one or
-	 * more list item positions.
-	 * 
-	 * @param listView
-	 *            The originating {@link ListView}.
-	 * @param reverseSortedPositions
-	 *            An array of positions to dismiss, sorted in descending order
-	 *            for convenience.
-	 */
-	void onDismiss(AbsListView listView, int[] reverseSortedPositions);
+    /**
+     * Called when the user has indicated they she would like to dismiss one or
+     * more list item positions.
+     *
+     * @param listView
+     *            The originating {@link ListView}.
+     * @param reverseSortedPositions
+     *            An array of positions to dismiss, sorted in descending order
+     *            for convenience.
+     */
+    void onDismiss(AbsListView listView, int[] reverseSortedPositions);
 }
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/DismissableManager.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/DismissableManager.java
new file mode 100644
index 00000000..82e2a622
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/DismissableManager.java
@@ -0,0 +1,15 @@
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
+
+/**
+ * An interface to specify whether certain items can or cannot be dismissed.
+ */
+public interface DismissableManager {
+
+    /**
+     * Returns whether the item for given id and position can be dismissed.
+     * @param id the id of the item.
+     * @param position the position of the item.
+     * @return true if the item can be dismissed, false otherwise.
+     */
+    public boolean isDismissable(long id, int position);
+}
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeDismissAdapter.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeDismissAdapter.java
new file mode 100644
index 00000000..bb8dffd8
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeDismissAdapter.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
+
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.ArrayAdapter;
+import com.nhaarman.listviewanimations.BaseAdapterDecorator;
+import com.nhaarman.listviewanimations.itemmanipulation.OnDismissCallback;
+
+/**
+ * Adds an option to swipe items in an AbsListView away.
+ * Do not call {@link android.widget.AbsListView#setOnTouchListener(android.view.View.OnTouchListener)} or
+ * {@link android.widget.AbsListView#setOnScrollListener(android.widget.AbsListView.OnScrollListener)} on your AbsListView! To use an {@link android.widget.AbsListView.OnScrollListener},
+ * extends {@link SwipeOnScrollListener} and
+ * pass it in the constructor {@link #SwipeDismissAdapter(android.widget.BaseAdapter, com.nhaarman.listviewanimations.itemmanipulation.OnDismissCallback, SwipeOnScrollListener)}.
+ */
+public class SwipeDismissAdapter extends BaseAdapterDecorator {
+
+    protected OnDismissCallback mOnDismissCallback;
+    protected SwipeDismissListViewTouchListener mSwipeDismissListViewTouchListener;
+    protected SwipeOnScrollListener mSwipeOnScrollListener;
+
+    /**
+     * Create a new SwipeDismissAdapter.
+     *
+     * @param baseAdapter       the {@link android.widget.BaseAdapter to use}
+     * @param onDismissCallback the {@link OnDismissCallback} to be notified of dismissed items.
+     */
+    public SwipeDismissAdapter(final BaseAdapter baseAdapter, final OnDismissCallback onDismissCallback) {
+        this(baseAdapter, onDismissCallback, new SwipeOnScrollListener());
+    }
+
+    /**
+     * Create a new SwipeDismissAdapter.
+     *
+     * @param baseAdapter           the {@link android.widget.BaseAdapter to use}
+     * @param onDismissCallback     the {@link OnDismissCallback} to be notified of dismissed items.
+     * @param swipeOnScrollListener the {@link SwipeOnScrollListener} to use.
+     */
+    public SwipeDismissAdapter(final BaseAdapter baseAdapter, final OnDismissCallback onDismissCallback, final SwipeOnScrollListener swipeOnScrollListener) {
+        super(baseAdapter);
+        mOnDismissCallback = onDismissCallback;
+        mSwipeOnScrollListener = swipeOnScrollListener;
+    }
+
+    protected SwipeDismissListViewTouchListener createListViewTouchListener(final AbsListView listView) {
+        return new SwipeDismissListViewTouchListener(listView, mOnDismissCallback, mSwipeOnScrollListener);
+    }
+
+    @Override
+    public void setAbsListView(final AbsListView listView) {
+        super.setAbsListView(listView);
+        if (mDecoratedBaseAdapter instanceof ArrayAdapter<?>) {
+            ((ArrayAdapter<?>) mDecoratedBaseAdapter).propagateNotifyDataSetChanged(this);
+        }
+        mSwipeDismissListViewTouchListener = createListViewTouchListener(listView);
+        mSwipeDismissListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer());
+        mSwipeDismissListViewTouchListener.setTouchChild(getTouchChild());
+        listView.setOnTouchListener(mSwipeDismissListViewTouchListener);
+    }
+
+    @Override
+    public void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
+        super.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
+        if (mSwipeDismissListViewTouchListener != null) {
+            mSwipeDismissListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
+        }
+    }
+
+    @Override
+    public void notifyDataSetChanged() {
+        super.notifyDataSetChanged();
+        if (mSwipeDismissListViewTouchListener != null) {
+            mSwipeDismissListViewTouchListener.notifyDataSetChanged();
+        }
+    }
+
+    @Override
+    public void setTouchChild(final int childResId) {
+        super.setTouchChild(childResId);
+        if (mSwipeDismissListViewTouchListener != null) {
+            mSwipeDismissListViewTouchListener.setTouchChild(childResId);
+        }
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeDismissListViewTouchListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeDismissListViewTouchListener.java
new file mode 100644
index 00000000..a5cfbd3a
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeDismissListViewTouchListener.java
@@ -0,0 +1,469 @@
+// THIS IS A BETA! I DON'T RECOMMEND USING IT IN PRODUCTION CODE JUST YET
+
+/*
+ * Copyright 2012 Roman Nurik
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
+
+import android.annotation.SuppressLint;
+import android.graphics.Rect;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.ListView;
+
+import com.nhaarman.listviewanimations.itemmanipulation.OnDismissCallback;
+import com.nhaarman.listviewanimations.util.AdapterViewUtil;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.nineoldandroids.animation.ValueAnimator;
+import com.nineoldandroids.view.ViewHelper;
+import com.nineoldandroids.view.ViewPropertyAnimator;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
+
+/**
+ * A {@link android.view.View.OnTouchListener} that makes the list items in a
+ * {@link ListView} dismissable. {@link ListView} is given special treatment
+ * because by default it handles touches for its list items... i.e. it's in
+ * charge of drawing the pressed state (the list selector), handling list item
+ * clicks, etc.
+ *
+ * For performance reasons, do not use this class directly, but use the {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeDismissAdapter}.
+ */
+@SuppressLint("Recycle")
+public class SwipeDismissListViewTouchListener implements SwipeOnTouchListener {
+
+    private static final int MIN_FLING_VELOCITY_FACTOR = 16;
+    // Cached ViewConfiguration and system-wide constant values
+    private final int mSlop;
+    private final int mMinFlingVelocity;
+    private final int mMaxFlingVelocity;
+    protected long mAnimationTime;
+
+    // Fixed properties
+    private final AbsListView mListView;
+    private final OnDismissCallback mCallback;
+    private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero
+
+    // Transient properties
+    protected List<PendingDismissData> mPendingDismisses = new ArrayList<PendingDismissData>();
+    private int mDismissAnimationRefCount = 0;
+    private float mDownX;
+    private float mDownY;
+    private boolean mSwiping;
+
+    private VelocityTracker mVelocityTracker;
+    private PendingDismissData mCurrentDismissData;
+
+    private int mVirtualListCount = -1;
+
+    private boolean mDisallowSwipe;
+    private boolean mIsParentHorizontalScrollContainer;
+    private int mResIdOfTouchChild;
+    private boolean mTouchChildTouched;
+
+    private DismissableManager mDismissableManager;
+
+    /**
+     * Constructs a new swipe-to-dismiss touch listener for the given list view.
+     *
+     * @param listView
+     *            The list view whose items should be dismissable.
+     * @param callback
+     *            The callback to trigger when the user has indicated that she
+     *            would like to dismiss one or more list items.
+     */
+    public SwipeDismissListViewTouchListener(final AbsListView listView, final OnDismissCallback callback, final SwipeOnScrollListener onScroll) {
+        ViewConfiguration vc = ViewConfiguration.get(listView.getContext());
+        mSlop = vc.getScaledTouchSlop();
+        mMinFlingVelocity = vc.getScaledMinimumFlingVelocity() * MIN_FLING_VELOCITY_FACTOR;
+        mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
+        mAnimationTime = listView.getContext().getResources().getInteger(android.R.integer.config_shortAnimTime);
+        mListView = listView;
+        mCallback = callback;
+
+        onScroll.setTouchListener(this);
+        mListView.setOnScrollListener(onScroll);
+    }
+
+    public void disallowSwipe() {
+        mDisallowSwipe = true;
+    }
+
+    @SuppressWarnings("UnusedDeclaration")
+    public void allowSwipe() {
+        mDisallowSwipe = false;
+    }
+
+    /**
+     * Set the {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.DismissableManager} to specify which views can or cannot be swiped.
+     * @param dismissableManager null for no restrictions.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setDismissableManager(final DismissableManager dismissableManager) {
+        mDismissableManager = dismissableManager;
+    }
+
+    @Override
+    public boolean onTouch(final View view, final MotionEvent motionEvent) {
+        if (mVirtualListCount == -1) {
+            mVirtualListCount = mListView.getAdapter().getCount();
+        }
+
+        if (mViewWidth < 2) {
+            mViewWidth = mListView.getWidth();
+        }
+
+        switch (motionEvent.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                mDisallowSwipe = false;
+                view.onTouchEvent(motionEvent);
+                return handleDownEvent(motionEvent);
+            case MotionEvent.ACTION_MOVE:
+                return handleMoveEvent(motionEvent);
+            case MotionEvent.ACTION_CANCEL:
+                return handleCancelEvent(motionEvent);
+            case MotionEvent.ACTION_UP:
+
+                mDisallowSwipe = false;
+                mTouchChildTouched = false;
+                return handleUpEvent(motionEvent);
+
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isSwiping() {
+        return mSwiping;
+    }
+
+    /**
+     * Factory to allow override of dismiss data
+     */
+    protected PendingDismissData createPendingDismissData(final int position, final View view) {
+        return new PendingDismissData(position, view);
+    }
+
+    private boolean handleDownEvent(final MotionEvent motionEvent) {
+        // Find the child view that was touched (perform a hit test)
+        Rect rect = new Rect();
+        int childCount = mListView.getChildCount();
+        int[] listViewCoords = new int[2];
+        mListView.getLocationOnScreen(listViewCoords);
+        int x = (int) motionEvent.getRawX() - listViewCoords[0];
+        int y = (int) motionEvent.getRawY() - listViewCoords[1];
+        View downView = null;
+        for (int i = 0; i < childCount && downView == null; i++) {
+            View child = mListView.getChildAt(i);
+            child.getHitRect(rect);
+            if (rect.contains(x, y)) {
+                downView = child;
+            }
+        }
+
+        if (downView != null) {
+            mDownX = motionEvent.getRawX();
+            mDownY = motionEvent.getRawY();
+            int downPosition = AdapterViewUtil.getPositionForView(mListView, downView);
+
+            if (mDismissableManager != null) {
+                long downId = mListView.getAdapter().getItemId(downPosition);
+                if (!mDismissableManager.isDismissable(downId, downPosition)) {
+                    /* Cancel, not dismissable */
+                    return false;
+                }
+            }
+
+            mCurrentDismissData = createPendingDismissData(downPosition, downView);
+
+            if (mPendingDismisses.contains(mCurrentDismissData) || downPosition >= mVirtualListCount) {
+                // Cancel, we're already processing this position
+                mCurrentDismissData = null;
+                return false;
+            } else {
+                mTouchChildTouched = !mIsParentHorizontalScrollContainer && mResIdOfTouchChild == 0;
+
+                if (mResIdOfTouchChild != 0) {
+                    mIsParentHorizontalScrollContainer = false;
+
+                    final View childView = downView.findViewById(mResIdOfTouchChild);
+                    if (childView != null) {
+                        final Rect childRect = getChildViewRect(mListView, childView);
+                        if (childRect.contains((int) motionEvent.getX(), (int) motionEvent.getY())) {
+                            mTouchChildTouched = true;
+                            mListView.requestDisallowInterceptTouchEvent(true);
+                        }
+                    }
+                }
+
+                if (mIsParentHorizontalScrollContainer) {
+                    // Do it now and don't wait until the user moves more than
+                    // the slop factor.
+                    mTouchChildTouched = true;
+                    mListView.requestDisallowInterceptTouchEvent(true);
+                }
+
+                mVelocityTracker = VelocityTracker.obtain();
+                mVelocityTracker.addMovement(motionEvent);
+            }
+        }
+        return true;
+    }
+
+    private Rect getChildViewRect(final View parentView, View childView) {
+        final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
+        if (parentView == childView) {
+            return childRect;
+
+        }
+
+        ViewGroup parent;
+        while ((parent = (ViewGroup) childView.getParent()) != parentView) {
+            childRect.offset(parent.getLeft(), parent.getTop());
+            childView = parent;
+        }
+
+        return childRect;
+    }
+
+    private boolean handleMoveEvent(final MotionEvent motionEvent) {
+        if (mVelocityTracker == null) {
+            return false;
+        }
+
+        mVelocityTracker.addMovement(motionEvent);
+        float deltaX = motionEvent.getRawX() - mDownX;
+        float deltaY = motionEvent.getRawY() - mDownY;
+        if (mTouchChildTouched && !mDisallowSwipe && Math.abs(deltaX) > mSlop && Math.abs(deltaX) > Math.abs(deltaY)) {
+            mSwiping = true;
+            mListView.requestDisallowInterceptTouchEvent(true);
+
+            // Cancel ListView's touch (un-highlighting the item)
+            MotionEvent cancelEvent = MotionEvent.obtain(motionEvent);
+            cancelEvent.setAction(MotionEvent.ACTION_CANCEL | motionEvent.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+            mListView.onTouchEvent(cancelEvent);
+        }
+
+        if (mSwiping) {
+            ViewHelper.setTranslationX(mCurrentDismissData.view, deltaX);
+            //noinspection MagicNumber
+            ViewHelper.setAlpha(mCurrentDismissData.view, Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / mViewWidth)));
+            return true;
+        }
+        return false;
+    }
+
+    @SuppressWarnings("UnusedParameters")
+    private boolean handleCancelEvent(final MotionEvent motionEvent) {
+        if (mVelocityTracker == null) {
+            return false;
+        }
+
+        if (mCurrentDismissData != null && mSwiping) {
+            ViewPropertyAnimator.animate(mCurrentDismissData.view)
+                    .translationX(0)
+                    .alpha(1)
+                    .setDuration(mAnimationTime)
+                    .setListener(null);
+        }
+        mVelocityTracker.recycle();
+        mVelocityTracker = null;
+        mDownX = 0;
+        mDownY = 0;
+        mCurrentDismissData = null;
+        mSwiping = false;
+        return false;
+    }
+
+
+    private boolean handleUpEvent(final MotionEvent motionEvent) {
+        if (mVelocityTracker == null) {
+            return false;
+        }
+
+        float deltaX = motionEvent.getRawX() - mDownX;
+        mVelocityTracker.addMovement(motionEvent);
+        mVelocityTracker.computeCurrentVelocity(1000);
+        float velocityX = Math.abs(mVelocityTracker.getXVelocity());
+        float velocityY = Math.abs(mVelocityTracker.getYVelocity());
+        boolean dismiss = false;
+        boolean dismissRight = false;
+        if (Math.abs(deltaX) > mViewWidth / 2) {
+            dismiss = true;
+            dismissRight = deltaX > 0;
+        } else if (mMinFlingVelocity <= velocityX && velocityX <= mMaxFlingVelocity && velocityY < velocityX) {
+            dismiss = true;
+            dismissRight = mVelocityTracker.getXVelocity() > 0;
+        }
+
+        if (mSwiping) {
+            if (dismiss) {
+                // mDownView gets null'd before animation ends
+                final PendingDismissData pendingDismissData = mCurrentDismissData;
+                ++mDismissAnimationRefCount;
+
+                animate(mCurrentDismissData.view).translationX(dismissRight ? mViewWidth : -mViewWidth).alpha(0).setDuration(mAnimationTime).setListener(new AnimatorListenerAdapter() {
+
+                    @Override
+                    public void onAnimationEnd(final Animator animation) {
+                        onDismiss(pendingDismissData);
+                    }
+                });
+
+                mVirtualListCount--;
+                mPendingDismisses.add(mCurrentDismissData);
+            } else {
+                // cancel
+                animate(mCurrentDismissData.view).translationX(0).alpha(1).setDuration(mAnimationTime).setListener(null);
+            }
+        }
+
+        mVelocityTracker.recycle();
+        mVelocityTracker = null;
+        mDownX = 0;
+        mDownY = 0;
+        mCurrentDismissData = null;
+        mSwiping = false;
+        return false;
+    }
+
+    protected class PendingDismissData implements Comparable<PendingDismissData> {
+        public final int position;
+        public final View view;
+
+        public PendingDismissData(final int position, final View view) {
+            this.position = position;
+            this.view = view;
+        }
+
+        @Override
+        public int compareTo(final PendingDismissData other) {
+            // Sort by descending position
+            return other.position - position;
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + position;
+            return result;
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (((Object) this).getClass() != obj.getClass())
+                return false;
+            PendingDismissData other = (PendingDismissData) obj;
+            return position == other.position;
+        }
+
+    }
+
+    protected void onDismiss(final PendingDismissData data) {
+        // default behaviour
+        performDismiss(data);
+    }
+
+    protected void performDismiss(final PendingDismissData data) {
+        // Animate the dismissed list item to zero-height and fire the
+        // dismiss callback when all dismissed list item animations have
+        // completed.
+
+        final ViewGroup.LayoutParams lp = data.view.getLayoutParams();
+        final int originalHeight = data.view.getHeight();
+
+        ValueAnimator animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime);
+
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(final ValueAnimator valueAnimator) {
+                lp.height = (Integer) valueAnimator.getAnimatedValue();
+                data.view.setLayoutParams(lp);
+            }
+        });
+
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(final Animator animation) {
+                finalizeDismiss();
+            }
+        });
+        animator.start();
+    }
+
+    /**
+     * Here you can manage dismissed View.
+     */
+    protected void recycleDismissedViewsItems(final List<PendingDismissData> pendingDismisses) {
+        ViewGroup.LayoutParams lp;
+        for (final PendingDismissData pendingDismiss : pendingDismisses) {
+            // Reset view presentation
+            ViewHelper.setAlpha(pendingDismiss.view, 1f);
+            ViewHelper.setTranslationX(pendingDismiss.view, 0);
+            lp = pendingDismiss.view.getLayoutParams();
+            lp.height = 0;
+            pendingDismiss.view.setLayoutParams(lp);
+        }
+    }
+
+    protected void finalizeDismiss() {
+        --mDismissAnimationRefCount;
+        if (mDismissAnimationRefCount == 0) {
+            // No active animations, process all pending dismisses.
+            // Sort by descending position
+            Collections.sort(mPendingDismisses);
+
+            int[] dismissPositions = new int[mPendingDismisses.size()];
+            for (int i = mPendingDismisses.size() - 1; i >= 0; i--) {
+                dismissPositions[i] = mPendingDismisses.get(i).position;
+            }
+            mCallback.onDismiss(mListView, dismissPositions);
+
+            recycleDismissedViewsItems(mPendingDismisses);
+
+            mPendingDismisses.clear();
+        }
+    }
+
+    void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
+        mIsParentHorizontalScrollContainer = mResIdOfTouchChild == 0 && isParentHorizontalScrollContainer;
+    }
+
+    void setTouchChild(final int childResId) {
+        mResIdOfTouchChild = childResId;
+        if (childResId != 0) {
+            setIsParentHorizontalScrollContainer(false);
+        }
+    }
+
+    public void notifyDataSetChanged() {
+        mVirtualListCount = mListView.getAdapter().getCount();
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnScrollListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnScrollListener.java
new file mode 100644
index 00000000..f5ea2372
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnScrollListener.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * External default OnScrollListener allowing to custom onScrollListening events like loading more items.
+ * Author: David Berlioz
+ */
+
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
+
+import android.widget.AbsListView;
+
+/**
+ * An {@link android.widget.AbsListView.OnScrollListener} that is used in conjunction with {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeDismissAdapter}. Override this class to
+ * provide a custom implementation of the OnScrollListener. Do not forget to call super on the overridden methods!
+ */
+public class SwipeOnScrollListener implements AbsListView.OnScrollListener {
+
+    private SwipeDismissListViewTouchListener mTouchListener;
+
+    public void setTouchListener(final SwipeDismissListViewTouchListener touchListener) {
+        mTouchListener = touchListener;
+    }
+
+    @Override
+    public void onScrollStateChanged(final AbsListView view, final int scrollState) {
+        if (scrollState != AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
+            mTouchListener.disallowSwipe();
+        }
+    }
+
+    @Override
+    public void onScroll(final AbsListView view, final int firstVisibleItem, final int visibleItemCount, final int totalItemCount) {
+    }
+}
diff --git a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeOnTouchListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnTouchListener.java
similarity index 72%
rename from library/src/com/haarman/listviewanimations/itemmanipulation/SwipeOnTouchListener.java
rename to library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnTouchListener.java
index 82eec7a5..c06b29bf 100644
--- a/library/src/com/haarman/listviewanimations/itemmanipulation/SwipeOnTouchListener.java
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/SwipeOnTouchListener.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2013 K–NFB Reading Technology, Inc.
  */
 
-package com.haarman.listviewanimations.itemmanipulation;
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss;
 
 import android.view.View;
 
@@ -12,7 +12,7 @@
  */
 public interface SwipeOnTouchListener extends View.OnTouchListener {
     /**
-     * @return True if the user is currently swiping a list-item horizontally.
+     * @return true if the user is currently swiping a list-item horizontally.
      */
     public boolean isSwiping();
 }
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoAdapter.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoAdapter.java
new file mode 100644
index 00000000..b13965e4
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoAdapter.java
@@ -0,0 +1,567 @@
+/*
+ * Copyright 2013 Frankie Sardo
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.nhaarman.listviewanimations.BaseAdapterDecorator;
+import com.nhaarman.listviewanimations.util.AdapterViewUtil;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.nineoldandroids.animation.ObjectAnimator;
+import com.nineoldandroids.animation.ValueAnimator;
+import com.nineoldandroids.view.ViewHelper;
+
+import static com.nineoldandroids.view.ViewHelper.setAlpha;
+import static com.nineoldandroids.view.ViewHelper.setTranslationX;
+import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
+
+/**
+ * Warning: a stable id for each item in the adapter is required. The decorated
+ * adapter should not try to cast convertView to a particular view. The
+ * undoLayout should have the same height as the content row.
+ * <p>
+ * Usage: <br>
+ * * Create a new instance of this class providing the {@link BaseAdapter} to wrap, the undo layout, the undo button id and a {@link DeleteItemCallback}, optionally a delay time millis,
+ * a count down TextView res id,
+ * , a delay in milliseconds before deleting the item.<br>
+ * * Set your {@link ListView} to this ContextualUndoAdapter, and set this ContextualUndoAdapter to your ListView.<br>
+ */
+@SuppressWarnings("UnusedDeclaration")
+public class ContextualUndoAdapter extends BaseAdapterDecorator implements ContextualUndoListViewTouchListener.Callback {
+
+    private static final int ANIMATION_DURATION = 150;
+    private static final String EXTRA_ACTIVE_REMOVED_ID = "removedId";
+    private static final String X = "x";
+
+    private final int mUndoLayoutId;
+    private final int mUndoActionId;
+    private final int mCountDownTextViewResId;
+    private final int mAutoDeleteDelayMillis;
+
+    private long mDismissStartMillis;
+
+    private ContextualUndoView mCurrentRemovedView;
+    private long mCurrentRemovedId;
+
+    private final Handler mHandler;
+    private final CountDownRunnable mCountDownRunnable;
+
+    private final DeleteItemCallback mDeleteItemCallback;
+    private final CountDownFormatter mCountDownFormatter;
+
+    private ContextualUndoListViewTouchListener mContextualUndoListViewTouchListener;
+
+    /**
+     * Create a new ContextualUndoAdapter based on given parameters.
+     *
+     * @param baseAdapter  The {@link BaseAdapter} to wrap
+     * @param undoLayoutId The layout resource id to show as undo
+     * @param undoActionId The id of the component which undoes the dismissal
+     * @param deleteItemCallback The {@link DeleteItemCallback} which is called when an item should be deleted from your collection.
+     */
+    public ContextualUndoAdapter(final BaseAdapter baseAdapter, final int undoLayoutId, final int undoActionId, final DeleteItemCallback deleteItemCallback) {
+        this(baseAdapter, undoLayoutId, undoActionId, -1, -1, deleteItemCallback, null);
+    }
+
+    /**
+     * Create a new ContextualUndoAdapter based on given parameters.
+     * Will automatically remove the swiped item after autoDeleteTimeMillis milliseconds.
+     *
+     * @param baseAdapter  The {@link BaseAdapter} to wrap
+     * @param undoLayoutResId The layout resource id to show as undo
+     * @param undoActionResId The id of the component which undoes the dismissal
+     * @param autoDeleteTimeMillis The time in milliseconds that the adapter will wait for he user to hit undo before automatically deleting the item
+     * @param deleteItemCallback The {@link DeleteItemCallback} which is called when an item should be deleted from your collection.
+     */
+    public ContextualUndoAdapter(final BaseAdapter baseAdapter, final int undoLayoutResId, final int undoActionResId, final int autoDeleteTimeMillis, final DeleteItemCallback deleteItemCallback) {
+        this(baseAdapter, undoLayoutResId, undoActionResId, autoDeleteTimeMillis, -1, deleteItemCallback, null);
+    }
+
+    /**
+     * Create a new ContextualUndoAdapter based on given parameters.
+     * Will automatically remove the swiped item after autoDeleteTimeMillis milliseconds.
+     *
+     * @param baseAdapter  The {@link BaseAdapter} to wrap
+     * @param undoLayoutResId The layout resource id to show as undo
+     * @param undoActionResId The resource id of the component which undoes the dismissal
+     * @param autoDeleteTime The time in milliseconds that adapter will wait for user to hit undo before automatically deleting item
+     * @param countDownTextViewResId The resource id of the {@link TextView} in the undoLayoutResId that will show the time left
+     * @param deleteItemCallback The {@link DeleteItemCallback} which is called when an item should be deleted from your collection.
+     * @param countDownFormatter The {@link CountDownFormatter} which provides text to be shown in the {@link TextView} as specified by countDownTextViewResId
+     */
+    public ContextualUndoAdapter(final BaseAdapter baseAdapter, final int undoLayoutResId, final int undoActionResId, final int autoDeleteTime, final int countDownTextViewResId,
+                                 final DeleteItemCallback deleteItemCallback, final CountDownFormatter countDownFormatter) {
+        super(baseAdapter);
+
+        mHandler = new Handler();
+        mCountDownRunnable = new CountDownRunnable();
+
+        mUndoLayoutId = undoLayoutResId;
+        mUndoActionId = undoActionResId;
+        mCurrentRemovedId = -1;
+        mAutoDeleteDelayMillis = autoDeleteTime;
+        mCountDownTextViewResId = countDownTextViewResId;
+
+        mDeleteItemCallback = deleteItemCallback;
+        mCountDownFormatter = countDownFormatter;
+    }
+
+    @Override
+    public final View getView(final int position, final View convertView, final ViewGroup parent) {
+        final ViewHolder vh;
+        ContextualUndoView contextualUndoView = (ContextualUndoView) convertView;
+        if (contextualUndoView == null) {
+            contextualUndoView = new ContextualUndoView(parent.getContext(), mUndoLayoutId, mCountDownTextViewResId);
+            contextualUndoView.findViewById(mUndoActionId).setOnClickListener(new UndoListener(contextualUndoView));
+            vh = new ViewHolder(contextualUndoView);
+        } else {
+            vh = ViewHolder.getViewHolder(contextualUndoView);
+        }
+
+        View contentView = super.getView(position, contextualUndoView.getContentView(), contextualUndoView);
+        contextualUndoView.updateContentView(contentView);
+
+        long itemId = getItemId(position);
+        vh.mItemId = itemId;
+
+        if (itemId == mCurrentRemovedId) {
+            contextualUndoView.displayUndo();
+            long millisLeft = mAutoDeleteDelayMillis - (System.currentTimeMillis() - mDismissStartMillis);
+            if (mCountDownFormatter != null) {
+                contextualUndoView.updateCountDownTimer(mCountDownFormatter.getCountDownString(millisLeft));
+            }
+        } else {
+            contextualUndoView.displayContentView();
+        }
+
+        contextualUndoView.setItemId(itemId);
+        return contextualUndoView;
+    }
+
+    @Override
+    public void setAbsListView(final AbsListView listView) {
+        super.setAbsListView(listView);
+        mContextualUndoListViewTouchListener = new ContextualUndoListViewTouchListener(listView, this);
+        mContextualUndoListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer());
+        mContextualUndoListViewTouchListener.setTouchChild(getTouchChild());
+        listView.setOnTouchListener(mContextualUndoListViewTouchListener);
+        listView.setOnScrollListener(mContextualUndoListViewTouchListener.makeScrollListener());
+        listView.setOnHierarchyChangeListener(new HierarchyChangeListener());
+    }
+
+    @Override
+    public void onViewSwiped(final long dismissViewItemId, final int dismissPosition) {
+        ContextualUndoView contextualUndoView = getContextualUndoView(dismissViewItemId);
+        if (contextualUndoView == null) {
+            removePreviousContextualUndoIfPresent();
+            mCurrentRemovedView = null;
+            mCurrentRemovedId = dismissViewItemId;
+        } else if (contextualUndoView.isContentDisplayed()) {
+            restoreViewPosition(contextualUndoView);
+            contextualUndoView.displayUndo();
+            removePreviousContextualUndoIfPresent();
+            setCurrentRemovedView(contextualUndoView);
+
+            if (mAutoDeleteDelayMillis > 0) {
+                startAutoDeleteTimer();
+            }
+        } else {
+            performRemovalIfNecessary();
+        }
+    }
+
+    private ContextualUndoView getContextualUndoView(final long dismissViewItemId) {
+        ContextualUndoView contextualUndoView = null;
+
+        AbsListView listView = getAbsListView();
+        int childCount = listView.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = listView.getChildAt(i);
+            if (child instanceof ContextualUndoView) {
+                ContextualUndoView listItem = (ContextualUndoView) child;
+                if (listItem.getItemId() == dismissViewItemId) {
+                    contextualUndoView = listItem;
+                }
+            }
+        }
+        return contextualUndoView;
+    }
+
+    private void startAutoDeleteTimer() {
+        mHandler.removeCallbacks(mCountDownRunnable);
+
+        if (mCountDownFormatter != null) {
+            mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(mAutoDeleteDelayMillis));
+        }
+
+        mDismissStartMillis = System.currentTimeMillis();
+        mHandler.postDelayed(mCountDownRunnable, Math.min(1000, mAutoDeleteDelayMillis));
+    }
+
+    private void restoreViewPosition(final View view) {
+        setAlpha(view, 1f);
+        setTranslationX(view, 0);
+    }
+
+    private void removePreviousContextualUndoIfPresent() {
+        if (mCurrentRemovedView != null) {
+            performRemovalIfNecessary();
+        }
+    }
+
+    private void setCurrentRemovedView(final ContextualUndoView currentRemovedView) {
+        mCurrentRemovedView = currentRemovedView;
+        mCurrentRemovedId = currentRemovedView.getItemId();
+    }
+
+    private void clearCurrentRemovedView() {
+        mCurrentRemovedView = null;
+        mCurrentRemovedId = -1;
+        mHandler.removeCallbacks(mCountDownRunnable);
+    }
+
+    @Override
+    public void onListScrolled() {
+        performRemovalIfNecessary();
+    }
+
+    private void performRemovalIfNecessary() {
+        if (mCurrentRemovedId == -1) {
+            return;
+        }
+
+        ContextualUndoView currentRemovedView = getCurrentRemovedView(mCurrentRemovedView, mCurrentRemovedId);
+        if (currentRemovedView != null) {
+            ValueAnimator animator = ValueAnimator.ofInt(currentRemovedView.getHeight(), 1).setDuration(ANIMATION_DURATION);
+
+            RemoveViewAnimatorListenerAdapter listener = new RemoveViewAnimatorListenerAdapter(currentRemovedView, mCurrentRemovedId);
+            RemoveViewAnimatorUpdateListener updateListener = new RemoveViewAnimatorUpdateListener(listener);
+
+            animator.addListener(listener);
+            animator.addUpdateListener(updateListener);
+            animator.start();
+        } else {
+            // The hard way.
+            deleteItemGivenId(mCurrentRemovedId);
+        }
+        clearCurrentRemovedView();
+    }
+
+    private void deleteItemGivenId(final long deleteItemId) {
+        int position = -1;
+        int numItems = getCount();
+        for (int i = 0; i < numItems; i++) {
+            long itemId = getItemId(i);
+            if (itemId == deleteItemId) {
+                position = i;
+                break;
+            }
+        }
+
+        if (position >= 0) {
+            mDeleteItemCallback.deleteItem(position);
+        }
+    }
+
+    private ContextualUndoView getCurrentRemovedView(final ContextualUndoView currentRemovedView, final long itemId) {
+        ContextualUndoView result = currentRemovedView;
+        if (result == null ||
+                result.getParent() == null ||
+                result.getItemId() != itemId ||
+                AdapterViewUtil.getPositionForView(getAbsListView(), result) < 0) {
+            result = getContextualUndoView(itemId);
+        }
+        return result;
+    }
+
+    /**
+     * This method should be called in your {@link Activity}'s {@link Activity#onSaveInstanceState(Bundle)} to remember dismissed statuses.
+     * @param outState the {@link Bundle} provided by Activity.onSaveInstanceState(Bundle).
+     */
+    public void onSaveInstanceState(final Bundle outState) {
+        outState.putLong(EXTRA_ACTIVE_REMOVED_ID, mCurrentRemovedId);
+    }
+
+    /**
+     * This method should be called in your {@link Activity#onRestoreInstanceState(Bundle)} to remember dismissed statuses.
+     */
+    public void onRestoreInstanceState(final Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            mCurrentRemovedId = savedInstanceState.getLong(EXTRA_ACTIVE_REMOVED_ID, -1);
+        }
+    }
+
+    /**
+     * Animate the item at given position away and show the undo {@link View}.
+     * @param position the position.
+     */
+    public void swipeViewAtPosition(final int position) {
+        mCurrentRemovedId = getItemId(position);
+        for (int i = 0; i < getAbsListView().getChildCount(); i++) {
+            AbsListView absListView = getAbsListView();
+            View childView = absListView.getChildAt(i);
+            int positionForView = AdapterViewUtil.getPositionForView(absListView, childView);
+            if (positionForView == position) {
+                swipeView(childView, positionForView);
+            }
+        }
+    }
+
+    private void swipeView(final View view, final int dismissPosition) {
+        ObjectAnimator animator = ObjectAnimator.ofFloat(view, X, view.getMeasuredWidth());
+        animator.addListener(new AnimatorListenerAdapter() {
+
+            @Override
+            public void onAnimationEnd(final Animator animator) {
+                onViewSwiped(((ContextualUndoView) view).getItemId(), dismissPosition);
+            }
+        });
+        animator.start();
+    }
+
+    @Override
+    public void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
+        super.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
+        if (mContextualUndoListViewTouchListener != null) {
+            mContextualUndoListViewTouchListener.setIsParentHorizontalScrollContainer(isParentHorizontalScrollContainer);
+        }
+    }
+
+    @Override
+    public void setTouchChild(final int childResId) {
+        super.setTouchChild(childResId);
+        if (mContextualUndoListViewTouchListener != null) {
+            mContextualUndoListViewTouchListener.setTouchChild(childResId);
+        }
+    }
+
+    /**
+     * Removes any item that was swiped away.
+     * @param animate If true, animates the removal (collapsing the item).
+     *                If false, removes item immediately without animation.
+     * @deprecated use {@link #removePendingItem()} or {@link #animateRemovePendingItem()} instead.
+     */
+    @Deprecated
+    public void removePendingItem(final boolean animate) {
+        if (animate) {
+            animateRemovePendingItem();
+        } else {
+            removePendingItem();
+        }
+    }
+
+    /**
+     * Cancels the count down, and removes any item that was swiped away, without animating. Will cause {@link DeleteItemCallback#deleteItem(int)} to be called.
+     */
+    public void removePendingItem() {
+        if (mCurrentRemovedView != null || mCurrentRemovedId >= 0) {
+            new RemoveViewAnimatorListenerAdapter(mCurrentRemovedView, mCurrentRemovedId).onAnimationEnd(null);
+            clearCurrentRemovedView();
+        }
+    }
+
+    /**
+     * Removes any item that was swiped away, animating the removal (collapsing the item). {@link DeleteItemCallback#deleteItem(int)} to be called.
+     */
+    public void animateRemovePendingItem() {
+        removePreviousContextualUndoIfPresent();
+    }
+
+    /**
+     * Cancel the count down. This will not cause the {@link DeleteItemCallback#deleteItem(int)} to be called. Use {@link #removePendingItem()} for that instead.
+     */
+    public void cancelCountDown() {
+        mHandler.removeCallbacks(mCountDownRunnable);
+    }
+
+    /**
+     * A callback interface which is used to notify when items should be removed from the collection.
+     */
+    public interface DeleteItemCallback {
+        /**
+         * Called when an item should be removed from the collection.
+         *
+         * @param position
+         *            the position of the item that should be removed.
+         */
+        public void deleteItem(int position);
+    }
+
+    /**
+     * A callback interface which is used to provide the text to display when counting down.
+     */
+    public interface CountDownFormatter {
+        /**
+         * Called each tick of the CountDownTimer
+         * @param millisLeft time in milliseconds remaining before the item is automatically removed
+         */
+        public String getCountDownString(final long millisLeft);
+    }
+
+    private class CountDownRunnable implements Runnable {
+
+        @Override
+        public void run() {
+            long millisRemaining = mAutoDeleteDelayMillis - (System.currentTimeMillis() - mDismissStartMillis);
+            if (mCountDownFormatter != null) {
+                mCurrentRemovedView.updateCountDownTimer(mCountDownFormatter.getCountDownString(millisRemaining));
+            }
+
+            if (millisRemaining <= 0) {
+                performRemovalIfNecessary();
+            } else {
+                mHandler.postDelayed(this, Math.min(millisRemaining, 1000));
+            }
+        }
+    }
+
+    private class RemoveViewAnimatorListenerAdapter extends AnimatorListenerAdapter {
+
+        private ContextualUndoView mDismissView;
+        private final long mDismissViewId;
+        private final int mOriginalHeight;
+
+        public RemoveViewAnimatorListenerAdapter(final ContextualUndoView dismissView, final long dismissViewId) {
+            mDismissView = dismissView;
+            mDismissViewId = dismissViewId;
+            mOriginalHeight = dismissView.getHeight();
+        }
+
+        @Override
+        public void onAnimationEnd(final Animator animation) {
+            mDismissView = getViewBeingAnimated();
+            if (mDismissView == null) {
+                deleteItemGivenId(mDismissViewId);
+                return;
+            }
+
+            restoreViewPosition(mDismissView);
+            restoreViewDimension(mDismissView);
+            deleteCurrentItem(mDismissView);
+        }
+
+        private void restoreViewDimension(final View view) {
+            ViewGroup.LayoutParams lp;
+            lp = view.getLayoutParams();
+            lp.height = mOriginalHeight;
+            view.setLayoutParams(lp);
+        }
+
+        private void deleteCurrentItem(final View view) {
+            int position = AdapterViewUtil.getPositionForView(getAbsListView(), view);
+            mDeleteItemCallback.deleteItem(position);
+        }
+
+        private ContextualUndoView getViewBeingAnimated() {
+            ContextualUndoView newDismissView = getCurrentRemovedView(mDismissView, mDismissViewId);
+            if (newDismissView != mDismissView) {
+                restoreViewPosition(mDismissView);
+                restoreViewDimension(mDismissView);
+
+                mDismissView = newDismissView;
+            }
+            return mDismissView;
+        }
+    }
+
+    private class RemoveViewAnimatorUpdateListener implements ValueAnimator.AnimatorUpdateListener {
+
+        final RemoveViewAnimatorListenerAdapter mParentAdapter;
+        private final ViewGroup.LayoutParams mLayoutParams;
+
+        public RemoveViewAnimatorUpdateListener(final RemoveViewAnimatorListenerAdapter parentAdapter) {
+            mParentAdapter = parentAdapter;
+            mLayoutParams = parentAdapter.mDismissView.getLayoutParams();
+        }
+
+        @Override
+        public void onAnimationUpdate(final ValueAnimator valueAnimator) {
+            ContextualUndoView dismissView = mParentAdapter.getViewBeingAnimated();
+            if (dismissView != null) {
+                mLayoutParams.height = (Integer) valueAnimator.getAnimatedValue();
+                dismissView.setLayoutParams(mLayoutParams);
+            }
+        }
+    }
+
+    private class UndoListener implements View.OnClickListener {
+
+        private final ContextualUndoView mContextualUndoView;
+
+        public UndoListener(final ContextualUndoView contextualUndoView) {
+            mContextualUndoView = contextualUndoView;
+        }
+
+        @Override
+        public void onClick(final View v) {
+            clearCurrentRemovedView();
+            mContextualUndoView.displayContentView();
+            moveViewOffScreen();
+            animateViewComingBack();
+        }
+
+        private void moveViewOffScreen() {
+            ViewHelper.setTranslationX(mContextualUndoView, mContextualUndoView.getWidth());
+        }
+
+        private void animateViewComingBack() {
+            animate(mContextualUndoView).translationX(0).setDuration(ANIMATION_DURATION).setListener(null);
+        }
+    }
+
+    private class HierarchyChangeListener implements ViewGroup.OnHierarchyChangeListener {
+        @Override
+        public void onChildViewAdded(final View parent, final View child) {
+            final ViewHolder vh = ViewHolder.getViewHolder(child);
+            if (vh != null && mCurrentRemovedId > 0 && vh.mItemId == mCurrentRemovedId) {
+                mCurrentRemovedView = (ContextualUndoView) child;
+            }
+        }
+
+        @Override
+        public void onChildViewRemoved(final View parent, final View child) {
+            final ViewHolder vh = ViewHolder.getViewHolder(child);
+            if (vh != null && mCurrentRemovedId > 0 && vh.mItemId == mCurrentRemovedId) {
+                mCurrentRemovedView = null;
+            }
+        }
+    }
+
+    private static class ViewHolder {
+        final ContextualUndoView mContextualUndoView;
+
+        long mItemId;
+
+        static ViewHolder getViewHolder(final View view) {
+            return (ViewHolder) view.getTag();
+        }
+
+        ViewHolder(final ContextualUndoView contextualUndoView) {
+            mContextualUndoView = contextualUndoView;
+            mContextualUndoView.setTag(this);
+        }
+    }
+}
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoListViewTouchListener.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoListViewTouchListener.java
new file mode 100644
index 00000000..8a82433b
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoListViewTouchListener.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2012 Roman Nurik
+ * Copyright 2013 Frankie Sardo
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo;
+
+import android.graphics.Rect;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.View.OnTouchListener;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.DismissableManager;
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeOnTouchListener;
+import com.nhaarman.listviewanimations.util.AdapterViewUtil;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+
+import static com.nineoldandroids.view.ViewHelper.setAlpha;
+import static com.nineoldandroids.view.ViewHelper.setTranslationX;
+import static com.nineoldandroids.view.ViewPropertyAnimator.animate;
+
+/**
+ * An {@link OnTouchListener} for the {@link ContextualUndoAdapter}. Don't use
+ * this class directly, use ContextualUndoAdapter to wrap your
+ * {@link BaseAdapter}s.
+ */
+public class ContextualUndoListViewTouchListener implements SwipeOnTouchListener {
+    // Cached ViewConfiguration and system-wide constant values
+    private final int mSlop;
+    private final int mMinFlingVelocity;
+    private final int mMaxFlingVelocity;
+    private final long mAnimationTime;
+
+    // Fixed properties
+    private final AbsListView mListView;
+    private final Callback mCallback;
+    private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero
+
+    // Transient properties
+    private float mDownX;
+    private float mDownY;
+    private boolean mSwiping;
+    private VelocityTracker mVelocityTracker;
+    private int mDownPosition;
+    private View mDownView;
+    private boolean mPaused;
+    private boolean mDisallowSwipe;
+
+    private boolean mIsParentHorizontalScrollContainer;
+    private int mResIdOfTouchChild;
+    private boolean mTouchChildTouched;
+
+    private DismissableManager mDismissableManager;
+
+    public interface Callback {
+
+        void onViewSwiped(long dismissViewItemId, int dismissPosition);
+
+        void onListScrolled();
+    }
+
+    public ContextualUndoListViewTouchListener(final AbsListView listView, final Callback callback) {
+        ViewConfiguration vc = ViewConfiguration.get(listView.getContext());
+        mSlop = vc.getScaledTouchSlop();
+        mMinFlingVelocity = vc.getScaledMinimumFlingVelocity();
+        mMaxFlingVelocity = vc.getScaledMaximumFlingVelocity();
+        mAnimationTime = listView.getContext().getResources().getInteger(android.R.integer.config_shortAnimTime);
+        mListView = listView;
+        mCallback = callback;
+    }
+
+    public void setEnabled(final boolean enabled) {
+        mPaused = !enabled;
+    }
+
+    /**
+     * Set the {@link com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.DismissableManager} to specify which views can or cannot be swiped.
+     * @param dismissableManager null for no restrictions.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setDismissableManager(final DismissableManager dismissableManager) {
+        mDismissableManager = dismissableManager;
+    }
+
+    public AbsListView.OnScrollListener makeScrollListener() {
+        return new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(final AbsListView absListView, final int scrollState) {
+                setEnabled(scrollState != AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
+                if (mPaused) {
+                    mCallback.onListScrolled();
+                }
+                if (scrollState != AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
+                    mDisallowSwipe = true;
+                }
+
+            }
+
+            @Override
+            public void onScroll(final AbsListView absListView, final int firstVisibleItem, final int visibleItemCount,
+                                 final int totalItemCount) {
+            }
+        };
+    }
+
+    @Override
+    public boolean onTouch(final View view, final MotionEvent motionEvent) {
+        if (mViewWidth < 2) {
+            mViewWidth = mListView.getWidth();
+        }
+
+        boolean result;
+        switch (motionEvent.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                result = handleDownEvent(view, motionEvent);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                result = handleMoveEvent(view, motionEvent);
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                result = handleUpCancelEvent(view, motionEvent);
+                break;
+            default:
+                result = false;
+        }
+        return result;
+    }
+
+    private boolean handleDownEvent(final View view, final MotionEvent motionEvent) {
+        mDisallowSwipe = false;
+        if (mPaused) {
+            return false;
+        }
+
+        // Find the child view that was touched (perform a hit test)
+        Rect rect = new Rect();
+        int childCount = mListView.getChildCount();
+        int[] listViewCoords = new int[2];
+        mListView.getLocationOnScreen(listViewCoords);
+        int x = (int) motionEvent.getRawX() - listViewCoords[0];
+        int y = (int) motionEvent.getRawY() - listViewCoords[1];
+        View child;
+        for (int i = 0; i < childCount; i++) {
+            child = mListView.getChildAt(i);
+            child.getHitRect(rect);
+            if (rect.contains(x, y)) {
+                mDownView = child;
+                break;
+            }
+        }
+
+        if (mDownView != null && mDownView instanceof ContextualUndoView) {
+            mDownX = motionEvent.getRawX();
+            mDownY = motionEvent.getRawY();
+            int downPosition = AdapterViewUtil.getPositionForView(mListView, mDownView);
+
+            if (mDismissableManager != null) {
+                long downId = mListView.getAdapter().getItemId(downPosition);
+                if (!mDismissableManager.isDismissable(downId, downPosition)) {
+                    /* Cancel, not dismissable */
+                    return false;
+                }
+            }
+
+            mTouchChildTouched = !mIsParentHorizontalScrollContainer && mResIdOfTouchChild == 0;
+
+            if (mResIdOfTouchChild != 0) {
+                mIsParentHorizontalScrollContainer = false;
+
+                final View childView = mDownView.findViewById(mResIdOfTouchChild);
+                if (childView != null) {
+                    final Rect childRect = getChildViewRect(mListView, childView);
+                    if (childRect.contains((int) motionEvent.getX(), (int) motionEvent.getY())) {
+                        mTouchChildTouched = true;
+                        mListView.requestDisallowInterceptTouchEvent(true);
+                    }
+                }
+            }
+
+            if (mIsParentHorizontalScrollContainer) {
+                // Do it now and don't wait until the user moves more than
+                // the slop factor.
+                mTouchChildTouched = true;
+                mListView.requestDisallowInterceptTouchEvent(true);
+            }
+
+            mDownY = motionEvent.getRawY();
+            mDownPosition = AdapterViewUtil.getPositionForView(mListView, mDownView);
+
+            if (mTouchChildTouched) {
+                mVelocityTracker = VelocityTracker.obtain();
+                mVelocityTracker.addMovement(motionEvent);
+            } else {
+                mVelocityTracker = null;
+            }
+        }
+        view.onTouchEvent(motionEvent);
+        return true;
+    }
+
+    @SuppressWarnings("UnusedParameters")
+    private boolean handleMoveEvent(final View view, final MotionEvent motionEvent) {
+        if (mVelocityTracker == null || mPaused) {
+            return false;
+        }
+
+        mVelocityTracker.addMovement(motionEvent);
+        float deltaX = motionEvent.getRawX() - mDownX;
+        float deltaY = motionEvent.getRawY() - mDownY;
+        if (mTouchChildTouched && !mDisallowSwipe && Math.abs(deltaX) > mSlop && Math.abs(deltaX) > Math.abs(deltaY)) {
+            mSwiping = true;
+            mListView.requestDisallowInterceptTouchEvent(true);
+
+            // Cancel ListView's touch (un-highlighting the item)
+            MotionEvent cancelEvent = MotionEvent.obtain(motionEvent);
+            cancelEvent.setAction(MotionEvent.ACTION_CANCEL | motionEvent.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT);
+            mListView.onTouchEvent(cancelEvent);
+            cancelEvent.recycle();
+        }
+
+        if (mSwiping) {
+            setTranslationX(mDownView, deltaX);
+            //noinspection MagicNumber
+            setAlpha(mDownView, Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / mViewWidth)));
+            return true;
+        }
+        return false;
+    }
+
+    @SuppressWarnings("UnusedParameters")
+    private boolean handleUpCancelEvent(final View view, final MotionEvent motionEvent) {
+        mDisallowSwipe = false;
+        if (mVelocityTracker == null) {
+            return false;
+        }
+
+        float deltaX = motionEvent.getRawX() - mDownX;
+        mVelocityTracker.addMovement(motionEvent);
+        mVelocityTracker.computeCurrentVelocity(1000);
+        float velocityX = Math.abs(mVelocityTracker.getXVelocity());
+        float velocityY = Math.abs(mVelocityTracker.getYVelocity());
+        boolean dismiss = false;
+        boolean dismissRight = false;
+        final float absDeltaX = Math.abs(deltaX);
+        if (absDeltaX > mViewWidth / 2) {
+            dismiss = true;
+            dismissRight = deltaX > 0;
+        } else if (mMinFlingVelocity <= velocityX && velocityX <= mMaxFlingVelocity && velocityY < velocityX && absDeltaX > mSlop) {
+            dismiss = true;
+            dismissRight = mVelocityTracker.getXVelocity() > 0;
+        }
+        if (dismiss) {
+            // dismiss
+            final long itemId = ((ContextualUndoView) mDownView).getItemId();
+            // before animation ends
+            final int downPosition = mDownPosition;
+            animate(mDownView).translationX(dismissRight ? mViewWidth : -mViewWidth).alpha(0).setDuration(mAnimationTime).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(final Animator animation) {
+                    mCallback.onViewSwiped(itemId, downPosition);
+                }
+            });
+        } else {
+            // cancel
+            animate(mDownView).translationX(0).alpha(1).setDuration(mAnimationTime).setListener(null);
+        }
+
+        mVelocityTracker.recycle();
+        mVelocityTracker = null;
+        mDownX = 0;
+        mDownView = null;
+        mDownPosition = AdapterView.INVALID_POSITION;
+        mSwiping = false;
+        return false;
+    }
+
+    @Override
+    public boolean isSwiping() {
+        return mSwiping;
+    }
+
+    private Rect getChildViewRect(final View parentView, View childView) {
+        final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
+        if (parentView == childView) {
+            return childRect;
+
+        }
+
+        ViewGroup parent;
+        while ((parent = (ViewGroup) childView.getParent()) != parentView) {
+            childRect.offset(parent.getLeft(), parent.getTop());
+            childView = parent;
+        }
+
+        return childRect;
+    }
+
+    void setIsParentHorizontalScrollContainer(final boolean isParentHorizontalScrollContainer) {
+        mIsParentHorizontalScrollContainer = mResIdOfTouchChild == 0 && isParentHorizontalScrollContainer;
+    }
+
+    void setTouchChild(final int childResId) {
+        mResIdOfTouchChild = childResId;
+        if (childResId != 0) {
+            setIsParentHorizontalScrollContainer(false);
+        }
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoView.java b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoView.java
new file mode 100644
index 00000000..282a6137
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/itemmanipulation/swipedismiss/contextualundo/ContextualUndoView.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 Frankie Sardo
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.contextualundo;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+@SuppressLint("ViewConstructor")
+public class ContextualUndoView extends FrameLayout {
+
+    private View mUndoView;
+    private View mContentView;
+    private TextView mCountDownTV;
+
+    private long mItemId;
+
+    public ContextualUndoView(final Context context, final int undoLayoutResId, final int countDownTextViewResId) {
+        super(context);
+        initUndo(undoLayoutResId, countDownTextViewResId);
+    }
+
+    private void initUndo(final int undoLayoutResId, final int countDownTextViewResId) {
+        mUndoView = View.inflate(getContext(), undoLayoutResId, null);
+        addView(mUndoView);
+
+        if (countDownTextViewResId != -1) {
+            mCountDownTV = (TextView) mUndoView.findViewById(countDownTextViewResId);
+        }
+    }
+
+    public void updateCountDownTimer(final String timerText) {
+        if (mCountDownTV != null) {
+            mCountDownTV.setText(timerText);
+        }
+    }
+
+    public void updateContentView(final View contentView) {
+        if (mContentView == null) {
+            addView(contentView);
+        }
+        mContentView = contentView;
+    }
+
+    public View getContentView() {
+        return mContentView;
+    }
+
+    public void setItemId(final long itemId) {
+        this.mItemId = itemId;
+    }
+
+    public long getItemId() {
+        return mItemId;
+    }
+
+    public boolean isContentDisplayed() {
+        return mContentView.getVisibility() == View.VISIBLE;
+    }
+
+    public void displayUndo() {
+        updateCountDownTimer("");
+        mContentView.setVisibility(View.INVISIBLE);
+        mUndoView.setVisibility(View.VISIBLE);
+    }
+
+    public void displayContentView() {
+        mContentView.setVisibility(View.VISIBLE);
+        mUndoView.setVisibility(View.INVISIBLE);
+    }
+}
\ No newline at end of file
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/AnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/AnimationAdapter.java
new file mode 100644
index 00000000..50925f61
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/AnimationAdapter.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.swinginadapters;
+
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.util.SparseArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+
+import com.nhaarman.listviewanimations.BaseAdapterDecorator;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorSet;
+import com.nineoldandroids.animation.ObjectAnimator;
+import com.nineoldandroids.view.ViewHelper;
+
+/**
+ * A {@link BaseAdapterDecorator} class which applies multiple {@link Animator}s at once to
+ * views when they are first shown. The Animators applied include the animations
+ * specified in {@link #getAnimators(ViewGroup, View)}, plus an alpha transition.
+ */
+public abstract class AnimationAdapter extends BaseAdapterDecorator {
+
+    protected static final long DEFAULTANIMATIONDELAYMILLIS = 100;
+    protected static final long DEFAULTANIMATIONDURATIONMILLIS = 300;
+    private static final long INITIALDELAYMILLIS = 150;
+    private static final String ALPHA = "alpha";
+
+    private final SparseArray<Animator> mAnimators;
+    private long mAnimationStartMillis;
+    private int mFirstAnimatedPosition;
+    private int mLastAnimatedPosition;
+    private boolean mHasParentAnimationAdapter;
+    private boolean mShouldAnimate = true;
+
+    private long mInitialDelayMillis = INITIALDELAYMILLIS;
+    private long mAnimationDelayMillis = DEFAULTANIMATIONDELAYMILLIS;
+    private long mAnimationDurationMillis = DEFAULTANIMATIONDURATIONMILLIS;
+
+    public AnimationAdapter(final BaseAdapter baseAdapter) {
+        super(baseAdapter);
+        mAnimators = new SparseArray<Animator>();
+
+        mAnimationStartMillis = -1;
+        mFirstAnimatedPosition = -1;
+        mLastAnimatedPosition = -1;
+
+        if (baseAdapter instanceof AnimationAdapter) {
+            ((AnimationAdapter) baseAdapter).setHasParentAnimationAdapter(true);
+        }
+    }
+
+    /**
+     * Call this method to reset animation status on all views. The next time
+     * {@link #notifyDataSetChanged()} is called on the base adapter, all views will
+     * animate again. Will also call {@link #setShouldAnimate(boolean)} with a value of true.
+     */
+    public void reset() {
+        mAnimators.clear();
+        mFirstAnimatedPosition = -1;
+        mLastAnimatedPosition = -1;
+        mAnimationStartMillis = -1;
+        mShouldAnimate = true;
+
+        if (getDecoratedBaseAdapter() instanceof AnimationAdapter) {
+            ((AnimationAdapter) getDecoratedBaseAdapter()).reset();
+        }
+    }
+
+    /**
+     * Set whether to animate the {@link View}s or not.
+     * @param shouldAnimate true if the Views should be animated.
+     */
+    public void setShouldAnimate(final boolean shouldAnimate) {
+        mShouldAnimate = shouldAnimate;
+    }
+
+    /**
+     * Set the starting position for which items should animate. Given position will animate as well.
+     * Will also call setShouldAnimate(true).
+     * @param position the position.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setShouldAnimateFromPosition(final int position) {
+        mShouldAnimate = true;
+        mFirstAnimatedPosition = position - 1;
+        mLastAnimatedPosition = position - 1;
+    }
+
+    /**
+     * Set the starting position for which items should animate as the first position which isn't currently visible on screen.
+     * This call is also valid when the {@link View}s haven't been drawn yet.
+     * Will also call setShouldAnimate(true).
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setShouldAnimateNotVisible() {
+        if (getAbsListView() == null) {
+            throw new IllegalStateException("Call setListView() on this AnimationAdapter before setShouldAnimateNotVisible()!");
+        }
+
+        mShouldAnimate = true;
+        mFirstAnimatedPosition = getAbsListView().getLastVisiblePosition();
+        mLastAnimatedPosition = getAbsListView().getLastVisiblePosition();
+    }
+
+    @Override
+    public final View getView(final int position, final View convertView, final ViewGroup parent) {
+        if (!mHasParentAnimationAdapter) {
+            if (getAbsListView() == null) {
+                throw new IllegalStateException("Call setListView() on this AnimationAdapter before setAdapter()!");
+            }
+
+            if (convertView != null) {
+                cancelExistingAnimation(convertView);
+            }
+        }
+
+        View itemView = super.getView(position, convertView, parent);
+
+        if (!mHasParentAnimationAdapter) {
+            animateViewIfNecessary(position, itemView, parent);
+        }
+        return itemView;
+    }
+
+    private void cancelExistingAnimation(final View convertView) {
+        int hashCode = convertView.hashCode();
+        Animator animator = mAnimators.get(hashCode);
+        if (animator != null) {
+            animator.end();
+            mAnimators.remove(hashCode);
+        }
+    }
+
+    private void animateViewIfNecessary(final int position, final View view, final ViewGroup parent) {
+        boolean isMeasuringGridViewItem = getAbsListView() instanceof GridView && parent.getHeight() == 0;
+
+        if (position > mLastAnimatedPosition && mShouldAnimate && !isMeasuringGridViewItem) {
+            if (mFirstAnimatedPosition == -1) {
+                mFirstAnimatedPosition = position;
+            }
+
+            animateView(parent, view);
+            mLastAnimatedPosition = position;
+        }
+    }
+
+    private void animateView(final ViewGroup parent, final View view) {
+        if (mAnimationStartMillis == -1) {
+            mAnimationStartMillis = System.currentTimeMillis();
+        }
+
+        ViewHelper.setAlpha(view, 0);
+
+        Animator[] childAnimators;
+        if (mDecoratedBaseAdapter instanceof AnimationAdapter) {
+            childAnimators = ((AnimationAdapter) mDecoratedBaseAdapter).getAnimators(parent, view);
+        } else {
+            childAnimators = new Animator[0];
+        }
+        Animator[] animators = getAnimators(parent, view);
+        Animator alphaAnimator = ObjectAnimator.ofFloat(view, ALPHA, 0, 1);
+
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(concatAnimators(childAnimators, animators, alphaAnimator));
+        set.setStartDelay(calculateAnimationDelay());
+        set.setDuration(getAnimationDurationMillis());
+        set.start();
+
+        mAnimators.put(view.hashCode(), set);
+    }
+
+    private Animator[] concatAnimators(final Animator[] childAnimators, final Animator[] animators, final Animator alphaAnimator) {
+        Animator[] allAnimators = new Animator[childAnimators.length + animators.length + 1];
+        int i;
+
+        for (i = 0; i < animators.length; ++i) {
+            allAnimators[i] = animators[i];
+        }
+
+        for (Animator childAnimator : childAnimators) {
+            allAnimators[i] = childAnimator;
+            ++i;
+        }
+
+        allAnimators[allAnimators.length - 1] = alphaAnimator;
+        return allAnimators;
+    }
+
+    @SuppressLint("NewApi")
+    private long calculateAnimationDelay() {
+        long delay;
+
+        int lastVisiblePosition = getAbsListView().getLastVisiblePosition();
+        int firstVisiblePosition = getAbsListView().getFirstVisiblePosition();
+
+        int numberOfItemsOnScreen = lastVisiblePosition - firstVisiblePosition;
+        int numberOfAnimatedItems = mLastAnimatedPosition - mFirstAnimatedPosition;
+
+        if (numberOfItemsOnScreen + 1 < numberOfAnimatedItems) {
+            delay = getAnimationDelayMillis();
+
+            if (getAbsListView() instanceof GridView && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                delay += getAnimationDelayMillis() * ((mLastAnimatedPosition + 1) % ((GridView) getAbsListView()).getNumColumns());
+            }
+        } else {
+            long delaySinceStart = (mLastAnimatedPosition - mFirstAnimatedPosition + 1) * getAnimationDelayMillis();
+            delay = mAnimationStartMillis + getInitialDelayMillis() + delaySinceStart - System.currentTimeMillis();
+        }
+        return Math.max(0, delay);
+    }
+
+    /**
+     * Set whether this AnimationAdapter is encapsulated by another
+     * AnimationAdapter. When this is set to true, this AnimationAdapter does
+     * not apply any animations to the views. Should not be set explicitly, the
+     * AnimationAdapter class manages this by itself.
+     */
+    public void setHasParentAnimationAdapter(final boolean hasParentAnimationAdapter) {
+        mHasParentAnimationAdapter = hasParentAnimationAdapter;
+    }
+
+    /**
+     * Get the delay in milliseconds before the first animation should start. Defaults to {@value #INITIALDELAYMILLIS}.
+     */
+    protected long getInitialDelayMillis() {
+        return mInitialDelayMillis;
+    }
+
+    /**
+     * Set the delay in milliseconds before the first animation should start. Defaults to {@value #INITIALDELAYMILLIS}.
+     * @param delayMillis the time in milliseconds.
+     */
+    public void setInitialDelayMillis(final long delayMillis) {
+        mInitialDelayMillis = delayMillis;
+    }
+
+    /**
+     * Get the delay in milliseconds before an animation of a view should start. Defaults to {@value #DEFAULTANIMATIONDELAYMILLIS}.
+     */
+    protected long getAnimationDelayMillis() {
+        return mAnimationDelayMillis;
+    }
+
+    /**
+     * Set the delay in milliseconds before an animation of a view should start. Defaults to {@value #DEFAULTANIMATIONDELAYMILLIS}.
+     * @param delayMillis the time in milliseconds.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setAnimationDelayMillis(final long delayMillis) {
+        mAnimationDelayMillis = delayMillis;
+    }
+
+    /**
+     * Get the duration of the animation in milliseconds. Defaults to {@value #DEFAULTANIMATIONDURATIONMILLIS}.
+     */
+    protected long getAnimationDurationMillis() {
+        return mAnimationDurationMillis;
+    }
+
+    /**
+     * Set the duration of the animation in milliseconds. Defaults to {@value #DEFAULTANIMATIONDURATIONMILLIS}.
+     * @param durationMillis the time in milliseconds.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setAnimationDurationMillis(final long durationMillis) {
+        mAnimationDurationMillis = durationMillis;
+    }
+
+    /**
+     * Get the Animators to apply to the views. In addition to the returned
+     * Animators, an alpha transition will be applied to the view.
+     *
+     * @param parent
+     *            The parent of the view
+     * @param view
+     *            The view that will be animated, as retrieved by getView()
+     */
+    public abstract Animator[] getAnimators(ViewGroup parent, View view);
+}
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/ResourceAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/ResourceAnimationAdapter.java
similarity index 61%
rename from library/src/com/haarman/listviewanimations/swinginadapters/ResourceAnimationAdapter.java
rename to library/src/com/nhaarman/listviewanimations/swinginadapters/ResourceAnimationAdapter.java
index be12c558..17d39031 100644
--- a/library/src/com/haarman/listviewanimations/swinginadapters/ResourceAnimationAdapter.java
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/ResourceAnimationAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.haarman.listviewanimations.swinginadapters;
+package com.nhaarman.listviewanimations.swinginadapters;
 
 import android.content.Context;
 import android.view.View;
@@ -29,21 +29,22 @@
  */
 public abstract class ResourceAnimationAdapter<T> extends AnimationAdapter {
 
-	private Context mContext;
+    private final Context mContext;
 
-	public ResourceAnimationAdapter(BaseAdapter baseAdapter, Context context) {
-		super(baseAdapter);
-		mContext = context;
-	}
+    @SuppressWarnings("UnusedDeclaration")
+    public ResourceAnimationAdapter(final BaseAdapter baseAdapter, final Context context) {
+        super(baseAdapter);
+        mContext = context;
+    }
 
-	@Override
-	public Animator[] getAnimators(ViewGroup parent, View view) {
-		return new Animator[] { AnimatorInflater.loadAnimator(mContext, getAnimationResourceId()) };
-	}
+    @Override
+    public Animator[] getAnimators(final ViewGroup parent, final View view) {
+        return new Animator[]{AnimatorInflater.loadAnimator(mContext, getAnimationResourceId())};
+    }
 
-	/**
-	 * Get the resource id of the animation to apply to the views.
-	 */
-	protected abstract int getAnimationResourceId();
+    /**
+     * Get the resource id of the animation to apply to the views.
+     */
+    protected abstract int getAnimationResourceId();
 
 }
diff --git a/library/src/com/haarman/listviewanimations/swinginadapters/SingleAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/SingleAnimationAdapter.java
similarity index 54%
rename from library/src/com/haarman/listviewanimations/swinginadapters/SingleAnimationAdapter.java
rename to library/src/com/nhaarman/listviewanimations/swinginadapters/SingleAnimationAdapter.java
index 074b36b3..7d744d40 100644
--- a/library/src/com/haarman/listviewanimations/swinginadapters/SingleAnimationAdapter.java
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/SingleAnimationAdapter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.haarman.listviewanimations.swinginadapters;
+package com.nhaarman.listviewanimations.swinginadapters;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,25 +27,25 @@
  */
 public abstract class SingleAnimationAdapter extends AnimationAdapter {
 
-	public SingleAnimationAdapter(BaseAdapter baseAdapter) {
-		super(baseAdapter);
-	}
+    public SingleAnimationAdapter(final BaseAdapter baseAdapter) {
+        super(baseAdapter);
+    }
 
-	@Override
-	public Animator[] getAnimators(ViewGroup parent, View view) {
-		Animator animator = getAnimator(parent, view);
-		return new Animator[] { animator };
-	}
+    @Override
+    public Animator[] getAnimators(final ViewGroup parent, final View view) {
+        Animator animator = getAnimator(parent, view);
+        return new Animator[]{animator};
+    }
 
-	/**
-	 * Get the {@link Animator} to apply to the {@link View}.
-	 * 
-	 * @param parent
-	 *            the {@link ViewGroup} which is the parent of the View.
-	 * @param view
-	 *            the View that will be animated, as retrieved by
-	 *            {@link #getView(int, View, ViewGroup)}.
-	 */
-	protected abstract Animator getAnimator(ViewGroup parent, View view);
+    /**
+     * Get the {@link Animator} to apply to the {@link View}.
+     *
+     * @param parent
+     *            the {@link ViewGroup} which is the parent of the View.
+     * @param view
+     *            the View that will be animated, as retrieved by
+     *            {@link #getView(int, View, ViewGroup)}.
+     */
+    protected abstract Animator getAnimator(ViewGroup parent, View view);
 
 }
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java
new file mode 100644
index 00000000..dac9feb4
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/AlphaInAnimationAdapter.java
@@ -0,0 +1,30 @@
+package com.nhaarman.listviewanimations.swinginadapters.prepared;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.swinginadapters.AnimationAdapter;
+import com.nineoldandroids.animation.Animator;
+
+public class AlphaInAnimationAdapter extends AnimationAdapter {
+
+    public AlphaInAnimationAdapter(final BaseAdapter baseAdapter) {
+        super(baseAdapter);
+    }
+
+    @Override
+    protected long getAnimationDelayMillis() {
+        return DEFAULTANIMATIONDELAYMILLIS;
+    }
+
+    @Override
+    protected long getAnimationDurationMillis() {
+        return DEFAULTANIMATIONDURATIONMILLIS;
+    }
+
+    @Override
+    public Animator[] getAnimators(final ViewGroup parent, final View view) {
+        return new Animator[0];
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/ScaleInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/ScaleInAnimationAdapter.java
new file mode 100644
index 00000000..90f075a4
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/ScaleInAnimationAdapter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.swinginadapters.prepared;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.swinginadapters.AnimationAdapter;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.ObjectAnimator;
+
+public class ScaleInAnimationAdapter extends AnimationAdapter {
+
+    private static final float DEFAULTSCALEFROM = 0.8f;
+    private static final String SCALE_X = "scaleX";
+    private static final String SCALE_Y = "scaleY";
+
+    private final float mScaleFrom;
+    private final long mAnimationDelayMillis;
+    private final long mAnimationDurationMillis;
+
+    public ScaleInAnimationAdapter(final BaseAdapter baseAdapter) {
+        this(baseAdapter, DEFAULTSCALEFROM);
+    }
+
+    public ScaleInAnimationAdapter(final BaseAdapter baseAdapter, final float scaleFrom) {
+        this(baseAdapter, scaleFrom, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public ScaleInAnimationAdapter(final BaseAdapter baseAdapter, final float scaleFrom, final long animationDelayMillis, final long animationDurationMillis) {
+        super(baseAdapter);
+        mScaleFrom = scaleFrom;
+        mAnimationDelayMillis = animationDelayMillis;
+        mAnimationDurationMillis = animationDurationMillis;
+    }
+
+    @Override
+    protected long getAnimationDelayMillis() {
+        return mAnimationDelayMillis;
+    }
+
+    @Override
+    protected long getAnimationDurationMillis() {
+        return mAnimationDurationMillis;
+    }
+
+    @Override
+    public Animator[] getAnimators(final ViewGroup parent, final View view) {
+        ObjectAnimator scaleX = ObjectAnimator.ofFloat(view, SCALE_X, mScaleFrom, 1f);
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(view, SCALE_Y, mScaleFrom, 1f);
+        return new ObjectAnimator[]{scaleX, scaleY};
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java
new file mode 100644
index 00000000..8aeecc2d
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingBottomInAnimationAdapter.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.swinginadapters.prepared;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.ObjectAnimator;
+
+/**
+ * An implementation of the AnimationAdapter class which applies a
+ * swing-in-from-bottom-animation to views.
+ */
+public class SwingBottomInAnimationAdapter extends SingleAnimationAdapter {
+
+    private static final String TRANSLATION_Y = "translationY";
+    private final long mAnimationDelayMillis;
+    private final long mAnimationDurationMillis;
+
+    public SwingBottomInAnimationAdapter(final BaseAdapter baseAdapter) {
+        this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public SwingBottomInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis) {
+        this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public SwingBottomInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis, final long animationDurationMillis) {
+        super(baseAdapter);
+        mAnimationDelayMillis = animationDelayMillis;
+        mAnimationDurationMillis = animationDurationMillis;
+    }
+
+    @Override
+    protected long getAnimationDelayMillis() {
+        return mAnimationDelayMillis;
+    }
+
+    @Override
+    protected long getAnimationDurationMillis() {
+        return mAnimationDurationMillis;
+    }
+
+    @Override
+    protected Animator getAnimator(final ViewGroup parent, final View view) {
+        // TODO magic number
+        return ObjectAnimator.ofFloat(view, TRANSLATION_Y, 500, 0);
+    }
+
+}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingLeftInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingLeftInAnimationAdapter.java
new file mode 100644
index 00000000..cc629446
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingLeftInAnimationAdapter.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.swinginadapters.prepared;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.ObjectAnimator;
+
+/**
+ * An implementation of the AnimationAdapter class which applies a
+ * swing-in-from-the-left-animation to views.
+ */
+@SuppressWarnings("UnusedDeclaration")
+public class SwingLeftInAnimationAdapter extends SingleAnimationAdapter {
+
+    private static final String TRANSLATION_X = "translationX";
+    private final long mAnimationDelayMillis;
+    private final long mAnimationDurationMillis;
+
+    public SwingLeftInAnimationAdapter(final BaseAdapter baseAdapter) {
+        this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public SwingLeftInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis) {
+        this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public SwingLeftInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis, final long animationDurationMillis) {
+        super(baseAdapter);
+        mAnimationDelayMillis = animationDelayMillis;
+        mAnimationDurationMillis = animationDurationMillis;
+    }
+
+    @Override
+    protected long getAnimationDelayMillis() {
+        return mAnimationDelayMillis;
+    }
+
+    @Override
+    protected long getAnimationDurationMillis() {
+        return mAnimationDurationMillis;
+    }
+
+    @Override
+    protected Animator getAnimator(final ViewGroup parent, final View view) {
+        return ObjectAnimator.ofFloat(view, TRANSLATION_X, 0 - parent.getWidth(), 0);
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java
new file mode 100644
index 00000000..1e3d00e1
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/swinginadapters/prepared/SwingRightInAnimationAdapter.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nhaarman.listviewanimations.swinginadapters.prepared;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+
+import com.nhaarman.listviewanimations.swinginadapters.SingleAnimationAdapter;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.ObjectAnimator;
+
+/**
+ * An implementation of the AnimationAdapter class which applies a
+ * swing-in-from-the-right-animation to views.
+ */
+public class SwingRightInAnimationAdapter extends SingleAnimationAdapter {
+
+    private static final String TRANSLATION_X = "translationX";
+    private final long mAnimationDelayMillis;
+    private final long mAnimationDurationMillis;
+
+    public SwingRightInAnimationAdapter(final BaseAdapter baseAdapter) {
+        this(baseAdapter, DEFAULTANIMATIONDELAYMILLIS, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public SwingRightInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis) {
+        this(baseAdapter, animationDelayMillis, DEFAULTANIMATIONDURATIONMILLIS);
+    }
+
+    public SwingRightInAnimationAdapter(final BaseAdapter baseAdapter, final long animationDelayMillis, final long animationDurationMillis) {
+        super(baseAdapter);
+        mAnimationDelayMillis = animationDelayMillis;
+        mAnimationDurationMillis = animationDurationMillis;
+    }
+
+    @Override
+    protected long getAnimationDelayMillis() {
+        return mAnimationDelayMillis;
+    }
+
+    @Override
+    protected long getAnimationDurationMillis() {
+        return mAnimationDurationMillis;
+    }
+
+    @Override
+    protected Animator getAnimator(final ViewGroup parent, final View view) {
+        return ObjectAnimator.ofFloat(view, TRANSLATION_X, parent.getWidth(), 0);
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/util/AdapterViewUtil.java b/library/src/com/nhaarman/listviewanimations/util/AdapterViewUtil.java
new file mode 100644
index 00000000..5b373e68
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/util/AdapterViewUtil.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.nhaarman.listviewanimations.util;
+
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+public class AdapterViewUtil {
+
+    /**
+     * Get the position within the adapter's dataset for the view, where view is an adapter item or a descendant of an adapter item.
+     * Unlike {@link AdapterView#getPositionForView(android.view.View)}, returned position will reflect the position of the item given view is representing,
+     * by subtracting the header views count.
+     * @param adapterView the AdapterView containing the view.
+     * @param view an adapter item or a descendant of an adapter item. This must be visible in given AdapterView at the time of the call.
+     * @return the position of the item in the AdapterView represented by given view, or {@link AdapterView#INVALID_POSITION} if the view does not
+     * correspond to a list item (or it is not visible).
+     */
+    public static int getPositionForView(final AdapterView<?> adapterView, final View view) {
+        int position = adapterView.getPositionForView(view);
+
+        if (adapterView instanceof ListView) {
+            position -= ((ListView) adapterView).getHeaderViewsCount();
+        }
+
+        return position;
+    }
+}
diff --git a/library/src/com/nhaarman/listviewanimations/widget/DynamicListView.java b/library/src/com/nhaarman/listviewanimations/widget/DynamicListView.java
new file mode 100644
index 00000000..b45c8f79
--- /dev/null
+++ b/library/src/com/nhaarman/listviewanimations/widget/DynamicListView.java
@@ -0,0 +1,796 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ * Copyright 2013 Niek Haarman
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.nhaarman.listviewanimations.widget;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.HeaderViewListAdapter;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeOnTouchListener;
+import com.nineoldandroids.animation.Animator;
+import com.nineoldandroids.animation.AnimatorListenerAdapter;
+import com.nineoldandroids.animation.ObjectAnimator;
+import com.nineoldandroids.animation.TypeEvaluator;
+import com.nineoldandroids.animation.ValueAnimator;
+import com.nineoldandroids.view.ViewHelper;
+
+/**
+ * The DynamicListView is an extension of {@link ListView} that supports cell dragging
+ * and swapping.
+ * </p>
+ * Make sure your adapter has stable ids, and override {@link ListAdapter#hasStableIds()} to return true.</br>
+ * </p>
+ * This layout is in charge of positioning the hover cell in the correct location
+ * on the screen in response to user touch events. It uses the position of the
+ * hover cell to determine when two cells should be swapped. If two cells should
+ * be swapped, all the corresponding data set and layout changes are handled here.
+ * </p>
+ * If no cell is selected, all the touch events are passed down to the ListView
+ * and behave normally. If one of the items in the ListView experiences a
+ * long press event, the contents of its current visible state are captured as
+ * a bitmap and its visibility is set to INVISIBLE. A hover cell is then created and
+ * added to this layout as an overlaying BitmapDrawable above the ListView. Once the
+ * hover cell is translated some distance to signify an item swap, a data set change
+ * accompanied by animation takes place. When the user releases the hover cell,
+ * it animates into its corresponding position in the ListView.
+ * </p>
+ * When the hover cell is either above or below the bounds of the ListView, this
+ * ListView also scrolls on its own so as to reveal additional content.
+ * </p>
+ * See http://youtu.be/_BZIvjMgH-Q
+ */
+public class DynamicListView extends ListView {
+
+    private int mOriginalTranscriptMode;
+
+    public interface OnHoverCellListener {
+        public Drawable onHoverCellCreated(Drawable hoverCellDrawable);
+    }
+
+    /**
+     * Implement this interface to be notified of ordering changes. Call {@link #setOnItemMovedListener(com.nhaarman.listviewanimations.widget.DynamicListView.OnItemMovedListener)}.
+     */
+    public interface OnItemMovedListener {
+        /**
+         * Called after an item is dropped and moved.
+         *
+         * @param newPosition the new position of the item.
+         */
+        public void onItemMoved(int newPosition);
+    }
+
+    private final int SMOOTH_SCROLL_AMOUNT_AT_EDGE = 15;
+    private final int MOVE_DURATION = 150;
+
+    private int mLastEventY = -1, mLastEventX = -1;
+
+    private int mDownY = -1;
+    private int mDownX = -1;
+
+    private int mTotalOffset = 0;
+
+    private boolean mCellIsMobile = false;
+    private boolean mIsMobileScrolling = false;
+    private int mSmoothScrollAmountAtEdge = 0;
+
+    private final int INVALID_ID = -1;
+    private long mAboveItemId = INVALID_ID;
+    private long mMobileItemId = INVALID_ID;
+    private long mBelowItemId = INVALID_ID;
+
+    private Drawable mHoverCell;
+    private Rect mHoverCellCurrentBounds;
+    private Rect mHoverCellOriginalBounds;
+
+    private final int INVALID_POINTER_ID = -1;
+    private int mActivePointerId = INVALID_POINTER_ID;
+
+    private boolean mIsWaitingForScrollFinish = false;
+    private int mScrollState = OnScrollListener.SCROLL_STATE_IDLE;
+
+    private OnTouchListener mOnTouchListener;
+    private boolean mIsParentHorizontalScrollContainer;
+    private int mResIdOfDynamicTouchChild;
+    private boolean mDynamicTouchChildTouched;
+    private int mSlop;
+
+    private boolean mSkipCallingOnTouchListener;
+
+    private OnHoverCellListener mOnHoverCellListener;
+
+    private OnItemMovedListener mOnItemMovedListener;
+    private int mLastMovedToIndex;
+
+    public DynamicListView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public DynamicListView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context);
+    }
+
+    public DynamicListView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public void init(Context context) {
+        setOnItemLongClickListener(mOnItemLongClickListener);
+        setOnScrollListener(mScrollListener);
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        mSmoothScrollAmountAtEdge = (int) (SMOOTH_SCROLL_AMOUNT_AT_EDGE / metrics.density);
+        ViewConfiguration vc = ViewConfiguration.get(getContext());
+        mSlop = vc.getScaledTouchSlop();
+    }
+
+    public void setAdapter(BaseAdapter adapter) {
+        super.setAdapter(adapter);
+    }
+
+    @Override
+    @Deprecated
+    /**
+     * @deprecated use #setAdapter(BaseAdapter) instead.
+     */
+    public void setAdapter(ListAdapter adapter) {
+        if (!(adapter instanceof BaseAdapter)) {
+            throw new IllegalArgumentException("DynamicListView needs a BaseAdapter!");
+        }
+        super.setAdapter(adapter);
+    }
+
+    /**
+     * Listens for long clicks on any items in the listview. When a cell has
+     * been selected, the hover cell is created and set up.
+     */
+    private OnItemLongClickListener mOnItemLongClickListener = new OnItemLongClickListener() {
+        public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int pos, long id) {
+            if (mResIdOfDynamicTouchChild == 0) {
+                mDynamicTouchChildTouched = true;
+                makeCellMobile();
+                return true;
+            }
+            return false;
+        }
+    };
+
+    private void makeCellMobile() {
+        int position = pointToPosition(mDownX, mDownY);
+        int itemNum = position - getFirstVisiblePosition();
+        View selectedView = getChildAt(itemNum);
+        if (selectedView == null || position < getHeaderViewsCount() || position >= getAdapter().getCount() - getHeaderViewsCount()) {
+            return;
+        }
+
+        mOriginalTranscriptMode = getTranscriptMode();
+        setTranscriptMode(TRANSCRIPT_MODE_NORMAL);
+
+
+        mTotalOffset = 0;
+
+        mMobileItemId = getAdapter().getItemId(position);
+        mHoverCell = getAndAddHoverView(selectedView);
+        if (mOnHoverCellListener != null) {
+            mHoverCell = mOnHoverCellListener.onHoverCellCreated(mHoverCell);
+        }
+        selectedView.setVisibility(INVISIBLE);
+
+        mCellIsMobile = true;
+        getParent().requestDisallowInterceptTouchEvent(true);
+
+        updateNeighborViewsForId(mMobileItemId);
+    }
+
+    /**
+     * Creates the hover cell with the appropriate bitmap and of appropriate
+     * size. The hover cell's BitmapDrawable is drawn on top of the bitmap every
+     * single time an invalidate call is made.
+     */
+    private BitmapDrawable getAndAddHoverView(View v) {
+        int w = v.getWidth();
+        int h = v.getHeight();
+        int top = v.getTop();
+        int left = v.getLeft();
+
+        Bitmap b = getBitmapFromView(v);
+
+        BitmapDrawable drawable = new BitmapDrawable(getResources(), b);
+
+        mHoverCellOriginalBounds = new Rect(left, top, left + w, top + h);
+        mHoverCellCurrentBounds = new Rect(mHoverCellOriginalBounds);
+
+        drawable.setBounds(mHoverCellCurrentBounds);
+
+        return drawable;
+    }
+
+    /**
+     * Returns a bitmap showing a screenshot of the view passed in.
+     */
+    private Bitmap getBitmapFromView(View v) {
+        Bitmap bitmap = Bitmap.createBitmap(v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        v.draw(canvas);
+        return bitmap;
+    }
+
+    /**
+     * Stores a reference to the views above and below the item currently
+     * corresponding to the hover cell. It is important to note that if this
+     * item is either at the top or bottom of the list, mAboveItemId or mBelowItemId
+     * may be invalid.
+     */
+    private void updateNeighborViewsForId(long itemId) {
+        int position = getPositionForId(itemId);
+        ListAdapter adapter = getAdapter();
+        if (!adapter.hasStableIds()) {
+            throw new IllegalStateException("Adapter doesn't have stable ids! Make sure your adapter has stable ids, and override hasStableIds() to return true.");
+        }
+
+        mAboveItemId = position - 1 >= 0 ? adapter.getItemId(position - 1) : INVALID_ROW_ID;
+        mBelowItemId = position + 1 < adapter.getCount() ? adapter.getItemId(position + 1) : INVALID_ROW_ID;
+    }
+
+    /**
+     * Retrieves the view in the list corresponding to itemId
+     */
+    private View getViewForId(long itemId) {
+        int firstVisiblePosition = getFirstVisiblePosition();
+        ListAdapter adapter = getAdapter();
+        if (!adapter.hasStableIds()) {
+            throw new IllegalStateException("Adapter doesn't have stable ids! Make sure your adapter has stable ids, and override hasStableIds() to return true.");
+        }
+
+        for (int i = 0; i < getChildCount(); i++) {
+            View v = getChildAt(i);
+            int position = firstVisiblePosition + i;
+            long id = adapter.getItemId(position);
+            if (id == itemId) {
+                return v;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Retrieves the position in the list corresponding to itemId
+     */
+    private int getPositionForId(long itemId) {
+        View v = getViewForId(itemId);
+        if (v == null) {
+            return -1;
+        } else {
+            return getPositionForView(v);
+        }
+    }
+
+    /**
+     * dispatchDraw gets invoked when all the child views are about to be drawn.
+     * By overriding this method, the hover cell (BitmapDrawable) can be drawn
+     * over the listview's items whenever the listview is redrawn.
+     */
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        super.dispatchDraw(canvas);
+        if (mHoverCell != null) {
+            mHoverCell.draw(canvas);
+        }
+    }
+
+    @Override
+    public void setOnTouchListener(OnTouchListener l) {
+        mOnTouchListener = l;
+    }
+
+    public void setOnHoverCellListener(OnHoverCellListener onHoverCellListener) {
+        mOnHoverCellListener = onHoverCellListener;
+    }
+
+    private Rect getChildViewRect(View parentView, View childView) {
+        final Rect childRect = new Rect(childView.getLeft(), childView.getTop(), childView.getRight(), childView.getBottom());
+        if (parentView == childView) {
+            return childRect;
+        }
+
+        ViewGroup parent;
+        while ((parent = (ViewGroup) childView.getParent()) != parentView) {
+            childRect.offset(parent.getLeft(), parent.getTop());
+            childView = parent;
+        }
+
+        return childRect;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (mSkipCallingOnTouchListener) {
+            return super.onTouchEvent(event);
+        }
+
+        if (mOnTouchListener instanceof SwipeOnTouchListener) {
+            if (((SwipeOnTouchListener) mOnTouchListener).isSwiping()) {
+                mSkipCallingOnTouchListener = true;
+                boolean retVal = mOnTouchListener.onTouch(this, event);
+                mSkipCallingOnTouchListener = false;
+                return retVal || super.onTouchEvent(event);
+            }
+        }
+
+        switch (event.getAction() & MotionEvent.ACTION_MASK) {
+            case MotionEvent.ACTION_DOWN:
+                mDownX = (int) event.getX();
+                mDownY = (int) event.getY();
+                mActivePointerId = event.getPointerId(0);
+
+                mDynamicTouchChildTouched = false;
+                if (mResIdOfDynamicTouchChild != 0) {
+                    mIsParentHorizontalScrollContainer = false;
+
+                    int position = pointToPosition(mDownX, mDownY);
+                    int childNum = (position != INVALID_POSITION) ? position - getFirstVisiblePosition() : -1;
+                    View itemView = (childNum >= 0) ? getChildAt(childNum) : null;
+                    View childView = (itemView != null) ? itemView.findViewById(mResIdOfDynamicTouchChild) : null;
+                    if (childView != null) {
+                        final Rect childRect = getChildViewRect(this, childView);
+                        if (childRect.contains(mDownX, mDownY)) {
+                            mDynamicTouchChildTouched = true;
+                            getParent().requestDisallowInterceptTouchEvent(true);
+                        }
+                    }
+                }
+
+                if (mIsParentHorizontalScrollContainer) {
+                    // Do it now and don't wait until the user moves more than the
+                    // slop factor.
+                    getParent().requestDisallowInterceptTouchEvent(true);
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                if (mActivePointerId == INVALID_POINTER_ID) {
+                    break;
+                }
+
+                int pointerIndex = event.findPointerIndex(mActivePointerId);
+
+                mLastEventY = (int) event.getY(pointerIndex);
+                mLastEventX = (int) event.getX(pointerIndex);
+                int deltaY = mLastEventY - mDownY;
+                int deltaX = mLastEventX - mDownX;
+
+                if (!mCellIsMobile && mDynamicTouchChildTouched) {
+                    if (Math.abs(deltaY) > mSlop && Math.abs(deltaY) > Math.abs(deltaX)) {
+                        makeCellMobile();
+
+                        // Cancel ListView's touch (un-highlighting the item)
+                        MotionEvent cancelEvent = MotionEvent.obtain(event);
+                        cancelEvent.setAction(MotionEvent.ACTION_CANCEL | (event.getActionIndex() << MotionEvent.ACTION_POINTER_INDEX_SHIFT));
+                        super.onTouchEvent(cancelEvent);
+                        cancelEvent.recycle();
+                    }
+                }
+
+                if (mCellIsMobile) {
+                    mHoverCellCurrentBounds.offsetTo(mHoverCellOriginalBounds.left, mHoverCellOriginalBounds.top + deltaY + mTotalOffset);
+                    mHoverCell.setBounds(mHoverCellCurrentBounds);
+                    invalidate();
+
+                    handleCellSwitch();
+
+                    mIsMobileScrolling = false;
+                    handleMobileCellScroll();
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                mDynamicTouchChildTouched = false;
+                touchEventsEnded();
+                break;
+            case MotionEvent.ACTION_CANCEL:
+                mDynamicTouchChildTouched = false;
+                touchEventsCancelled();
+                break;
+            case MotionEvent.ACTION_POINTER_UP:
+            /*
+             * If a multitouch event took place and the original touch dictating
+			 * the movement of the hover cell has ended, then the dragging event
+			 * ends and the hover cell is animated to its corresponding position
+			 * in the listview.
+			 */
+                pointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                final int pointerId = event.getPointerId(pointerIndex);
+                if (pointerId == mActivePointerId) {
+                    mDynamicTouchChildTouched = false;
+                    touchEventsEnded();
+                }
+                break;
+            default:
+                break;
+        }
+
+        if (mCellIsMobile) {
+            return false;
+        } else if (mOnTouchListener != null) {
+            mSkipCallingOnTouchListener = true;
+            boolean retVal = mOnTouchListener.onTouch(this, event);
+            mSkipCallingOnTouchListener = false;
+            if (retVal) {
+                return true;
+            }
+        }
+        return super.onTouchEvent(event);
+    }
+
+    /**
+     * This method determines whether the hover cell has been shifted far enough
+     * to invoke a cell swap. If so, then the respective cell swap candidate is
+     * determined and the data set is changed. Upon posting a notification of the
+     * data set change, a layout is invoked to place the cells in the right place.
+     * Using a ViewTreeObserver and a corresponding OnPreDrawListener, we can
+     * offset the cell being swapped to where it previously was and then animate it to
+     * its new position.
+     */
+    private void handleCellSwitch() {
+        final int deltaY = mLastEventY - mDownY;
+        int deltaYTotal = mHoverCellOriginalBounds.top + mTotalOffset + deltaY;
+
+        View belowView = getViewForId(mBelowItemId);
+        View mobileView = getViewForId(mMobileItemId);
+        View aboveView = getViewForId(mAboveItemId);
+
+        boolean isBelow = (belowView != null) && (deltaYTotal > belowView.getTop());
+        boolean isAbove = (aboveView != null) && (deltaYTotal < aboveView.getTop());
+
+        if (isBelow || isAbove) {
+
+            final long switchItemId = isBelow ? mBelowItemId : mAboveItemId;
+            View switchView = isBelow ? belowView : aboveView;
+            final int originalItem = getPositionForView(mobileView);
+
+            if (switchView == null) {
+                updateNeighborViewsForId(mMobileItemId);
+                return;
+            }
+
+            if (getPositionForView(switchView) < getHeaderViewsCount()) {
+                return;
+            }
+            swapElements(originalItem, getPositionForView(switchView));
+
+            BaseAdapter adapter;
+            if (getAdapter() instanceof HeaderViewListAdapter) {
+                adapter = (BaseAdapter) ((HeaderViewListAdapter) getAdapter()).getWrappedAdapter();
+            } else {
+                adapter = (BaseAdapter) getAdapter();
+            }
+            adapter.notifyDataSetChanged();
+
+            mDownY = mLastEventY;
+            mDownX = mLastEventX;
+
+            final int switchViewStartTop = switchView.getTop();
+
+            mobileView.setVisibility(View.VISIBLE);
+            switchView.setVisibility(View.INVISIBLE);
+
+            updateNeighborViewsForId(mMobileItemId);
+
+            final ViewTreeObserver observer = getViewTreeObserver();
+            observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                public boolean onPreDraw() {
+                    observer.removeOnPreDrawListener(this);
+
+                    View switchView = getViewForId(switchItemId);
+
+                    mTotalOffset += deltaY;
+
+                    int switchViewNewTop = switchView.getTop();
+                    int delta = switchViewStartTop - switchViewNewTop;
+
+                    ViewHelper.setTranslationY(switchView, delta);
+
+                    ObjectAnimator animator = ObjectAnimator.ofFloat(switchView, "translationY", 0);
+                    animator.setDuration(MOVE_DURATION);
+                    animator.start();
+
+                    return true;
+                }
+            });
+        }
+    }
+
+    private void swapElements(int indexOne, int indexTwo) {
+        mLastMovedToIndex = indexTwo;
+        ListAdapter adapter = getAdapter();
+
+        if (adapter instanceof HeaderViewListAdapter) {
+            adapter = ((HeaderViewListAdapter) adapter).getWrappedAdapter();
+        }
+
+        if (adapter instanceof Swappable) {
+            ((Swappable) adapter).swapItems(indexOne - getHeaderViewsCount(), indexTwo - getHeaderViewsCount());
+        }
+    }
+
+    /**
+     * Resets all the appropriate fields to a default state while also animating
+     * the hover cell back to its correct location.
+     */
+    private void touchEventsEnded() {
+        final View mobileView = getViewForId(mMobileItemId);
+        if (mCellIsMobile || mIsWaitingForScrollFinish) {
+            mCellIsMobile = false;
+            mIsWaitingForScrollFinish = false;
+            mIsMobileScrolling = false;
+            mActivePointerId = INVALID_POINTER_ID;
+
+            /* Restore the transcript mode */
+            setTranscriptMode(mOriginalTranscriptMode);
+
+            // If the autoscroller has not completed scrolling, we need to wait
+            // for it to
+            // finish in order to determine the final location of where the
+            // hover cell
+            // should be animated to.
+            if (mScrollState != OnScrollListener.SCROLL_STATE_IDLE) {
+                mIsWaitingForScrollFinish = true;
+                return;
+            }
+
+            mHoverCellCurrentBounds.offsetTo(mHoverCellOriginalBounds.left, mobileView.getTop());
+
+            ObjectAnimator hoverViewAnimator = ObjectAnimator.ofObject(mHoverCell, "bounds", sBoundEvaluator, mHoverCellCurrentBounds);
+            hoverViewAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(ValueAnimator valueAnimator) {
+                    invalidate();
+                }
+            });
+            hoverViewAnimator.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    setEnabled(false);
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    mAboveItemId = INVALID_ID;
+                    mMobileItemId = INVALID_ID;
+                    mBelowItemId = INVALID_ID;
+                    mobileView.setVisibility(VISIBLE);
+                    mHoverCell = null;
+                    setEnabled(true);
+                    invalidate();
+                    if (mOnItemMovedListener != null) {
+                        mOnItemMovedListener.onItemMoved(mLastMovedToIndex - getHeaderViewsCount());
+                    }
+                }
+            });
+            hoverViewAnimator.start();
+        } else {
+            touchEventsCancelled();
+        }
+    }
+
+    /**
+     * Resets all the appropriate fields to a default state.
+     */
+    private void touchEventsCancelled() {
+        View mobileView = getViewForId(mMobileItemId);
+        if (mCellIsMobile) {
+            mAboveItemId = INVALID_ID;
+            mMobileItemId = INVALID_ID;
+            mBelowItemId = INVALID_ID;
+            mobileView.setVisibility(VISIBLE);
+            mHoverCell = null;
+            invalidate();
+        }
+        mCellIsMobile = false;
+        mIsMobileScrolling = false;
+        mActivePointerId = INVALID_POINTER_ID;
+    }
+
+    /**
+     * This TypeEvaluator is used to animate the BitmapDrawable back to its
+     * final location when the user lifts his finger by modifying the
+     * BitmapDrawable's bounds.
+     */
+    private final static TypeEvaluator<Rect> sBoundEvaluator = new TypeEvaluator<Rect>() {
+        public Rect evaluate(float fraction, Rect startValue, Rect endValue) {
+            return new Rect(interpolate(startValue.left, endValue.left, fraction), interpolate(startValue.top, endValue.top, fraction), interpolate(startValue.right, endValue.right, fraction),
+                    interpolate(startValue.bottom, endValue.bottom, fraction));
+        }
+
+        public int interpolate(int start, int end, float fraction) {
+            return (int) (start + fraction * (end - start));
+        }
+    };
+
+    /**
+     * Determines whether this listview is in a scrolling state invoked
+     * by the fact that the hover cell is out of the bounds of the listview;
+     */
+    private void handleMobileCellScroll() {
+        mIsMobileScrolling = handleMobileCellScroll(mHoverCellCurrentBounds);
+    }
+
+    /**
+     * This method is in charge of determining if the hover cell is above
+     * or below the bounds of the listview. If so, the listview does an appropriate
+     * upward or downward smooth scroll so as to reveal new items.
+     */
+    private boolean handleMobileCellScroll(Rect r) {
+        int offset = computeVerticalScrollOffset();
+        int height = getHeight();
+        int extent = computeVerticalScrollExtent();
+        int range = computeVerticalScrollRange();
+        int hoverViewTop = r.top;
+        int hoverHeight = r.height();
+
+        if (hoverViewTop <= 0 && offset > 0) {
+            smoothScrollBy(-mSmoothScrollAmountAtEdge, 0);
+            return true;
+        }
+
+        if (hoverViewTop + hoverHeight >= height && (offset + extent) < range) {
+            smoothScrollBy(mSmoothScrollAmountAtEdge, 0);
+            return true;
+        }
+
+        return false;
+    }
+
+    public void setIsParentHorizontalScrollContainer(boolean isParentHorizontalScrollContainer) {
+        mIsParentHorizontalScrollContainer = (mResIdOfDynamicTouchChild == 0) && isParentHorizontalScrollContainer;
+    }
+
+    public boolean isParentHorizontalScrollContainer() {
+        return mIsParentHorizontalScrollContainer;
+    }
+
+    public void setDynamicTouchChild(int childResId) {
+        mResIdOfDynamicTouchChild = childResId;
+        if (childResId != 0) {
+            setIsParentHorizontalScrollContainer(false);
+        }
+    }
+
+    /**
+     * This scroll listener is added to the listview in order to handle cell swapping
+     * when the cell is either at the top or bottom edge of the listview. If the hover
+     * cell is at either edge of the listview, the listview will begin scrolling. As
+     * scrolling takes place, the listview continuously checks if new cells became visible
+     * and determines whether they are potential candidates for a cell swap.
+     */
+    private OnScrollListener mScrollListener = new OnScrollListener() {
+
+        private int mPreviousFirstVisibleItem = -1;
+        private int mPreviousVisibleItemCount = -1;
+        private int mCurrentFirstVisibleItem;
+        private int mCurrentVisibleItemCount;
+        private int mCurrentScrollState;
+
+        public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+            mCurrentFirstVisibleItem = firstVisibleItem;
+            mCurrentVisibleItemCount = visibleItemCount;
+
+            mPreviousFirstVisibleItem = (mPreviousFirstVisibleItem == -1) ? mCurrentFirstVisibleItem : mPreviousFirstVisibleItem;
+            mPreviousVisibleItemCount = (mPreviousVisibleItemCount == -1) ? mCurrentVisibleItemCount : mPreviousVisibleItemCount;
+
+            checkAndHandleFirstVisibleCellChange();
+            checkAndHandleLastVisibleCellChange();
+
+            mPreviousFirstVisibleItem = mCurrentFirstVisibleItem;
+            mPreviousVisibleItemCount = mCurrentVisibleItemCount;
+        }
+
+        @Override
+        public void onScrollStateChanged(AbsListView view, int scrollState) {
+            mCurrentScrollState = scrollState;
+            mScrollState = scrollState;
+            isScrollCompleted();
+        }
+
+        /**
+         * This method is in charge of invoking 1 of 2 actions. Firstly, if the listview
+         * is in a state of scrolling invoked by the hover cell being outside the bounds
+         * of the listview, then this scrolling event is continued. Secondly, if the hover
+         * cell has already been released, this invokes the animation for the hover cell
+         * to return to its correct position after the listview has entered an idle scroll
+         * state.
+         */
+        private void isScrollCompleted() {
+            if (mCurrentVisibleItemCount > 0 && mCurrentScrollState == SCROLL_STATE_IDLE) {
+                if (mCellIsMobile && mIsMobileScrolling) {
+                    handleMobileCellScroll();
+                } else if (mIsWaitingForScrollFinish) {
+                    touchEventsEnded();
+                }
+            }
+        }
+
+        /**
+         * Determines if the listview scrolled up enough to reveal a new cell at the
+         * top of the list. If so, then the appropriate parameters are updated.
+         */
+        public void checkAndHandleFirstVisibleCellChange() {
+            if (mCurrentFirstVisibleItem != mPreviousFirstVisibleItem) {
+                if (mCellIsMobile && mMobileItemId != INVALID_ID) {
+                    updateNeighborViewsForId(mMobileItemId);
+                    handleCellSwitch();
+                }
+            }
+        }
+
+        /**
+         * Determines if the listview scrolled down enough to reveal a new cell at the
+         * bottom of the list. If so, then the appropriate parameters are updated.
+         */
+        public void checkAndHandleLastVisibleCellChange() {
+            int currentLastVisibleItem = mCurrentFirstVisibleItem + mCurrentVisibleItemCount;
+            int previousLastVisibleItem = mPreviousFirstVisibleItem + mPreviousVisibleItemCount;
+            if (currentLastVisibleItem != previousLastVisibleItem) {
+                if (mCellIsMobile && mMobileItemId != INVALID_ID) {
+                    updateNeighborViewsForId(mMobileItemId);
+                    handleCellSwitch();
+                }
+            }
+        }
+    };
+
+    /**
+     * Set the {@link com.nhaarman.listviewanimations.widget.DynamicListView.OnItemMovedListener} to be notified when an item is dropped.
+     */
+    public void setOnItemMovedListener(OnItemMovedListener onItemMovedListener) {
+        this.mOnItemMovedListener = onItemMovedListener;
+    }
+
+    /**
+     * Interface, usually implemented by a {@link com.nhaarman.listviewanimations.BaseAdapterDecorator},
+     * that indicates that it can swap the visual position of two list items.
+     *
+     * @author Anton Spaans on 9/11/13.
+     */
+    public interface Swappable {
+
+        /**
+         * Swaps the item on the first adapter position with the item on the second adapter position.
+         * Be sure to call {@link android.widget.BaseAdapter#notifyDataSetChanged()} if appropriate when implementing this method.
+         *
+         * @param positionOne First adapter position.
+         * @param positionTwo Second adapter position.
+         */
+        public void swapItems(int positionOne, int positionTwo);
+    }
+}
\ No newline at end of file
diff --git a/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/InsertQueueTest.java b/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/InsertQueueTest.java
new file mode 100644
index 00000000..39a1ce92
--- /dev/null
+++ b/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/InsertQueueTest.java
@@ -0,0 +1,189 @@
+package com.nhaarman.listviewanimations.itemmanipulation.tests;
+
+import android.util.Pair;
+
+import com.nhaarman.listviewanimations.itemmanipulation.AnimateAdditionAdapter;
+import com.nhaarman.listviewanimations.itemmanipulation.InsertQueue;
+
+import junit.framework.TestCase;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import static com.nhaarman.listviewanimations.itemmanipulation.tests.matchers.Matchers.*;
+
+public class InsertQueueTest extends TestCase {
+
+    private InsertQueue<Integer> mInsertQueue;
+
+    @Mock
+    private AnimateAdditionAdapter.Insertable<Integer> mInsertable;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        MockitoAnnotations.initMocks(this);
+
+        mInsertQueue = new InsertQueue<Integer>(mInsertable);
+    }
+
+    /**
+     * Test whether an initial insert actually inserts the item and activates the item.
+     */
+    public void testInitialInsert() {
+        mInsertQueue.insert(0, 0);
+        verify(mInsertable, times(1)).add(0, 0);
+
+        assertThat(mInsertQueue.getActiveIndexes(), hasItem(0));
+    }
+
+    /**
+     * Test whether a second insert while the first insert is still active:
+     *  - doesn't insert the item
+     *  - doesn't activate the item
+     *  - queues the item.
+     */
+    public void testSecondInsert() {
+        mInsertQueue.insert(0, 0);
+        mInsertQueue.insert(0, 1);
+
+        verify(mInsertable, times(0)).add(0, 1);
+
+        assertThat(mInsertQueue.getActiveIndexes(), not(hasItem(1)));
+
+        assertThat(mInsertQueue.getPendingItemsToInsert(), hasItem(pairWithValues(0, 1)));
+    }
+
+    /**
+     * Test whether clearing a single activated item actually clears the item.
+     */
+    public void testClearActive() {
+        mInsertQueue.insert(0, 0);
+        mInsertQueue.clearActive();
+
+        assertThat(mInsertQueue.getActiveIndexes(), empty());
+    }
+
+    /**
+     * Test whether inserting two items and then clearing the active items will
+     *  - activate the second inserted item,
+     *  - insert the second item
+     */
+    public void testDequeueOneElement() {
+        mInsertQueue.insert(0, 0);
+        mInsertQueue.insert(0, 1);
+        mInsertQueue.clearActive();
+
+        verify(mInsertable).add(0, 1);
+
+        assertThat(mInsertQueue.getActiveIndexes(), contains(0));
+    }
+
+
+    /**
+     * Test whether adding two items to the queue remain in correct order
+     */
+    public void testQueueOrder() {
+        mInsertQueue.insert(0, 0);
+        mInsertQueue.insert(0, 1);
+        mInsertQueue.insert(0, 2);
+
+        List<Pair<Integer, Integer>> pendingItemsToInsert = mInsertQueue.getPendingItemsToInsert();
+        assertThat(pendingItemsToInsert.get(0), is(pairWithValues(0, 1)));
+        assertThat(pendingItemsToInsert.get(1), is(pairWithValues(0, 2)));
+
+    }
+
+    /**
+     * Test whether inserting three items and then clearing the active items will activate the second and third inserted item
+     */
+    public void testDequeueTwoElements() {
+        mInsertQueue.insert(0, 0);
+        mInsertQueue.insert(0, 1);
+        mInsertQueue.insert(0, 2);
+        mInsertQueue.clearActive();
+
+        ArgumentCaptor<Integer> indexCaptor = ArgumentCaptor.forClass(Integer.class);
+        ArgumentCaptor<Integer> itemCaptor = ArgumentCaptor.forClass(Integer.class);
+
+        verify(mInsertable, atLeast(3)).add(indexCaptor.capture(), itemCaptor.capture());
+
+        List<Integer> indexValues = indexCaptor.getAllValues();
+        List<Integer> itemValues = itemCaptor.getAllValues();
+
+        assertThat(indexValues.get(1), is(0));
+        assertThat(itemValues.get(1), is(1));
+        assertThat(indexValues.get(2), is(0));
+        assertThat(itemValues.get(2), is(2));
+
+        //noinspection unchecked
+        assertThat(mInsertQueue.getActiveIndexes(), hasItems(0, 1));
+    }
+
+    /**
+     * Test whether inserting three items, clearing, inserting two items yields the correct order.
+     */
+    public void testDequeueTwoElementsTwice() {
+        mInsertQueue.insert(0, 0);
+        mInsertQueue.insert(0, 1);
+        mInsertQueue.insert(0, 2);
+        mInsertQueue.clearActive();
+        mInsertQueue.insert(0, 3);
+        mInsertQueue.insert(0, 4);
+        mInsertQueue.clearActive();
+
+        ArgumentCaptor<Integer> indexCaptor = ArgumentCaptor.forClass(Integer.class);
+        ArgumentCaptor<Integer> itemCaptor = ArgumentCaptor.forClass(Integer.class);
+
+        verify(mInsertable, atLeast(5)).add(indexCaptor.capture(), itemCaptor.capture());
+
+        List<Integer> indexValues = indexCaptor.getAllValues();
+        List<Integer> itemValues = itemCaptor.getAllValues();
+
+        assertThat(indexValues.get(1), is(0));
+        assertThat(itemValues.get(1), is(1));
+        assertThat(indexValues.get(2), is(0));
+        assertThat(itemValues.get(2), is(2));
+        assertThat(indexValues.get(3), is(0));
+        assertThat(itemValues.get(3), is(3));
+        assertThat(indexValues.get(4), is(0));
+        assertThat(itemValues.get(4), is(4));
+    }
+
+    /**
+     * Test whether inserting three items, clearing, inserting two items yields the correct order.
+     */
+    public void testDequeueTwoElementsTwiceRandomOrder() {
+        mInsertQueue.insert(5, 0);
+        mInsertQueue.insert(2, 1);
+        mInsertQueue.insert(3, 2);
+        mInsertQueue.clearActive();
+        mInsertQueue.insert(7, 3);
+        mInsertQueue.insert(1, 4);
+        mInsertQueue.clearActive();
+
+        ArgumentCaptor<Integer> indexCaptor = ArgumentCaptor.forClass(Integer.class);
+        ArgumentCaptor<Integer> itemCaptor = ArgumentCaptor.forClass(Integer.class);
+
+        verify(mInsertable, atLeast(5)).add(indexCaptor.capture(), itemCaptor.capture());
+
+        List<Integer> indexValues = indexCaptor.getAllValues();
+        List<Integer> itemValues = itemCaptor.getAllValues();
+
+        assertThat(indexValues.get(1), is(2));
+        assertThat(itemValues.get(1), is(1));
+        assertThat(indexValues.get(2), is(3));
+        assertThat(itemValues.get(2), is(2));
+        assertThat(indexValues.get(3), is(7));
+        assertThat(itemValues.get(3), is(3));
+        assertThat(indexValues.get(4), is(1));
+        assertThat(itemValues.get(4), is(4));
+    }
+}
diff --git a/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/matchers/Matchers.java b/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/matchers/Matchers.java
new file mode 100644
index 00000000..1f0ab7b8
--- /dev/null
+++ b/library/tests/java/com/nhaarman/listviewanimations/itemmanipulation/tests/matchers/Matchers.java
@@ -0,0 +1,63 @@
+package com.nhaarman.listviewanimations.itemmanipulation.tests.matchers;
+
+import android.util.Pair;
+
+import org.hamcrest.Description;
+import org.hamcrest.Factory;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class Matchers {
+
+    @Factory
+    public static <T, F> Matcher<Pair<T, F>> pairWithValues(T first, F second) {
+        return new PairWithValues<T, F>(first, second);
+    }
+
+    @Factory
+    public static Matcher<AtomicInteger> atomicIntegerWithValue(int value) {
+        return new AtomicIntegerWithValue(value);
+    }
+
+    private static class PairWithValues<T, F> extends TypeSafeMatcher<Pair<T, F>> {
+
+        private T first;
+        private F second;
+
+        public PairWithValues(T first, F second) {
+            this.first = first;
+            this.second = second;
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText("Dunno!");
+        }
+
+        @Override
+        protected boolean matchesSafely(Pair<T, F> tfPair) {
+            return tfPair.first.equals(first) && tfPair.second.equals(second);
+        }
+    }
+
+    private static class AtomicIntegerWithValue extends TypeSafeMatcher<AtomicInteger> {
+
+        private int mValue;
+
+        public AtomicIntegerWithValue(int value) {
+            mValue = value;
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText(String.valueOf(mValue));
+        }
+
+        @Override
+        protected boolean matchesSafely(AtomicInteger atomicInteger) {
+            return mValue == atomicInteger.intValue();
+        }
+    }
+}
diff --git a/maven_push.gradle b/maven_push.gradle
new file mode 100644
index 00000000..f2e3915d
--- /dev/null
+++ b/maven_push.gradle
@@ -0,0 +1,86 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def sonatypeRepositoryUrl
+if (isReleaseBuild()) {
+    println 'RELEASE BUILD'
+    sonatypeRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+} else {
+    println 'DEBUG BUILD'
+    sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+}
+
+afterEvaluate { project ->
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+                pom.artifactId = POM_ARTIFACT_ID
+
+                repository(url: sonatypeRepositoryUrl) {
+                    authentication(userName: nexusUsername, password: nexusPassword)
+                }
+
+                pom.project {
+                    name POM_NAME
+                    packaging POM_PACKAGING
+                    description POM_DESCRIPTION
+                    url POM_URL
+
+                    scm {
+                        url POM_SCM_URL
+                        connection POM_SCM_CONNECTION
+                        developerConnection POM_SCM_DEV_CONNECTION
+                    }
+
+                    licenses {
+                        license {
+                            name POM_LICENCE_NAME
+                            url POM_LICENCE_URL
+                            distribution POM_LICENCE_DIST
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id POM_DEVELOPER_ID
+                            name POM_DEVELOPER_NAME
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    signing {
+        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+        sign configurations.archives
+    }
+
+    task androidJavadocs(type: Javadoc) {
+        source = android.sourceSets.main.allJava
+    }
+
+    task androidJavadocsJar(type: Jar) {
+        classifier = 'javadoc'
+        //basename = artifact_id
+        from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        //basename = artifact_id
+        from android.sourceSets.main.allSource
+    }
+
+    task coreLibJar(type: Jar) {
+        from fileTree(dir: 'build/classes/release').matching { include 'com/nhaarman/listviewanimations/**' }
+    }
+
+    artifacts {
+        archives androidSourcesJar
+        archives androidJavadocsJar
+        archives coreLibJar
+    }
+}
\ No newline at end of file