Merge branch 'release/v3.1.2'

mikepenz · Jan 15, 2018 · d61c4ce · d61c4ce
2 parents 4fab84f + 5cdaeae
commit d61c4ce
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -41,26 +41,26 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 
 The library is split up into core, commons, and extensions. The core functions are included in the following dependency.
 ```gradle
-implementation 'com.mikepenz:fastadapter:3.1.1@aar'
+implementation 'com.mikepenz:fastadapter:3.1.2@aar'
 implementation  'com.android.support:appcompat-v7:${latestSupportLib}'
 implementation  'com.android.support:recyclerview-v7:${latestSupportLib}'
 ```
 
 The commons package comes with some useful helpers (which are not needed in all cases) This one for example includes the `FastItemAdapter`
 ```gradle
-implementation 'com.mikepenz:fastadapter-commons:3.1.1@aar'
+implementation 'com.mikepenz:fastadapter-commons:3.1.2@aar'
 ```
 
 Expandable support is included and can be added via this
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions-expandable:3.1.1@aar'
+implementation 'com.mikepenz:fastadapter-extensions-expandable:3.1.2@aar'
 //The tiny Materialize library used for its useful helper classes
 implementation 'com.mikepenz:materialize:${latestVersion}@aar'
 ```
 
 Many helper classes are included in the following dependency. (This functionality also needs the `Expandable` extension
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions:3.1.1@aar'
+implementation 'com.mikepenz:fastadapter-extensions:3.1.2@aar'
 implementation  'com.android.support:design:${versions.supportLib}'
 //The tiny Materialize library used for its useful helper classes
 implementation 'com.mikepenz:materialize:${latestVersion}@aar'

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3110
-        versionName '3.1.1'
+        versionCode 3120
+        versionName '3.1.2'
 
         setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode")
     }

diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3110
-        versionName '3.1.1'
+        versionCode 3120
+        versionName '3.1.2'
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
 

diff --git a/library-core/gradle.properties b/library-core/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library
 POM_ARTIFACT_ID=fastadapter
 POM_PACKAGING=aar
-VERSION_NAME=3.1.1
-VERSION_CODE=3110
+VERSION_NAME=3.1.2
+VERSION_CODE=3120
diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/IItemList.java b/library-core/src/main/java/com/mikepenz/fastadapter/IItemList.java
@@ -30,7 +30,7 @@ public interface IItemList<Item> {
 
     void set(List<Item> items, int preItemCount, @Nullable IAdapterNotifier adapterNotifier);
 
-    void setNewList(List<Item> items);
+    void setNewList(List<Item> items, boolean notify);
 
     void addAll(int position, List<Item> items, int preItemCount);
 

diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/adapters/ModelAdapter.java b/library-core/src/main/java/com/mikepenz/fastadapter/adapters/ModelAdapter.java
@@ -351,12 +351,13 @@ public ModelAdapter<Model, Item> setNewList(List<Model> list, boolean retainFilt
             getItemFilter().performFiltering(null);
         }
 
-        mItems.setNewList(items);
-        mapPossibleTypes(mItems.getItems());
+        mapPossibleTypes(items);
 
-        if (filter != null && retainFilter) {
+        boolean publishResults = filter != null && retainFilter;
+        if (publishResults) {
             getItemFilter().publishResults(filter, getItemFilter().performFiltering(filter));
         }
+        mItems.setNewList(items, !publishResults);
 
         return this;
     }

diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/utils/ComparableItemListImpl.java b/library-core/src/main/java/com/mikepenz/fastadapter/utils/ComparableItemListImpl.java
@@ -80,7 +80,7 @@ public void move(int fromPosition, int toPosition, int preItemCount) {
     public void addAll(List<Item> items, int preItemCount) {
         mItems.addAll(items);
         if (mComparator != null) {
-            Collections.sort(items, mComparator);
+            Collections.sort(mItems, mComparator);
         }
         getFastAdapter().notifyAdapterDataSetChanged();
     }
@@ -89,8 +89,19 @@ public void addAll(List<Item> items, int preItemCount) {
     public void addAll(int position, List<Item> items, int preItemCount) {
         mItems.addAll(position - preItemCount, items);
         if (mComparator != null) {
-            Collections.sort(items, mComparator);
+            Collections.sort(mItems, mComparator);
         }
         getFastAdapter().notifyAdapterDataSetChanged();
     }
+
+    @Override
+    public void setNewList(List<Item> items, boolean notify) {
+        mItems = new ArrayList<>(items);
+        if (mComparator != null) {
+            Collections.sort(mItems, mComparator);
+        }
+        if(notify) {
+            getFastAdapter().notifyAdapterDataSetChanged();
+        }
+    }
 }
diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/utils/DefaultItemListImpl.java b/library-core/src/main/java/com/mikepenz/fastadapter/utils/DefaultItemListImpl.java
@@ -91,7 +91,7 @@ public boolean isEmpty() {
     @Override
     public void set(int position, Item item) {
         mItems.set(position, item);
-        getFastAdapter().notifyAdapterItemInserted(position);
+        getFastAdapter().notifyAdapterItemChanged(position);
     }
 
     @Override
@@ -132,8 +132,10 @@ public void set(List<Item> items, int preItemCount, @Nullable IAdapterNotifier a
     }
 
     @Override
-    public void setNewList(List<Item> items) {
+    public void setNewList(List<Item> items, boolean notify) {
         mItems = new ArrayList<>(items);
-        getFastAdapter().notifyAdapterDataSetChanged();
+        if(notify) {
+            getFastAdapter().notifyAdapterDataSetChanged();
+        }
     }
 }
diff --git a/library-extensions-expandable/build.gradle b/library-extensions-expandable/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3110
-        versionName '3.1.1'
+        versionCode 3120
+        versionName '3.1.2'
     }
     buildTypes {
         release {

diff --git a/library-extensions-expandable/gradle.properties b/library-extensions-expandable/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library-Extensions-Expandable
 POM_ARTIFACT_ID=fastadapter-extensions-expandable
 POM_PACKAGING=aar
-VERSION_NAME=3.1.1
-VERSION_CODE=3110
+VERSION_NAME=3.1.2
+VERSION_CODE=3120
diff --git a/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/IExpandable.java b/library-extensions-expandable/src/main/java/com/mikepenz/fastadapter/IExpandable.java
@@ -14,10 +14,10 @@ public interface IExpandable<T, Item extends IItem & ISubItem> {
     /**
      * use this method to set if the Expandable item is currently expanded
      *
-     * @param collapsed true if expanded (opened)
+     * @param expanded true if expanded (opened)
      * @return this
      */
-    T withIsExpanded(boolean collapsed);
+    T withIsExpanded(boolean expanded);
 
     /**
      * use this method to set the subItems of this item

diff --git a/library-extensions/build.gradle b/library-extensions/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3110
-        versionName '3.1.1'
+        versionCode 3120
+        versionName '3.1.2'
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }

diff --git a/library-extensions/gradle.properties b/library-extensions/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library-Extensions
 POM_ARTIFACT_ID=fastadapter-extensions
 POM_PACKAGING=aar
-VERSION_NAME=3.1.1
-VERSION_CODE=3110
+VERSION_NAME=3.1.2
+VERSION_CODE=3120
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3110
-        versionName '3.1.1'
+        versionCode 3120
+        versionName '3.1.2'
     }
     buildTypes {
         release {

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library
 POM_ARTIFACT_ID=fastadapter-commons
 POM_PACKAGING=aar
-VERSION_NAME=3.1.1
-VERSION_CODE=3110
+VERSION_NAME=3.1.2
+VERSION_CODE=3120