🔧 fix: #291

Signed-off-by: shub39 <cptnshubham39@gmail.com>

Author: shub39

shared/src/commonMain/kotlin/com/shub39/grit/core/habits/presentation/ui/component/HabitUpsertSheet.kt

@@ -270,7 +270,7 @@ fun HabitUpsertSheetContent(
                                         },
                                         enabled =
                                             !(newHabit.days.size == 1 &&
-                                                newHabit.days.contains(dayOfWeek)),
+                                                    newHabit.days.contains(dayOfWeek)),
                                         modifier = Modifier.weight(1f),
                                         colors = ToggleButtonDefaults.tonalToggleButtonColors(),
                                         content = { Text(text = dayOfWeek.name.take(1)) },
@@ -348,25 +348,35 @@ fun HabitUpsertSheetContent(
                     }
                 }
             }
-        }
 
-        Button(
-            onClick = {
-                onUpsertHabit(
-                    newHabit.copy(
-                        title = titleTextFieldState.text.toString(),
-                        description = descTextFieldState.text.toString(),
+            item {
+                Button(
+                    onClick = {
+                        onUpsertHabit(
+                            newHabit.copy(
+                                title = titleTextFieldState.text.toString(),
+                                description = descTextFieldState.text.toString(),
+                            )
+                        )
+                        onDismissRequest()
+                    },
+                    modifier = Modifier.padding(bottom = 32.dp).fillMaxWidth(),
+                    enabled =
+                        descTextFieldState.text.length <= 50 &&
+                                titleTextFieldState.text.length <= 20 &&
+                                titleTextFieldState.text.isNotBlank(),
+                ) {
+                    Text(
+                        text = stringResource(
+                            if (isEditSheet) {
+                                Res.string.save
+                            } else {
+                                Res.string.add_habit
+                            }
+                        )
                     )
-                )
-                onDismissRequest()
-            },
-            modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 32.dp).fillMaxWidth(),
-            enabled =
-                descTextFieldState.text.length <= 50 &&
-                    titleTextFieldState.text.length <= 20 &&
-                    titleTextFieldState.text.isNotBlank(),
-        ) {
-            Text(text = stringResource(if (isEditSheet) Res.string.save else Res.string.add_habit))
+                }
+            }
         }
 
         if (timePickerDialog) {

shared/src/commonMain/kotlin/com/shub39/grit/core/tasks/presentation/ui/component/TaskUpsertSheet.kt

@@ -247,50 +247,52 @@ fun TaskUpsertSheetContent(
                     },
                 )
             }
-        }
 
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(8.dp),
-        ) {
-            Row(
-                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 32.dp),
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                if (isEditSheet) {
-                    OutlinedButton(
-                        onClick = onDelete,
-                        shapes =
-                            ButtonShapes(
-                                shape = MaterialTheme.shapes.extraLarge,
-                                pressedShape = MaterialTheme.shapes.small,
-                            ),
-                        modifier = Modifier.weight(1f),
+            item {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Row(
+                        modifier = Modifier.padding(bottom = 32.dp),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
-                        Text(stringResource(Res.string.delete))
-                    }
-                }
+                        if (isEditSheet) {
+                            OutlinedButton(
+                                onClick = onDelete,
+                                shapes =
+                                    ButtonShapes(
+                                        shape = MaterialTheme.shapes.extraLarge,
+                                        pressedShape = MaterialTheme.shapes.small,
+                                    ),
+                                modifier = Modifier.weight(1f),
+                            ) {
+                                Text(stringResource(Res.string.delete))
+                            }
+                        }
 
-                Button(
-                    onClick = {
-                        onUpsert(newTask.copy(title = textFieldState.text.toString()))
-                        onDismissRequest()
-                    },
-                    shapes =
-                        ButtonShapes(
-                            shape = MaterialTheme.shapes.extraLarge,
-                            pressedShape = MaterialTheme.shapes.small,
-                        ),
-                    modifier = Modifier.weight(1f),
-                    enabled =
-                        textFieldState.text.isNotBlank() &&
-                            textFieldState.text.length <= 100 &&
-                            isValidDateTime &&
-                            (newTask.reminder != task.reminder ||
-                                textFieldState.text.toString() != task.title ||
-                                newTask.categoryId != task.categoryId),
-                ) {
-                    Text(stringResource(if (isEditSheet) Res.string.save else Res.string.add_task))
+                        Button(
+                            onClick = {
+                                onUpsert(newTask.copy(title = textFieldState.text.toString()))
+                                onDismissRequest()
+                            },
+                            shapes =
+                                ButtonShapes(
+                                    shape = MaterialTheme.shapes.extraLarge,
+                                    pressedShape = MaterialTheme.shapes.small,
+                                ),
+                            modifier = Modifier.weight(1f),
+                            enabled =
+                                textFieldState.text.isNotBlank() &&
+                                        textFieldState.text.length <= 100 &&
+                                        isValidDateTime &&
+                                        (newTask.reminder != task.reminder ||
+                                                textFieldState.text.toString() != task.title ||
+                                                newTask.categoryId != task.categoryId),
+                        ) {
+                            Text(stringResource(if (isEditSheet) Res.string.save else Res.string.add_task))
+                        }
+                    }
                 }
             }
         }