Merge branch 'release/v0.9.6'

mikepenz · Jan 25, 2016 · ae50d15 · ae50d15
2 parents 79d10b5 + 3384d57
commit ae50d15
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 #Include in your project
 ##Using Maven
 ```javascript
-compile('com.mikepenz:fastadapter:0.9.5@aar') {
+compile('com.mikepenz:fastadapter:0.9.6@aar') {
 	transitive = true
 }
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 95
-        versionName '0.9.5'
+        versionCode 96
+        versionName '0.9.6'
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Maven stuff
-VERSION_NAME=0.9.5
-VERSION_CODE=95
+VERSION_NAME=0.9.6
+VERSION_CODE=96
 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 95
-        versionName '0.9.5'
+        versionCode 96
+        versionName '0.9.6'
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/mikepenz/fastadapter/adapters/ItemAdapter.java b/library/src/main/java/com/mikepenz/fastadapter/adapters/ItemAdapter.java
@@ -149,10 +149,30 @@ public <T> T setSubItems(IExpandable<T, Item> collapsible, List<Item> subItems)
      * @param items
      */
     public void set(List<Item> items) {
+        int newItemsCount = items.size();
+        int previousItemsCount = mItems.size();
+        int itemsBeforeThisAdapter = getFastAdapter().getItemCount(getOrder());
+
+        //remove all previous items
         if (!mItems.isEmpty()) {
-            clear();
+            mItems.clear();
+        }
+
+        //add all new items to the list
+        mItems.addAll(items);
+
+        //now properly notify the adapter about the changes
+        if (newItemsCount > previousItemsCount) {
+            if (previousItemsCount > 0) {
+                getFastAdapter().notifyAdapterItemRangeChanged(itemsBeforeThisAdapter, previousItemsCount);
+            }
+            getFastAdapter().notifyAdapterItemRangeInserted(itemsBeforeThisAdapter + newItemsCount - 1, newItemsCount - previousItemsCount);
+        } else if (newItemsCount > 0 && newItemsCount < previousItemsCount) {
+            getFastAdapter().notifyAdapterItemRangeChanged(itemsBeforeThisAdapter, newItemsCount);
+            getFastAdapter().notifyAdapterItemRangeRemoved(itemsBeforeThisAdapter + newItemsCount - 1, previousItemsCount - newItemsCount);
+        } else if (newItemsCount == 0) {
+            getFastAdapter().notifyAdapterItemRangeRemoved(itemsBeforeThisAdapter, previousItemsCount);
         }
-        add(items);
     }
 
     /**

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 @@
         <b>FastAdapter</b>, the bullet proof, fast and easy to use adapter library, which minimizes developing time to a fraction...
         ]]>
     </string>
-    <string name="library_fastadapter_libraryVersion">0.9.5</string>
+    <string name="library_fastadapter_libraryVersion">0.9.6</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>