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

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

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

Loading…
Cancel
Save