[Refactor] Fix multi-selection mode activation logic

Multi-selection panel should be activated before the first selected item is visible, and it should be deactivated after all the items are deselected. Signed-off-by: Muntashir Al-Islam <[email protected]>
MuntashirAkon · Nov 18, 2024 · ae13ba3 · ae13ba3
1 parent 46b22de
commit ae13ba3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/libcore/ui/src/main/java/io/github/muntashirakon/widget/MultiSelectionView.java b/libcore/ui/src/main/java/io/github/muntashirakon/widget/MultiSelectionView.java
@@ -506,9 +506,13 @@ public final void setInSelectionMode(boolean inSelectionMode) {
         public void toggleSelection(int position) {
             if (isSelected(position)) {
                 deselect(position);
-            } else select(position);
-            notifyItemChanged(position);
-            notifySelectionChange();
+                notifyItemChanged(position);
+                notifySelectionChange();
+            } else {
+                select(position);
+                notifySelectionChange();
+                notifyItemChanged(position);
+            }
         }
 
         @UiThread
@@ -517,8 +521,8 @@ public void selectAll() {
             for (int position = 0; position < getItemCount(); ++position) {
                 select(position);
             }
-            notifyItemRangeChanged(0, getItemCount(), null);
             notifySelectionChange();
+            notifyItemRangeChanged(0, getItemCount(), null);
         }
 
         @UiThread
@@ -541,8 +545,8 @@ public void selectRange(int firstPosition, int secondPosition) {
             for (int position = beginPosition; position <= endPosition; ++position) {
                 select(position);
             }
-            notifyItemRangeChanged(beginPosition, endPosition - beginPosition + 1);
             notifySelectionChange();
+            notifyItemRangeChanged(beginPosition, endPosition - beginPosition + 1);
         }
 
         @Override