refine extendRange

MaterialCleaner · Aug 6, 2024 · 82c96a7 · 82c96a7
1 parent ab15d34
commit 82c96a7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 31 deletions.
diff --git a/library/src/main/java/me/gm/selection/SelectionState.kt b/library/src/main/java/me/gm/selection/SelectionState.kt
@@ -224,8 +224,8 @@ class KeySelectionState<V>(
                         )
                     } else {
                         KeySelectionState(
-                            initialSelection = selectedKeys.zip(selectedItems),
                             autoDeselectMode = autoDeselectMode,
+                            initialSelection = selectedKeys.zip(selectedItems),
                             mutable = mutable
                         )
                     }

diff --git a/library/src/main/java/me/gm/selection/grid/Gestures.kt b/library/src/main/java/me/gm/selection/grid/Gestures.kt
@@ -181,23 +181,21 @@ private class RangeSupport<V>(
         val newRange = range()
 
         val removed = oldRange - newRange
-        if (removed.isNotEmpty()) {
-            removed.forEach { index ->
-                val itemInfo = lookupItemInfoForIndex(index) ?: return@forEach
-                if (!initialSelection.contains(selectionState.key(itemInfo))) {
-                    selectionState.deselect(selectionState.key(itemInfo))
-                }
-            }
-        } else {
-            val added = newRange - oldRange
-            added.forEach { index ->
-                val itemInfo =
-                    if (index == extendToItem.index) extendToItem
-                    else lookupItemInfoForIndex(index) ?: return@forEach
-                val item = detailsLookup.getItem(itemInfo) ?: return@forEach
-                selectionState.select(selectionState.key(itemInfo), item)
+        removed.forEach { index ->
+            val itemInfo = lookupItemInfoForIndex(index) ?: return@forEach
+            if (!initialSelection.contains(selectionState.key(itemInfo))) {
+                selectionState.deselect(selectionState.key(itemInfo))
             }
         }
+
+        val added = newRange - oldRange
+        added.forEach { index ->
+            val itemInfo =
+                if (index == extendToItem.index) extendToItem
+                else lookupItemInfoForIndex(index) ?: return@forEach
+            val item = detailsLookup.getItem(itemInfo) ?: return@forEach
+            selectionState.select(selectionState.key(itemInfo), item)
+        }
     }
 }
 

diff --git a/library/src/main/java/me/gm/selection/list/Gestures.kt b/library/src/main/java/me/gm/selection/list/Gestures.kt
@@ -184,23 +184,21 @@ private class RangeSupport<V>(
         val newRange = range()
 
         val removed = oldRange - newRange
-        if (removed.isNotEmpty()) {
-            removed.forEach { index ->
-                val itemInfo = lookupItemInfoForIndex(index) ?: return@forEach
-                if (!initialSelection.contains(selectionState.key(itemInfo))) {
-                    selectionState.deselect(selectionState.key(itemInfo))
-                }
-            }
-        } else {
-            val added = newRange - oldRange
-            added.forEach { index ->
-                val itemInfo =
-                    if (index == extendToItem.index) extendToItem
-                    else lookupItemInfoForIndex(index) ?: return@forEach
-                val item = detailsLookup.getItem(itemInfo) ?: return@forEach
-                selectionState.select(selectionState.key(itemInfo), item)
+        removed.forEach { index ->
+            val itemInfo = lookupItemInfoForIndex(index) ?: return@forEach
+            if (!initialSelection.contains(selectionState.key(itemInfo))) {
+                selectionState.deselect(selectionState.key(itemInfo))
             }
         }
+
+        val added = newRange - oldRange
+        added.forEach { index ->
+            val itemInfo =
+                if (index == extendToItem.index) extendToItem
+                else lookupItemInfoForIndex(index) ?: return@forEach
+            val item = detailsLookup.getItem(itemInfo) ?: return@forEach
+            selectionState.select(selectionState.key(itemInfo), item)
+        }
     }
 }