Merge pull request #64 from MohamedRejeb/0.5.x

0.5.x

Author: MohamedRejeb

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drop/DropTargetState.kt

@@ -51,58 +51,68 @@ class DropTargetState<T> internal constructor(
 
     internal fun getDropTopLeft(droppedItemSize: Size): Offset =
         topLeft + dropOffset + when (dropAlignment) {
-            Alignment.TopStart ->
+            Alignment.TopStart -> {
                 Offset.Zero
+            }
 
-            Alignment.TopCenter ->
+            Alignment.TopCenter -> {
                 Offset(
                     x = size.width / 2f - droppedItemSize.width / 2f,
                     y = 0f,
                 )
+            }
 
-            Alignment.TopEnd ->
+            Alignment.TopEnd -> {
                 Offset(
                     x = size.width - droppedItemSize.width,
                     y = 0f,
                 )
+            }
 
-            Alignment.CenterStart ->
+            Alignment.CenterStart -> {
                 Offset(
                     x = 0f,
                     y = size.height / 2f - droppedItemSize.height / 2f,
                 )
+            }
 
-            Alignment.Center ->
+            Alignment.Center -> {
                 Offset(
                     x = size.width / 2f - droppedItemSize.width / 2f,
                     y = size.height / 2f - droppedItemSize.height / 2f,
                 )
+            }
 
-            Alignment.CenterEnd ->
+            Alignment.CenterEnd -> {
                 Offset(
                     x = size.width - droppedItemSize.width,
                     y = size.height / 2f - droppedItemSize.height / 2f,
                 )
+            }
 
-            Alignment.BottomStart ->
+            Alignment.BottomStart -> {
                 Offset(
                     x = 0f,
                     y = size.height - droppedItemSize.height,
                 )
+            }
 
-            Alignment.BottomCenter ->
+            Alignment.BottomCenter -> {
                 Offset(
                     x = size.width / 2f - droppedItemSize.width / 2f,
                     y = size.height - droppedItemSize.height,
                 )
+            }
 
-            Alignment.BottomEnd ->
+            Alignment.BottomEnd -> {
                 Offset(
                     x = size.width - droppedItemSize.width,
                     y = size.height - droppedItemSize.height,
                 )
+            }
 
-            else ->
+            else -> {
                 Offset.Zero
+            }
         }
 }

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/scroll/DragAutoScroll.kt

@@ -453,12 +453,15 @@ internal fun computeScrollSpeed(
             val ratio = (startOverlap / startThresholdPx).coerceIn(0f, 1f)
             -maxScrollSpeed * ratio * ratio
         }
+
         // Item's end edge is within the end threshold → scroll toward end
         endOverlap > 0f -> {
             val ratio = (endOverlap / endThresholdPx).coerceIn(0f, 1f)
             maxScrollSpeed * ratio * ratio
         }
 
-        else -> 0f
+        else -> {
+            0f
+        }
     }
 }

gradle/libs.versions.toml

@@ -6,9 +6,9 @@ android-minSdk = "23"
 android-compileSdk = "36"
 android-targetSdk = "36"
 androidx-activityCompose = "1.13.0"
-androidx-core-ktx = "1.16.0"
+androidx-core-ktx = "1.18.0"
 jetbrains-navigation-compose = "2.9.2"
-spotless = "7.2.1"
+spotless = "8.4.0"
 vanniktech-maven-publish = "0.36.0"
 
 [libraries]

renovate.json

@@ -98,11 +98,13 @@ fun AutoScrollDemoScreen(
                         .fillMaxSize()
                         .padding(16.dp),
                 )
+
                 1 -> LazyGridReorderContent(
                     modifier = Modifier
                         .fillMaxSize()
                         .padding(16.dp),
                 )
+
                 2 -> ScrollStateReorderContent(
                     modifier = Modifier
                         .fillMaxSize()
@@ -164,7 +166,7 @@ private fun LazyRowReorderContent(modifier: Modifier = Modifier) {
                                 .fillMaxHeight(),
                         )
                     },
-                    modifier = Modifier,
+                    modifier = Modifier.animateItem(),
                 ) {
                     AutoScrollItem(
                         number = number,
@@ -232,7 +234,7 @@ private fun LazyGridReorderContent(modifier: Modifier = Modifier) {
                                 .height(80.dp),
                         )
                     },
-                    modifier = Modifier,
+                    modifier = Modifier.animateItem(),
                 ) {
                     AutoScrollItem(
                         number = number,

sample/common/src/commonMain/kotlin/ui/AutoScrollDemoScreen.kt

@@ -320,6 +320,7 @@ private fun FreeMovementDemo() {
                                         )
                                     }
                                 }
+
                                 hasItemB -> {
                                     DraggableItem(
                                         state = state,

sample/common/src/commonMain/kotlin/ui/AxisLockedDragScreen.kt

@@ -123,7 +123,7 @@ private fun DragHandleReorderContent(
                             isDragShadow = true,
                         )
                     },
-                    modifier = Modifier,
+                    modifier = Modifier.animateItem(),
                 ) {
                     DragHandleListItem(
                         text = item,

sample/common/src/commonMain/kotlin/ui/DragHandleReorderScreen.kt

@@ -437,16 +437,21 @@ private fun StrategySelector(
 @Composable
 private fun StrategyDescription(strategy: DropStrategy) {
     val description = when (strategy) {
-        DropStrategy.Surface ->
+        DropStrategy.Surface -> {
             "Picks the target with the most overlap area (pixels). Favors larger targets."
+        }
 
-        DropStrategy.SurfacePercentage ->
+        DropStrategy.SurfacePercentage -> {
             "Picks the target with the highest overlap relative to its own size. Favors smaller targets."
+        }
 
-        DropStrategy.CenterDistance ->
+        DropStrategy.CenterDistance -> {
             "Picks the target whose center is closest to the dragged item. Size doesn't matter."
+        }
 
-        else -> ""
+        else -> {
+            ""
+        }
     }
 
     Text(

sample/common/src/commonMain/kotlin/ui/DropStrategiesPlaygroundScreen.kt

@@ -145,7 +145,7 @@ private fun ListToListWithReorderContent(
                                     .height(60.dp),
                             )
                         },
-                        modifier = Modifier,
+                        modifier = Modifier.animateItem(),
                     ) {
                         DndItemCard(
                             label = item,
@@ -214,7 +214,7 @@ private fun ListToListWithReorderContent(
                                     .height(60.dp),
                             )
                         },
-                        modifier = Modifier,
+                        modifier = Modifier.animateItem(),
                     ) {
                         DndItemCard(
                             label = item,

sample/common/src/commonMain/kotlin/ui/ListToListWithReorderScreen.kt

@@ -92,6 +92,7 @@ private fun ReorderScreenContent(
                 DndItemCard(
                     label = "#$number",
                     modifier = Modifier
+                        .animateItem()
                         .graphicsLayer { alpha = if (isDragging) 0f else 1f }
                         .reorderableItem(
                             key = item,