diff --git a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailScreen.kt b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailScreen.kt index 3d7aefe..75d2036 100644 --- a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailScreen.kt +++ b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailScreen.kt @@ -639,8 +639,8 @@ fun ListDetailScreen( onAddField = { name, fieldType, fieldOptions -> viewModel.addField(name, fieldType, fieldOptions) }, - onUpdateField = { fieldId, name, fieldType, fieldOptions -> - viewModel.updateField(fieldId, name, fieldType, fieldOptions) + onUpdateField = { fieldId, name, fieldType, fieldOptions, alignment -> + viewModel.updateField(fieldId, name, fieldType, fieldOptions, alignment) }, onUpdateAlignment = { fieldId, alignment -> viewModel.updateFieldAlignment(fieldId, alignment) @@ -2873,7 +2873,7 @@ fun ManageColumnsDialog( fields: List, onDismiss: () -> Unit, onAddField: (String, String, String) -> Unit, - onUpdateField: (String, String, String, String) -> Unit, + onUpdateField: (String, String, String, String, String) -> Unit, onUpdateAlignment: (String, String) -> Unit, onDeleteField: (String) -> Unit, onReorderFields: (List) -> Unit, @@ -3063,8 +3063,7 @@ fun ManageColumnsDialog( field = field, onDismiss = { fieldToEdit = null }, onUpdate = { name, fieldType, fieldOptions, selectedAlignment -> - onUpdateField(field.id, name, fieldType, fieldOptions) - onUpdateAlignment(field.id, selectedAlignment) + onUpdateField(field.id, name, fieldType, fieldOptions, selectedAlignment) fieldToEdit = null }, ) diff --git a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt index 0056de9..2a26212 100644 --- a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt +++ b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/ListDetailViewModel.kt @@ -224,17 +224,25 @@ class ListDetailViewModel( name: String, fieldType: String, fieldOptions: String, + alignment: String, ) { viewModelScope.launch { val field = database.fieldDao().getFieldById(fieldId) if (field != null) { val ts = System.currentTimeMillis() + val normalizedAlign = + when (alignment.lowercase()) { + "center" -> "center" + "end", "right" -> "end" + else -> "start" + } database.withTransaction { database.fieldDao().updateField( field.copy( name = name, fieldType = fieldType, fieldOptions = fieldOptions, + alignment = normalizedAlign, updatedAt = ts, ), )