Merge branch 'hotfix/1.4.1'

Simdea · Oct 5, 2017 · a629961 · a629961
2 parents ed53288 + 718b0d8
commit a629961
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [1.4.1] - 2017-10-05
+### Fixed
+- [#5](https://github.com/Simdea/gmlrva/issues/5), Not updating view types when add, remove or update the recycler view elements.
+
 ## [1.4] - 2017-10-05
 ### Added
 - CHANGELOG.md file

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Configuration
 ```gradle
 dependencies {
     ...
-    compile 'pt.simdea:gmlrva.lib:1.4'
+    compile 'pt.simdea:gmlrva.lib:1.4.1'
     ...
 }
 ```

diff --git a/gmlrva-lib/build.gradle b/gmlrva-lib/build.gradle
@@ -64,7 +64,7 @@ project.ext {
     description = 'Generic RecyclerView Adapter that supports multiple layouts.'
     groupId = 'pt.simdea'
     artifactId = 'gmlrva.lib'
-    version = "1.4"
+    version = "1.4.1"
     website = 'https://github.com/simdea/gmlrva'
     scm = 'https://github.com/simdea/gmlrva'
     tags = ['android', 'recyclerview', 'adapter', 'generic', 'multiple', 'layout']

diff --git a/gmlrva-lib/src/main/java/pt/simdea/gmlrva/lib/GenericMultipleLayoutAdapter.java b/gmlrva-lib/src/main/java/pt/simdea/gmlrva/lib/GenericMultipleLayoutAdapter.java
@@ -38,13 +38,11 @@ public class GenericMultipleLayoutAdapter extends RecyclerView.Adapter<RecyclerV
     private final Context mContext;
     private final List<IGenericRecyclerViewLayout> mDataSet;
     private final boolean mSkipQueuedUpdates;
-
-    /* View Type Auxiliary Variable */
-    private final SparseArray<IGenericRecyclerViewLayout> mViewTypes = new SparseArray<>();
-
     /* UI & Worker Thread Variables */
     private final ArrayDeque<List<? extends IGenericRecyclerViewLayout>> mPendingUpdates = new ArrayDeque<>();
     private final Handler mHandler = new Handler();
+    /* View Type Auxiliary Variable */
+    private SparseArray<IGenericRecyclerViewLayout> mViewTypes;
 
     /**
      * Instantiates a new GenericMultipleLayoutAdapter.
@@ -102,6 +100,7 @@ public GenericMultipleLayoutAdapter(@NonNull final List<? extends IGenericRecycl
                 = new ArrayList<>(mPendingUpdates.isEmpty() ? mDataSet : mPendingUpdates.peekLast());
         newList.add(item);
         updateList(newList);
+        updateViewTypes();
     }
 
     /**
@@ -114,6 +113,7 @@ public GenericMultipleLayoutAdapter(@NonNull final List<? extends IGenericRecycl
                 = new ArrayList<>(mPendingUpdates.isEmpty() ? mDataSet : mPendingUpdates.peekLast());
         newList.addAll(items);
         updateList(newList);
+        updateViewTypes();
     }
 
     /**
@@ -129,6 +129,7 @@ public GenericMultipleLayoutAdapter(@NonNull final List<? extends IGenericRecycl
                 = new ArrayList<>(mPendingUpdates.isEmpty() ? mDataSet : mPendingUpdates.peekLast());
         newList.add(position, item);
         updateList(newList);
+        updateViewTypes();
     }
 
     /**
@@ -142,6 +143,7 @@ public GenericMultipleLayoutAdapter(@NonNull final List<? extends IGenericRecycl
         if (!newList.isEmpty() && newList.contains(item)) {
             newList.remove(item);
             updateList(newList);
+            updateViewTypes();
         }
     }
 
@@ -166,6 +168,7 @@ public GenericMultipleLayoutAdapter(@NonNull final List<? extends IGenericRecycl
         if (!newList.isEmpty() && !items.isEmpty()) {
             newList.removeAll(items);
             updateList(newList);
+            updateViewTypes();
         }
     }
 
@@ -200,6 +203,7 @@ public GenericMultipleLayoutAdapter(@NonNull final List<? extends IGenericRecycl
         mPendingUpdates.add(items);
         if (mPendingUpdates.size() == 1) {
             innerUpdateList(items); // no pending update, so execute the update
+            updateViewTypes();
         }
     }
 
@@ -277,6 +281,7 @@ private void applyPayloadChange(final int position, @NonNull final Bundle payloa
 
     /** Procedure meant to update this Adapter's handled View Types. */
     private void updateViewTypes() {
+        mViewTypes = new SparseArray<>();
         for (final IGenericRecyclerViewLayout item : mDataSet) {
             if (mViewTypes.get(item.getViewType()) == null) {
                 mViewTypes.put(item.getViewType(), item);