[WOOMOB-1511] - Booking details cancel flow #14752
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,7 +70,11 @@ private fun BookingAttendanceStatusSelection( | |
| color = MaterialTheme.colorScheme.onSurfaceVariant, | ||
| modifier = Modifier.padding(bottom = 22.dp) | ||
| ) | ||
| listOf( | ||
| BookingAttendanceStatus.BOOKED, | ||
| BookingAttendanceStatus.CHECKED_IN, | ||
| BookingAttendanceStatus.NO_SHOW, | ||
| ).forEachIndexed { index, status -> | ||
| AttendanceStatusRow( | ||
| status = status, | ||
| onClick = { onSelect(status) } | ||
|
|
@@ -92,12 +96,14 @@ private fun AttendanceStatusRow( | |
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.spacedBy(16.dp) | ||
| ) { | ||
| status.iconRes?.let { iconRes -> | ||
| Icon( | ||
| painter = painterResource(iconRes), | ||
| contentDescription = status.text(), | ||
| tint = MaterialTheme.colorScheme.onSurfaceVariant, | ||
| modifier = Modifier.size(24.dp) | ||
| ) | ||
| } | ||
|
Comment on lines
+99
to
+106
There was a problem hiding this comment. [nitpick] The nullable icon handling suggests that some attendance statuses may not have icons. Consider adding a consistent icon for all statuses or documenting why certain statuses lack visual representation. |
||
| Column(modifier = Modifier.weight(1f)) { | ||
| Text( | ||
| text = status.text(), | ||
|
|
@@ -118,16 +124,16 @@ private fun AttendanceStatusRow( | |
| private fun BookingAttendanceStatus.description(): String = when (this) { | ||
| BookingAttendanceStatus.BOOKED -> R.string.booking_attendance_status_booked_desc | ||
| BookingAttendanceStatus.CHECKED_IN -> R.string.booking_attendance_status_checked_in_desc | ||
| BookingAttendanceStatus.NO_SHOW -> R.string.booking_attendance_status_no_show_desc | ||
| else -> null | ||
| }?.let { stringResource(it) } ?: "" | ||
|
|
||
| private val BookingAttendanceStatus.iconRes: Int? | ||
| get() = when (this) { | ||
| BookingAttendanceStatus.BOOKED -> R.drawable.ic_attendance_booked | ||
| BookingAttendanceStatus.CHECKED_IN -> R.drawable.ic_attendance_checked_in | ||
| BookingAttendanceStatus.NO_SHOW -> R.drawable.ic_attendance_no_show | ||
| else -> null | ||
| } | ||
|
|
||
| @LightDarkThemePreviews | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.woocommerce.android.ui.bookings.compose | ||
|
|
||
| import androidx.compose.material3.ButtonDefaults | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextButton | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.res.stringResource | ||
| import com.woocommerce.android.R | ||
| import com.woocommerce.android.ui.compose.component.AlertDialog | ||
|
|
||
| @Composable | ||
| fun CancelBookingDialog( | ||
| message: String, | ||
| onDismiss: () -> Unit, | ||
| onConfirmCancel: () -> Unit, | ||
| ) { | ||
| AlertDialog( | ||
| onDismissRequest = onDismiss, | ||
| title = { | ||
| Text( | ||
| text = stringResource(id = R.string.booking_cancel_dialog_title), | ||
| style = MaterialTheme.typography.titleLarge | ||
| ) | ||
| }, | ||
| text = { Text(text = message) }, | ||
| confirmButton = { | ||
| TextButton( | ||
| onClick = onConfirmCancel, | ||
| colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.error), | ||
| ) { | ||
| Text(text = stringResource(id = R.string.booking_cancel_dialog_confirm)) | ||
| } | ||
| }, | ||
| dismissButton = { | ||
| TextButton( | ||
| onClick = onDismiss, | ||
| colors = ButtonDefaults.textButtonColors(contentColor = MaterialTheme.colorScheme.onSurface), | ||
| ) { | ||
| Text(text = stringResource(id = R.string.booking_cancel_dialog_keep)) | ||
| } | ||
| }, | ||
| neutralButton = { } | ||
| ) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,10 @@ data class BookingDetailsViewState( | |
| val loadingState: BookingDetailsLoadingState = BookingDetailsLoadingState.Idle, | ||
| val onCancelBooking: () -> Unit = {}, | ||
| val onAttendanceStatusSelected: (BookingAttendanceStatus) -> Unit = { _ -> }, | ||
| val showCancelBookingDialog: Boolean = false, | ||
| val cancelDialogMessage: String = "", | ||
| val onDismissCancelDialog: () -> Unit = {}, | ||
| val onConfirmCancelBooking: () -> Unit = {}, | ||
|
||
| val onRefresh: () -> Unit = {}, | ||
| ) { | ||
| val shouldShowSkeleton: Boolean = bookingUiState == null && loadingState == BookingDetailsLoadingState.Refreshing | ||
|
|
@@ -30,3 +34,8 @@ data class BookingUiState( | |
| val bookingCustomerDetails: BookingCustomerDetailsModel, | ||
| val bookingPaymentDetails: BookingPaymentDetailsModel?, | ||
| ) | ||
|
|
||
| sealed interface CancelState { | ||
| data object Idle : CancelState | ||
| data object InProgress : CancelState | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor remark, WDYT about updating
WCOutlinedButtonto accept aloadingparameter like what we do withWCColoredButtonhere, and move this logic to the component.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you do, please also make sure to update
WCColoredButton's implementation to passenabled = enabled && !loading, to make sure we disable button during loading.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you don't mind, I would prefer to open a separate PR with it just to isolate the change that goes beyond Booking Details screen.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR is here #14768