Gabriel20xx/CollabTable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: streamline drag-and-drop reordering logic in ManageColumnsDialog and ListsScreen for consistency

Browse Source
This commit is contained in:
Gabriel20xx
2025-10-26 01:24:23 +02:00
parent c9b50e9dcb
commit eaa0985b01
2 changed files with 72 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailScreen.kt
+33 -61
View File
@@ -6,7 +6,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.detectDragGestures
import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -40,8 +39,6 @@ import androidx.compose.material.icons.filled.DateRange
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.DragHandle
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.KeyboardArrowDown
import androidx.compose.material.icons.filled.KeyboardArrowUp
import androidx.compose.material.icons.filled.List
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.Search
@@ -2499,28 +2496,31 @@ fun ManageColumnsDialog(
Divider()
// Column list with drag-and-drop reordering
// Local extension mirroring the working behavior used in ListsScreen
fun <T> MutableList<T>.move(
from: Int,
to: Int,
) {
if (from == to) return
if (isEmpty()) return
if (from !in indices) return
val item = removeAt(from)
val insertIndex =
when {
to > size -> size
to < 0 -> 0
else -> to
}
add(insertIndex, item)
}
val reorderState =
rememberReorderableLazyListState(onMove = { from, to ->
if (reorderedFields.isEmpty()) return@rememberReorderableLazyListState
val lastIndex = reorderedFields.lastIndex
if (lastIndex < 0) return@rememberReorderableLazyListState
val fromIndex = from.index.coerceIn(0, lastIndex)
// Clamp target index into valid range; drop-at-end maps to lastIndex
val toIndex = to.index.coerceIn(0, lastIndex)
if (fromIndex in 0..lastIndex && toIndex in 0..lastIndex) {
if (fromIndex != toIndex && reorderedFields.isNotEmpty()) {
val item = reorderedFields.removeAt(fromIndex)
val newLastIndex = reorderedFields.lastIndex
var insertIndex = toIndex
// Adjust target when moving forward due to index shift after removal
if (fromIndex < toIndex) insertIndex = (toIndex - 1).coerceIn(0, newLastIndex + 1)
insertIndex = insertIndex.coerceIn(0, newLastIndex + 1)
reorderedFields.add(insertIndex, item)
}
}
})
rememberReorderableLazyListState(
onMove = { from, to ->
// Use the same semantics as on the Lists screen for consistency
reorderedFields.move(from.index, to.index)
},
)
LazyColumn(
modifier =
@@ -2536,8 +2536,13 @@ fun ManageColumnsDialog(
items = reorderedFields,
key = { _, field -> field.id },
) { index, field ->
ReorderableItem(reorderState, key = field.id) { _ ->
Box(modifier = Modifier.animateItemPlacement()) {
ReorderableItem(
reorderState,
key = field.id,
) { _ ->
Box(
modifier = Modifier.animateItemPlacement(),
) {
ColumnItem(
field = field,
onEdit = { fieldToEdit = field },
@@ -2661,7 +2666,8 @@ fun ColumnItem(
dragHandle: (@Composable () -> Unit)? = null,
) {
Card(
modifier = Modifier
modifier =
Modifier
.fillMaxWidth(),
colors =
CardDefaults.cardColors(
@@ -2682,40 +2688,6 @@ fun ColumnItem(
if (dragHandle != null) {
dragHandle()
}
Row {
IconButton(
onClick = onMoveUp,
enabled = canMoveUp,
modifier = Modifier.size(32.dp),
) {
Icon(
Icons.Default.KeyboardArrowUp,
contentDescription = "Move up",
tint =
if (canMoveUp) {
MaterialTheme.colorScheme.onSurfaceVariant
} else {
MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f)
},
)
}
IconButton(
onClick = onMoveDown,
enabled = canMoveDown,
modifier = Modifier.size(32.dp),
) {
Icon(
Icons.Default.KeyboardArrowDown,
contentDescription = "Move down",
tint =
if (canMoveDown) {
MaterialTheme.colorScheme.onSurfaceVariant
} else {
MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f)
},
)
}
}
}
Spacer(modifier = Modifier.width(12.dp))
CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListsScreen.kt
+1 -1
View File
@@ -2,8 +2,8 @@
package com.collabtable.app.ui.screens
import androidx.compose.foundation.clickable
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column