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

feat: enhance field update functionality to include alignment parameter

Browse Source
This commit is contained in:
Gabriel20xx
2026-03-15 17:44:08 +01:00
parent a8ee8477a5
commit 10815300aa
2 changed files with 12 additions and 5 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
+4 -5
View File
@@ -639,8 +639,8 @@ fun ListDetailScreen(
onAddField = { name, fieldType, fieldOptions -> onAddField = { name, fieldType, fieldOptions ->
viewModel.addField(name, fieldType, fieldOptions) viewModel.addField(name, fieldType, fieldOptions)
}, },
onUpdateField = { fieldId, name, fieldType, fieldOptions -> onUpdateField = { fieldId, name, fieldType, fieldOptions, alignment ->
viewModel.updateField(fieldId, name, fieldType, fieldOptions) viewModel.updateField(fieldId, name, fieldType, fieldOptions, alignment)
}, },
onUpdateAlignment = { fieldId, alignment -> onUpdateAlignment = { fieldId, alignment ->
viewModel.updateFieldAlignment(fieldId, alignment) viewModel.updateFieldAlignment(fieldId, alignment)
@@ -2873,7 +2873,7 @@ fun ManageColumnsDialog(
fields: List<Field>, fields: List<Field>,
onDismiss: () -> Unit, onDismiss: () -> Unit,
onAddField: (String, String, String) -> Unit, onAddField: (String, String, String) -> Unit,
onUpdateField: (String, String, String, String) -> Unit, onUpdateField: (String, String, String, String, String) -> Unit,
onUpdateAlignment: (String, String) -> Unit, onUpdateAlignment: (String, String) -> Unit,
onDeleteField: (String) -> Unit, onDeleteField: (String) -> Unit,
onReorderFields: (List<Field>) -> Unit, onReorderFields: (List<Field>) -> Unit,
@@ -3063,8 +3063,7 @@ fun ManageColumnsDialog(
field = field, field = field,
onDismiss = { fieldToEdit = null }, onDismiss = { fieldToEdit = null },
onUpdate = { name, fieldType, fieldOptions, selectedAlignment -> onUpdate = { name, fieldType, fieldOptions, selectedAlignment ->
onUpdateField(field.id, name, fieldType, fieldOptions) onUpdateField(field.id, name, fieldType, fieldOptions, selectedAlignment)
onUpdateAlignment(field.id, selectedAlignment)
fieldToEdit = null fieldToEdit = null
}, },
) )
CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt
+8
View File
@@ -224,17 +224,25 @@ class ListDetailViewModel(
name: String, name: String,
fieldType: String, fieldType: String,
fieldOptions: String, fieldOptions: String,
alignment: String,
) { ) {
viewModelScope.launch { viewModelScope.launch {
val field = database.fieldDao().getFieldById(fieldId) val field = database.fieldDao().getFieldById(fieldId)
if (field != null) { if (field != null) {
val ts = System.currentTimeMillis() val ts = System.currentTimeMillis()
val normalizedAlign =
when (alignment.lowercase()) {
"center" -> "center"
"end", "right" -> "end"
else -> "start"
}
database.withTransaction { database.withTransaction {
database.fieldDao().updateField( database.fieldDao().updateField(
field.copy( field.copy(
name = name, name = name,
fieldType = fieldType, fieldType = fieldType,
fieldOptions = fieldOptions, fieldOptions = fieldOptions,
alignment = normalizedAlign,
updatedAt = ts, updatedAt = ts,
), ),
) )