Support disabling gestures.

MaterialCleaner · Jun 1, 2024 · e118c08 · e118c08
1 parent 097587c
commit e118c08
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,6 @@ is the most important reason I created this library: to modularize selection for
 - Clean and Stable Implementation: Does not rely on any internal APIs or experimental APIs of
   LazyList and LazyGrid, so you don't have to worry about API changes or incompatibilities due to
   updates of Compose.
-- Highly Extensible: Provides multi-level interfaces and supports various complex use cases.
 
 ## Integration
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    val androidGradlePluginVersion = "8.4.0"
+    val androidGradlePluginVersion = "8.4.1"
     id("com.android.application") version androidGradlePluginVersion apply false
     id("com.android.library") version androidGradlePluginVersion apply false
     kotlin("android") version "1.9.23" apply false

diff --git a/library/src/main/java/me/gm/selection/grid/Gestures.kt b/library/src/main/java/me/gm/selection/grid/Gestures.kt
@@ -47,14 +47,20 @@ import me.gm.selection.detectTapGestures
 abstract class LazyGridDetailsLookup<V> : DetailsLookup<LazyGridItemInfo, V>
 
 private class FullyInteractiveLazyGridDetailsLookup<V>(
+    private val enabled: () -> Boolean,
     private val map: () -> KeyIndexItemMap<Any, V>,
     private val key: (itemInfo: LazyGridItemInfo) -> Any = when (map()) {
         is KeyItemMap -> { itemInfo -> itemInfo.key }
         is IndexItemMap -> { itemInfo -> itemInfo.index }
     }
 ) : LazyGridDetailsLookup<V>() {
 
-    override fun getItem(itemInfo: LazyGridItemInfo): V? = map().getItem(key(itemInfo))
+    override fun getItem(itemInfo: LazyGridItemInfo): V? =
+        if (enabled()) {
+            map().getItem(key(itemInfo))
+        } else {
+            null
+        }
 }
 
 private fun touchInfo(
@@ -116,10 +122,11 @@ fun <V> Modifier.longPressToToggleGesture(
     gridState: LazyGridState,
     selectionState: SelectionState<Any, V>,
     map: () -> KeyIndexItemMap<Any, V>,
+    enabled: () -> Boolean = { true },
 ): Modifier = longPressToToggleGesture(
     gridState,
     selectionState,
-    FullyInteractiveLazyGridDetailsLookup(map)
+    FullyInteractiveLazyGridDetailsLookup(enabled, map)
 )
 
 fun <V> Modifier.tapInActionModeToToggleGesture(
@@ -147,10 +154,11 @@ fun <V> Modifier.tapInActionModeToToggleGesture(
     gridState: LazyGridState,
     selectionState: SelectionState<Any, V>,
     map: () -> KeyIndexItemMap<Any, V>,
+    enabled: () -> Boolean = { true },
 ): Modifier = tapInActionModeToToggleGesture(
     gridState,
     selectionState,
-    FullyInteractiveLazyGridDetailsLookup(map)
+    FullyInteractiveLazyGridDetailsLookup(enabled, map)
 )
 
 private class RangeSupport<V>(
@@ -255,8 +263,9 @@ fun <V> Modifier.dragAfterLongPressToSelectGesture(
     gridState: LazyGridState,
     selectionState: SelectionState<Any, V>,
     map: () -> KeyIndexItemMap<Any, V>,
+    enabled: () -> Boolean = { true },
 ): Modifier = dragAfterLongPressToSelectGesture(
     gridState,
     selectionState,
-    FullyInteractiveLazyGridDetailsLookup(map)
+    FullyInteractiveLazyGridDetailsLookup(enabled, map)
 )
diff --git a/library/src/main/java/me/gm/selection/list/Gestures.kt b/library/src/main/java/me/gm/selection/list/Gestures.kt
@@ -47,14 +47,20 @@ import me.gm.selection.detectTapGestures
 abstract class LazyListDetailsLookup<V> : DetailsLookup<LazyListItemInfo, V>
 
 private class FullyInteractiveLazyListDetailsLookup<V>(
+    private val enabled: () -> Boolean,
     private val map: () -> KeyIndexItemMap<Any, V>,
     private val key: (itemInfo: LazyListItemInfo) -> Any = when (map()) {
         is KeyItemMap -> { itemInfo -> itemInfo.key }
         is IndexItemMap -> { itemInfo -> itemInfo.index }
     }
 ) : LazyListDetailsLookup<V>() {
 
-    override fun getItem(itemInfo: LazyListItemInfo): V? = map().getItem(key(itemInfo))
+    override fun getItem(itemInfo: LazyListItemInfo): V? =
+        if (enabled()) {
+            map().getItem(key(itemInfo))
+        } else {
+            null
+        }
 }
 
 private fun touchInfo(
@@ -119,10 +125,11 @@ fun <V> Modifier.longPressToToggleGesture(
     listState: LazyListState,
     selectionState: SelectionState<Any, V>,
     map: () -> KeyIndexItemMap<Any, V>,
+    enabled: () -> Boolean = { true },
 ): Modifier = longPressToToggleGesture(
     listState,
     selectionState,
-    FullyInteractiveLazyListDetailsLookup(map)
+    FullyInteractiveLazyListDetailsLookup(enabled, map)
 )
 
 fun <V> Modifier.tapInActionModeToToggleGesture(
@@ -150,10 +157,11 @@ fun <V> Modifier.tapInActionModeToToggleGesture(
     listState: LazyListState,
     selectionState: SelectionState<Any, V>,
     map: () -> KeyIndexItemMap<Any, V>,
+    enabled: () -> Boolean = { true },
 ): Modifier = tapInActionModeToToggleGesture(
     listState,
     selectionState,
-    FullyInteractiveLazyListDetailsLookup(map)
+    FullyInteractiveLazyListDetailsLookup(enabled, map)
 )
 
 private class RangeSupport<V>(
@@ -258,8 +266,9 @@ fun <V> Modifier.dragAfterLongPressToSelectGesture(
     listState: LazyListState,
     selectionState: SelectionState<Any, V>,
     map: () -> KeyIndexItemMap<Any, V>,
+    enabled: () -> Boolean = { true },
 ): Modifier = dragAfterLongPressToSelectGesture(
     listState,
     selectionState,
-    FullyInteractiveLazyListDetailsLookup(map)
+    FullyInteractiveLazyListDetailsLookup(enabled, map)
 )