Fixed "locked item" handling in sample

Author: aclassen

android/src/main/kotlin/org/burnoutcrew/android/ui/reorderlist/ReorderGrid.kt

@@ -66,7 +66,8 @@ private fun HorizontalGrid(
         verticalArrangement = Arrangement.spacedBy(4.dp),
         horizontalArrangement = Arrangement.spacedBy(4.dp),
         modifier = modifier
-            .reorderable(state).height(200.dp)
+            .reorderable(state)
+            .height(200.dp)
             .detectReorderAfterLongPress(state)
     ) {
         items(vm.cats, { it.key }) { item ->
@@ -98,26 +99,25 @@ private fun VerticalGrid(
         contentPadding = PaddingValues(horizontal = 8.dp),
         verticalArrangement = Arrangement.spacedBy(4.dp),
         horizontalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = modifier
-            .reorderable(state)
-            .detectReorderAfterLongPress(state)
+        modifier = modifier.reorderable(state)
     ) {
         items(vm.dogs, { it.key }) { item ->
-            ReorderableItem(state, item.key) { isDragging ->
-                val elevation = animateDpAsState(if (isDragging) 8.dp else 0.dp)
-                if (item.isLocked) {
-                    Box(
-                        contentAlignment = Alignment.Center,
-                        modifier = Modifier
-                            .size(100.dp)
-                            .background(MaterialTheme.colors.surface)
-                    ) {
-                        Text(item.title)
-                    }
-                } else {
+            if (item.isLocked) {
+                Box(
+                    contentAlignment = Alignment.Center,
+                    modifier = Modifier
+                        .size(100.dp)
+                        .background(MaterialTheme.colors.surface)
+                ) {
+                    Text(item.title)
+                }
+            } else {
+                ReorderableItem(state, item.key) { isDragging ->
+                    val elevation = animateDpAsState(if (isDragging) 8.dp else 0.dp)
                     Box(
                         contentAlignment = Alignment.Center,
                         modifier = Modifier
+                            .detectReorderAfterLongPress(state)
                             .shadow(elevation.value)
                             .aspectRatio(1f)
                             .background(MaterialTheme.colors.primary)

android/src/main/kotlin/org/burnoutcrew/android/ui/reorderlist/ReorderList.kt

@@ -48,29 +48,23 @@ import org.burnoutcrew.reorderable.reorderable
 @Composable
 fun ReorderList(vm: ReorderListViewModel = viewModel()) {
     Column {
-        NewHorizontalReorderList(
+        HorizontalReorderList(
             vm = vm,
             modifier = Modifier.padding(vertical = 16.dp),
         )
-        NewVerticalReorderList(vm = vm)
+        VerticalReorderList(vm = vm)
     }
 }
 
-
 @Composable
-private fun NewVerticalReorderList(
+private fun VerticalReorderList(
     modifier: Modifier = Modifier,
     vm: ReorderListViewModel,
 ) {
     val state = rememberReorderableLazyListState(onMove = vm::moveDog, canDragOver = vm::isDogDragEnabled)
     LazyColumn(
         state = state.listState,
-        modifier = modifier
-            .then(
-                Modifier
-                    .reorderable(state)
-                    .detectReorderAfterLongPress(state)
-            )
+        modifier = modifier.reorderable(state)
     ) {
         items(vm.dogs, { item -> item.key }) { item ->
             ReorderableItem(state, item.key) { dragging ->
@@ -89,6 +83,7 @@ private fun NewVerticalReorderList(
                 } else {
                     Column(
                         modifier = Modifier
+                            .detectReorderAfterLongPress(state)
                             .shadow(elevation.value)
                             .fillMaxWidth()
                             .background(MaterialTheme.colors.surface)
@@ -106,7 +101,7 @@ private fun NewVerticalReorderList(
 }
 
 @Composable
-private fun NewHorizontalReorderList(
+private fun HorizontalReorderList(
     vm: ReorderListViewModel,
     modifier: Modifier = Modifier,
 ) {