Fancy drag and drop WIP

strict-mode/src/androidMain/kotlin/com/alexvanyo/composelife/strictmode/StrictModeExtensions.kt

@@ -25,7 +25,7 @@ import com.alexvanyo.composelife.logging.e
 
 fun Application.initStrictModeIfNeeded() {
     if (isDebuggable) {
-        //initStrictMode()
+        initStrictMode()
     }
 }
 

ui-app/src/androidInstrumentedTest/kotlin/com/alexvanyo/composelife/ui/app/action/LoadedCellStatePreviewTests.kt

@@ -97,8 +97,8 @@ class LoadedCellStatePreviewTests : BaseUiInjectTest<TestComposeLifeApplicationC
                     Spacer(
                         modifier = Modifier
                             .testTag("TestDropTarget")
-                            .cellStateDragAndDropTarget {
-                                droppedCellState = it
+                            .cellStateDragAndDropTarget { _, cellState ->
+                                droppedCellState = cellState
                             }
                             .size(100.dp)
                             .background(Color.Blue),
@@ -141,8 +141,8 @@ class LoadedCellStatePreviewTests : BaseUiInjectTest<TestComposeLifeApplicationC
             downTime,
             SystemClock.uptimeMillis(),
             MotionEvent.ACTION_MOVE,
-            testDropTargetCenter.x.toFloat(),
-            testDropTargetCenter.y.toFloat(),
+            testDropTargetCenter.x,
+            testDropTargetCenter.y,
             0,
         ).apply {
             source = InputDevice.SOURCE_TOUCHSCREEN
@@ -154,8 +154,8 @@ class LoadedCellStatePreviewTests : BaseUiInjectTest<TestComposeLifeApplicationC
             downTime,
             SystemClock.uptimeMillis(),
             MotionEvent.ACTION_UP,
-            testDropTargetCenter.x.toFloat(),
-            testDropTargetCenter.y.toFloat(),
+            testDropTargetCenter.x,
+            testDropTargetCenter.y,
             0,
         ).apply {
             source = InputDevice.SOURCE_TOUCHSCREEN

ui-cells/src/androidMain/kotlin/com/alexvanyo/composelife/ui/cells/CellStateDragAndDrop.android.kt

@@ -38,7 +38,7 @@ import androidx.compose.ui.draganddrop.mimeTypes
 import androidx.compose.ui.draganddrop.toAndroidDragEvent
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.layout.onGloballyPositioned
-import androidx.compose.ui.layout.positionOnScreen
+import androidx.compose.ui.layout.positionInWindow
 import com.alexvanyo.composelife.logging.Logger
 import com.alexvanyo.composelife.logging.d
 import com.alexvanyo.composelife.model.CellState
@@ -75,17 +75,17 @@ actual fun Modifier.cellStateDragAndDropSource(
 
 context(CellStateParserProvider)
 @Composable
-@Suppress("ComposeComposableModifier")
+@Suppress("ComposeComposableModifier", "LongMethod", "CyclomaticComplexMethod")
 actual fun Modifier.cellStateDragAndDropTarget(
     mutableCellStateDropStateHolder: MutableCellStateDropStateHolder,
-    setSelectionToCellState: (Offset, CellState) -> Unit,
+    setSelectionToCellState: (dropOffset: Offset, cellState: CellState) -> Unit,
 ): Modifier {
     val coroutineScope = rememberCoroutineScope()
     val dragAndDropEvents = remember { Channel<CellStateDragAndDropEvent>(Channel.UNLIMITED) }
 
     val currentSetSelectionToCellState by rememberUpdatedState(setSelectionToCellState)
 
-    var positionOnScreen by remember {
+    var positionInWindow by remember {
         mutableStateOf(Offset.Zero)
     }
 
@@ -128,7 +128,7 @@ actual fun Modifier.cellStateDragAndDropTarget(
                                     is DeserializationResult.Successful -> {
                                         currentSetSelectionToCellState(
                                             offset,
-                                            deserializationResult.cellState
+                                            deserializationResult.cellState,
                                         )
                                     }
                                     is DeserializationResult.Unsuccessful -> {
@@ -184,8 +184,8 @@ actual fun Modifier.cellStateDragAndDropTarget(
             override fun onStarted(event: DragAndDropEvent) {
                 dragAndDropEvents.trySend(
                     CellStateDragAndDropEvent.Started(
-                        clipData = event.toAndroidDragEvent().clipData ?:
-                            event.toAndroidDragEvent().localState as? ClipData,
+                        clipData = event.toAndroidDragEvent().clipData
+                            ?: event.toAndroidDragEvent().localState as? ClipData,
                     ),
                 )
             }
@@ -194,12 +194,12 @@ actual fun Modifier.cellStateDragAndDropTarget(
                 val androidDragEvent = event.toAndroidDragEvent()
                 dragAndDropEvents.trySend(
                     CellStateDragAndDropEvent.Entered(
-                        clipData = event.toAndroidDragEvent().clipData ?:
-                        event.toAndroidDragEvent().localState as? ClipData,
+                        clipData = event.toAndroidDragEvent().clipData
+                            ?: event.toAndroidDragEvent().localState as? ClipData,
                         offset = Offset(
                             androidDragEvent.x,
                             androidDragEvent.y,
-                        ) - positionOnScreen,
+                        ) - positionInWindow,
                     ),
                 )
             }
@@ -208,30 +208,30 @@ actual fun Modifier.cellStateDragAndDropTarget(
                 val androidDragEvent = event.toAndroidDragEvent()
                 dragAndDropEvents.trySend(
                     CellStateDragAndDropEvent.Moved(
-                        clipData = event.toAndroidDragEvent().clipData ?:
-                        event.toAndroidDragEvent().localState as? ClipData,
+                        clipData = event.toAndroidDragEvent().clipData
+                            ?: event.toAndroidDragEvent().localState as? ClipData,
                         offset = Offset(
                             androidDragEvent.x,
                             androidDragEvent.y,
-                        ) - positionOnScreen,
+                        ) - positionInWindow,
                     ),
                 )
             }
 
             override fun onExited(event: DragAndDropEvent) {
                 dragAndDropEvents.trySend(
                     CellStateDragAndDropEvent.Exited(
-                        clipData = event.toAndroidDragEvent().clipData ?:
-                        event.toAndroidDragEvent().localState as? ClipData,
+                        clipData = event.toAndroidDragEvent().clipData
+                            ?: event.toAndroidDragEvent().localState as? ClipData,
                     ),
                 )
             }
 
             override fun onEnded(event: DragAndDropEvent) {
                 dragAndDropEvents.trySend(
                     CellStateDragAndDropEvent.Ended(
-                        clipData = event.toAndroidDragEvent().clipData ?:
-                        event.toAndroidDragEvent().localState as? ClipData,
+                        clipData = event.toAndroidDragEvent().clipData
+                            ?: event.toAndroidDragEvent().localState as? ClipData,
                     ),
                 )
             }
@@ -248,7 +248,7 @@ actual fun Modifier.cellStateDragAndDropTarget(
     }
 
     return onGloballyPositioned { coordinates ->
-        positionOnScreen = coordinates.positionOnScreen()
+        positionInWindow = coordinates.positionInWindow()
     }
         .dragAndDropTarget(
             shouldStartDragAndDrop = { event ->

ui-cells/src/jbMain/kotlin/com/alexvanyo/composelife/ui/cells/CellStateDragAndDrop.kt

@@ -32,6 +32,7 @@ expect fun Modifier.cellStateDragAndDropSource(getCellState: () -> CellState): M
  */
 context(CellStateParserProvider)
 @Composable
+@Suppress("ComposeComposableModifier")
 expect fun Modifier.cellStateDragAndDropTarget(
     mutableCellStateDropStateHolder: MutableCellStateDropStateHolder = rememberMutableCellStateDropStateHolder(),
     setSelectionToCellState: (dropOffset: Offset, cellState: CellState) -> Unit,

ui-cells/src/jbMain/kotlin/com/alexvanyo/composelife/ui/cells/CellStateDropState.kt

@@ -66,7 +66,6 @@ fun rememberMutableCellStateDropStateHolder(): MutableCellStateDropStateHolder {
                 set(value) {
                     cellStateDropState = value
                 }
-
         }
     }
 }

ui-cells/src/jbMain/kotlin/com/alexvanyo/composelife/ui/cells/CellWindow.kt

@@ -433,7 +433,7 @@ private fun CellWindowImpl(
                         scaledCellDpSize = scaledCellDpSize,
                         cellWindow = cellWindow,
                         pixelOffsetFromCenter = fracPixelOffsetFromCenter,
-                        modifier = Modifier
+                        modifier = Modifier,
 
                     )
                 }

ui-cells/src/jbMain/kotlin/com/alexvanyo/composelife/ui/cells/DashedDrawing.kt

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alexvanyo.composelife.ui.cells
+
+import androidx.annotation.FloatRange
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.geometry.toRect
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.graphics.drawscope.Stroke
+
+/**
+ * Draws a dashed line rectangle, with intervals and phase applied symmetrically.
+ *
+ * The dashed line effect is drawn in 8 line segments: from the middle of each side,
+ * to each corner.
+ */
+internal fun DrawScope.drawDashedRect(
+    selectionColor: Color,
+    strokeWidth: Float,
+    intervals: FloatArray,
+    phase: Float = 0f,
+    rect: Rect = size.toRect(),
+) {
+    // Draw the selection outlines in a way that is symmetric, and hides the extra of the lines near the
+    // corners with the selection handles
+    listOf(
+        rect.topCenter to rect.topLeft,
+        rect.topCenter to rect.topRight,
+        rect.centerLeft to rect.topLeft,
+        rect.centerLeft to rect.bottomLeft,
+        rect.bottomCenter to rect.bottomLeft,
+        rect.bottomCenter to rect.bottomRight,
+        rect.centerRight to rect.topRight,
+        rect.centerRight to rect.bottomRight,
+    ).forEach { (start, end) ->
+        drawDashedLine(
+            color = selectionColor,
+            start = start,
+            end = end,
+            strokeWidth = strokeWidth,
+            intervals = intervals,
+            phase = phase,
+        )
+    }
+}
+
+@Suppress("LongParameterList")
+internal expect fun DrawScope.drawDashedLine(
+    color: Color,
+    start: Offset,
+    end: Offset,
+    intervals: FloatArray,
+    phase: Float = 0f,
+    strokeWidth: Float = Stroke.HairlineWidth,
+    cap: StrokeCap = Stroke.DefaultCap,
+    @FloatRange(from = 0.0, to = 1.0) alpha: Float = 1.0f,
+    colorFilter: ColorFilter? = null,
+    blendMode: BlendMode = DrawScope.DefaultBlendMode,
+)