Compose 1.4, AGP 8.0, refactored forEachGesture with awaitEachGesture

android/build.gradle.kts

@@ -6,12 +6,12 @@ plugins {
 
 dependencies {
     implementation(project(":reorderable"))
-    implementation("androidx.compose.runtime:runtime:1.3.3")
-    implementation("androidx.compose.material:material:1.3.1")
-    implementation("androidx.activity:activity-compose:1.6.1")
+    implementation("androidx.compose.runtime:runtime:1.4.2")
+    implementation("androidx.compose.material:material:1.4.2")
+    implementation("androidx.activity:activity-compose:1.7.1")
     implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
     implementation("androidx.navigation:navigation-compose:2.5.3")
     implementation("io.coil-kt:coil-compose:2.2.2")
 }
@@ -38,7 +38,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
     namespace = "org.burnoutcrew.android"
 }

build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
     `maven-publish`
-    id("com.android.library") version "7.4.0" apply false
-    id("org.jetbrains.kotlin.multiplatform") version "1.8.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.0" apply false
-    id("org.jetbrains.compose") version "1.3.0" apply false
+    id("com.android.library") version "8.0.0" apply false
+    id("org.jetbrains.kotlin.multiplatform") version "1.8.20" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.20" apply false
+    id("org.jetbrains.compose") version "1.4.0" apply false
 }
 
 ext {

gradle.properties

@@ -15,4 +15,8 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
 
-org.jetbrains.compose.experimental.jscanvas.enabled=true
+org.jetbrains.compose.experimental.jscanvas.enabled=true
+
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reorderable/src/commonMain/kotlin/org/burnoutcrew/reorderable/DetectReorder.kt

@@ -15,46 +15,44 @@
  */
 package org.burnoutcrew.reorderable
 
+import androidx.compose.foundation.gestures.awaitDragOrCancellation
+import androidx.compose.foundation.gestures.awaitEachGesture
 import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.forEachGesture
+import androidx.compose.foundation.gestures.awaitLongPressOrCancellation
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.AwaitPointerEventScope
+import androidx.compose.ui.input.pointer.PointerId
 import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
 
-fun Modifier.detectReorder(state: ReorderableState<*>) =
-    this.then(
-        Modifier.pointerInput(Unit) {
-            forEachGesture {
-                awaitPointerEventScope {
-                    val down = awaitFirstDown(requireUnconsumed = false)
-                    var drag: PointerInputChange?
-                    var overSlop = Offset.Zero
-                    do {
-                        drag = awaitPointerSlopOrCancellation(down.id, down.type) { change, over ->
-                            change.consume()
-                            overSlop = over
-                        }
-                    } while (drag != null && !drag.isConsumed)
-                    if (drag != null) {
-                        state.interactions.trySend(StartDrag(down.id, overSlop))
-                    }
-                }
-            }
-        }
-    )
-
-
-fun Modifier.detectReorderAfterLongPress(state: ReorderableState<*>) =
-    this.then(
-        Modifier.pointerInput(Unit) {
-            forEachGesture {
-                val down = awaitPointerEventScope {
-                    awaitFirstDown(requireUnconsumed = false)
-                }
-                awaitLongPressOrCancellation(down)?.also {
-                    state.interactions.trySend(StartDrag(down.id))
-                }
+fun Modifier.detectReorder(state: ReorderableState<*>) = detect(state){
+    awaitDragOrCancellation(it)
+}
+
+fun Modifier.detectReorderAfterLongPress(state: ReorderableState<*>) = detect(state) {
+    awaitLongPressOrCancellation(it)
+}
+
+
+private fun Modifier.detect(state: ReorderableState<*>, detect: suspend AwaitPointerEventScope.(PointerId)->PointerInputChange?) = composed {
+
+    val itemPosition = remember { mutableStateOf(Offset.Zero) }
+
+    Modifier.onGloballyPositioned { itemPosition.value = it.positionInWindow() }.pointerInput(Unit) {
+        awaitEachGesture {
+            val down = awaitFirstDown(requireUnconsumed = false)
+            val start = detect(down.id)
+
+            if (start != null) {
+                val relativePosition = itemPosition.value - state.layoutWindowPosition.value + start.position
+                state.onDragStart(relativePosition.x.toInt(), relativePosition.y.toInt())
             }
         }
-    )
+    }
+}

reorderable/src/commonMain/kotlin/org/burnoutcrew/reorderable/Reorderable.kt

@@ -15,69 +15,38 @@
  */
 package org.burnoutcrew.reorderable
 
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
 import androidx.compose.foundation.gestures.drag
-import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.pointer.PointerId
-import androidx.compose.ui.input.pointer.PointerInputChange
-import androidx.compose.ui.input.pointer.PointerInputScope
 import androidx.compose.ui.input.pointer.changedToUp
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.input.pointer.positionChange
-import androidx.compose.ui.util.fastFirstOrNull
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.layout.positionInWindow
 
 fun Modifier.reorderable(
     state: ReorderableState<*>
 ) = then(
-    Modifier.pointerInput(Unit) {
-        forEachGesture {
-            val dragStart = state.interactions.receive()
-            val down = awaitPointerEventScope {
-                currentEvent.changes.fastFirstOrNull { it.id == dragStart.id }
-            }
-            if (down != null && state.onDragStart(down.position.x.toInt(), down.position.y.toInt())) {
-                dragStart.offset?.apply {
-                    state.onDrag(x.toInt(), y.toInt())
+    Modifier.onGloballyPositioned { state.layoutWindowPosition.value = it.positionInWindow()}.pointerInput(Unit) {
+        awaitEachGesture {
+            val down = awaitFirstDown(requireUnconsumed = false)
+
+            val dragResult = drag(down.id) {
+                if (state.draggingItemIndex != null){
+                    state.onDrag(it.positionChange().x.toInt(), it.positionChange().y.toInt())
+                    it.consume()
                 }
-                detectDrag(
-                    down.id,
-                    onDragEnd = {
-                        state.onDragCanceled()
-                    },
-                    onDragCancel = {
-                        state.onDragCanceled()
-                    },
-                    onDrag = { change, dragAmount ->
-                        change.consume()
-                        state.onDrag(dragAmount.x.toInt(), dragAmount.y.toInt())
-                    })
             }
-        }
-    })
 
-internal suspend fun PointerInputScope.detectDrag(
-    down: PointerId,
-    onDragEnd: () -> Unit = { },
-    onDragCancel: () -> Unit = { },
-    onDrag: (change: PointerInputChange, dragAmount: Offset) -> Unit,
-) {
-    awaitPointerEventScope {
-        if (
-            drag(down) {
-                onDrag(it, it.positionChange())
-                it.consume()
-            }
-        ) {
-            // consume up if we quit drag gracefully with the up
-            currentEvent.changes.forEach {
-                if (it.changedToUp()) it.consume()
+            if (dragResult) {
+                // consume up if we quit drag gracefully with the up
+                currentEvent.changes.forEach {
+                    if (it.changedToUp()) it.consume()
+                }
             }
-            onDragEnd()
-        } else {
-            onDragCancel()
+
+            state.onDragCanceled()
         }
     }
-}
-
-internal data class StartDrag(val id: PointerId, val offset: Offset? = null)
+)