data improvevents

Author: dvdciri

library/multichoicerecyclerview/src/main/java/com/davidecirillo/multichoicerecyclerview/MultiChoiceAdapter.java

@@ -161,9 +161,7 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
             mItemList = (Map<Integer, State>) savedInstanceState.getSerializable(EXTRA_ITEM_LIST);
 
             int selectedListSize = getSelectedItemListInternal().size();
-            updateToolbarIfNeeded(selectedListSize);
-            updateMultiChoiceMode(selectedListSize);
-            processNotifyDataSetChanged();
+            refreshMultiChoiceModeState(selectedListSize);
         }
     }
 
@@ -176,6 +174,7 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
      */
     public void notifyAdapterDataSetChanged() {
         notifyAdapterDataSetChangedInternal();
+        refreshMultiChoiceModeState(getSelectedItemListInternal().size());
     }
 
     //endregion
@@ -251,9 +250,7 @@ private void perform(Action action, int position, boolean withCallback, boolean
 
         int selectedListSize = getSelectedItemListInternal().size();
 
-        updateToolbarIfNeeded(selectedListSize);
-
-        updateMultiChoiceMode(selectedListSize);
+        refreshMultiChoiceModeState(selectedListSize);
 
         processNotifyDataSetChanged();
 
@@ -272,13 +269,11 @@ void processNotifyDataSetChanged() {
         }
     }
 
-    private void updateToolbarIfNeeded(int selectedListSize) {
+    private void refreshMultiChoiceModeState(int selectedListSize) {
         if ((mIsInMultiChoiceMode || mIsInSingleClickMode || selectedListSize > 0) && mMultiChoiceToolbarHelper != null) {
             mMultiChoiceToolbarHelper.updateToolbar(selectedListSize);
         }
-    }
 
-    private void updateMultiChoiceMode(int selectedListSize) {
         boolean somethingSelected = selectedListSize > 0;
         if (mIsInMultiChoiceMode != somethingSelected) {
             mIsInMultiChoiceMode = somethingSelected;
@@ -303,8 +298,7 @@ private void performAll(Action action) {
             mItemList.put(i, state);
         }
 
-        updateToolbarIfNeeded(selectedItems);
-        updateMultiChoiceMode(selectedItems);
+        refreshMultiChoiceModeState(selectedItems);
 
         processNotifyDataSetChanged();
 

sample/src/main/java/com/davidecirillo/multichoicesample/sampleToolbar/SampleToolbarActivity.java

@@ -71,7 +71,7 @@ void notifyDataChanged() {
 
         stringList.clear();
         Random random = new Random();
-        for (int i = 0; i < random.nextInt(15); i++) {
+        for (int i = 0; i < random.nextInt(30); i++) {
             stringList.add("New item " + i);
         }
 

sample/src/main/res/layout/activity_sample_toolbar.xml

@@ -30,7 +30,7 @@
             android:textColor="@android:color/white"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Change data"/>
+            android:text="Change data and notify"/>
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView