Merge branch 'release/v0.5.2-SNAPSHOT'

mikepenz · Jan 8, 2016 · c20ae65 · c20ae65
2 parents 203ab91 + 96b3f1c
commit c20ae65
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Beside being blazing fast, minimizing the code you need to write, it is also rea
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:fastadapter:0.5.1-SNAPSHOT@aar') {
+compile('com.mikepenz:fastadapter:0.5.2-SNAPSHOT@aar') {
 	transitive = true
 }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 51
-        versionName '0.5.1-SNAPSHOT'
+        versionCode 52
+        versionName '0.5.2-SNAPSHOT'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -52,10 +52,13 @@ dependencies {
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b4-SNAPSHOT@aar') {
+    compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b5-SNAPSHOT@aar') {
         transitive = true
         exclude module: "fastadapter"
     }
+    //used to provide different itemAnimators for the RecyclerView
+    //TBR
+    compile 'com.mikepenz:itemanimators:0.0.1-SNAPSHOT@aar'
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
     compile('com.mikepenz:aboutlibraries:5.3.4@aar') {

diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/CollapsibleSampleActivity.java b/app/src/main/java/com/mikepenz/fastadapter/app/CollapsibleSampleActivity.java
@@ -2,7 +2,6 @@
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -14,6 +13,7 @@
 import com.mikepenz.fastadapter.IItem;
 import com.mikepenz.fastadapter.adapters.ItemAdapter;
 import com.mikepenz.fastadapter.app.items.SampleItem;
+import com.mikepenz.itemanimators.SlideDownAlphaAnimator;
 import com.mikepenz.materialize.MaterializeBuilder;
 
 import java.util.ArrayList;
@@ -62,7 +62,7 @@ public boolean onClick(View v, IAdapter adapter, IItem item, int position) {
         //get our recyclerView and do basic setup
         RecyclerView rv = (RecyclerView) findViewById(R.id.rv);
         rv.setLayoutManager(new LinearLayoutManager(this));
-        rv.setItemAnimator(new DefaultItemAnimator());
+        rv.setItemAnimator(new SlideDownAlphaAnimator());
         rv.setAdapter(itemAdapter.wrap(fastAdapter));
 
         //fill with some sample data

diff --git a/gradle.properties b/gradle.properties
@@ -19,8 +19,8 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 
 # Maven stuff
-VERSION_NAME=0.5.1-SNAPSHOT
-VERSION_CODE=51
+VERSION_NAME=0.5.2-SNAPSHOT
+VERSION_CODE=52
 GROUP=com.mikepenz
 
 POM_DESCRIPTION=FastAdapter Library

diff --git a/library/build.gradle b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 23
-        versionCode 51
-        versionName '0.5.1-SNAPSHOT'
+        versionCode 52
+        versionName '0.5.2-SNAPSHOT'
     }
     buildTypes {
         release {

diff --git a/library/src/main/res/values/library_fastadapter_strings.xml b/library/src/main/res/values/library_fastadapter_strings.xml
@@ -10,7 +10,7 @@
         The <b>FastAdapter</b> is here to simplify this process. You do not have to worry about the adapter anymore. Just write the logic for how your view should look like, and you are done. This library has a fast and highly optimized core which provides core functionality, most apps require. It also prevents common mistakes by taking away those steps from the devs. Beside being blazing fast, minimizing the code you need to write, it is also really easy to extend. Just provide another Adapter implementation, hook into the adapter chain, custom select / deselection behaviors. Everything is possible.
         ]]>
     </string>
-    <string name="library_fastadapter_libraryVersion">0.5.1-SNAPSHOT</string>
+    <string name="library_fastadapter_libraryVersion">0.5.2-SNAPSHOT</string>
     <string name="library_fastadapter_libraryWebsite">https://github.com/mikepenz/FastAdapter</string>
     <string name="library_fastadapter_licenseId">apache_2_0</string>
     <string name="library_fastadapter_isOpenSource">true</string>