Merge branch 'release/v3.2.4'

mikepenz · Feb 7, 2018 · 3ed6ea3 · 3ed6ea3
2 parents 2b46f3c + d795802
commit 3ed6ea3
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 27 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -1,5 +1,8 @@
 ### Upgrade Notes
 
+#### v3.2.4
+* Adjusted the `set(int position, Item item, int preItemCount)` to include the `preItemCount` to corretly notify the adapter about the changed element.
+
 #### v3.2.3
 * The `ActionModeHelper` requires a `FastAdapter` with the `SelectExtension` applied. This is done in current versions via `withSelectable(true)`. Make sure this is called before creating the `ActionModeHelper`.
 

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.2.3@aar'
+implementation 'com.mikepenz:fastadapter:3.2.4@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.2.3@aar'
+implementation 'com.mikepenz:fastadapter-commons:3.2.4@aar'
 ```
 
 Expandable support is included and can be added via this
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.3@aar'
+implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.4@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.2.3@aar'
+implementation 'com.mikepenz:fastadapter-extensions:3.2.4@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 3230
-        versionName '3.2.3'
+        versionCode 3240
+        versionName '3.2.4'
 
         setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode")
     }

diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group "com.mikepenz"
-version "3.2.3"
+version "3.2.4"
 
 android {
     compileSdkVersion setup.compileSdk
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3230
-        versionName '3.2.3'
+        versionCode 3240
+        versionName '3.2.4'
 
         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.2.3
-VERSION_CODE=3230
+VERSION_NAME=3.2.4
+VERSION_CODE=3240
diff --git a/library-core/src/main/java/com/mikepenz/fastadapter/IItemList.java b/library-core/src/main/java/com/mikepenz/fastadapter/IItemList.java
@@ -26,7 +26,7 @@ public interface IItemList<Item> {
 
     void addAll(List<Item> items, int preItemCount);
 
-    void set(int position, Item item);
+    void set(int position, Item item, int preItemCount);
 
     void set(List<Item> items, int preItemCount, @Nullable IAdapterNotifier adapterNotifier);
 

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
@@ -455,7 +455,7 @@ public ModelAdapter<Model, Item> setInternal(int position, Item item) {
         if (mUseIdDistributor) {
             getIdDistributor().checkId(item);
         }
-        mItems.set(position - getFastAdapter().getPreItemCount(position), item);
+        mItems.set(position, item, getFastAdapter().getPreItemCount(position));
         mFastAdapter.registerTypeInstance(item);
         return this;
     }

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
@@ -89,8 +89,8 @@ public boolean isEmpty() {
     }
 
     @Override
-    public void set(int position, Item item) {
-        mItems.set(position, item);
+    public void set(int position, Item item, int preItemCount) {
+        mItems.set(position - preItemCount, item);
         getFastAdapter().notifyAdapterItemChanged(position);
     }
 

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 3230
-        versionName '3.2.3'
+        versionCode 3240
+        versionName '3.2.4'
     }
     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.2.3
-VERSION_CODE=3230
+VERSION_NAME=3.2.4
+VERSION_CODE=3240
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 3230
-        versionName '3.2.3'
+        versionCode 3240
+        versionName '3.2.4'
 
         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.2.3
-VERSION_CODE=3230
+VERSION_NAME=3.2.4
+VERSION_CODE=3240
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3230
-        versionName '3.2.3'
+        versionCode 3240
+        versionName '3.2.4'
     }
     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.2.3
-VERSION_CODE=3230
+VERSION_NAME=3.2.4
+VERSION_CODE=3240