Apply date changes when dismissing bottom sheet

pull/3441/head
Alex Baker 9 months ago
parent 41f2f51c37
commit c24d1da566

@ -29,7 +29,6 @@ import androidx.compose.material3.SheetState
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@ -42,7 +41,7 @@ import org.tasks.R
fun DatePickerBottomSheet(
sheetState: SheetState,
showButtons: Boolean,
dismiss: () -> Unit,
cancel: () -> Unit,
accept: () -> Unit,
setDisplayMode: (DisplayMode) -> Unit,
dateShortcuts: @Composable ColumnScope.() -> Unit,
@ -52,7 +51,7 @@ fun DatePickerBottomSheet(
ModalBottomSheet(
modifier = Modifier.statusBarsPadding(),
sheetState = sheetState,
onDismissRequest = { dismiss() },
onDismissRequest = { accept() },
containerColor = MaterialTheme.colorScheme.surface,
) {
Box(
@ -116,7 +115,7 @@ fun DatePickerBottomSheet(
}
Spacer(modifier = Modifier.weight(1f))
TextButton(
onClick = { dismiss() }
onClick = { cancel() }
) {
Text(stringResource(R.string.cancel))
}

@ -154,7 +154,7 @@ class DateTimePicker : BaseDateTimePicker() {
},
setDateDisplayMode = { preferences.calendarDisplayMode = it },
setTimeDisplayMode = { preferences.timeDisplayMode = it },
dismiss = { onDismissHandler?.onDismiss() ?: dismiss() },
cancel = { onDismissHandler?.onDismiss() ?: dismiss() },
accept = { sendSelected() },
setDateTime = { day, time -> returnDate(day, time) },
setTime = { returnSelectedTime(it) },
@ -282,7 +282,7 @@ fun DueDatePicker(
showNoDate: Boolean,
setDateDisplayMode: (DisplayMode) -> Unit,
setTimeDisplayMode: (DisplayMode) -> Unit,
dismiss: () -> Unit,
cancel: () -> Unit,
accept: () -> Unit,
setDateTime: (Long, Int) -> Unit,
setTime: (Int) -> Unit,
@ -292,7 +292,7 @@ fun DueDatePicker(
state = datePickerState,
showButtons = showButtons,
setDisplayMode = setDateDisplayMode,
dismiss = dismiss,
cancel = cancel,
accept = accept,
dateShortcuts = {
DueDateShortcuts(
@ -393,7 +393,7 @@ fun DueDatePickerPreview() {
showNoDate = true,
setDateDisplayMode = {},
setTimeDisplayMode = {},
dismiss = {},
cancel = {},
accept = {},
setDateTime = { _, _ -> },
setTime = {},

@ -95,7 +95,7 @@ class StartDatePicker : BaseDateTimePicker() {
state = state,
showButtons = !autoclose,
setDisplayMode = { preferences.calendarDisplayMode = it },
dismiss = { onDismissHandler?.onDismiss() ?: dismiss() },
cancel = { onDismissHandler?.onDismiss() ?: dismiss() },
accept = { sendSelected() },
dateShortcuts = {
StartDateShortcuts(

Loading…
Cancel
Save