Skip to content

Commit fc1ae2f

Browse files
Move onCancelBooking to BookingDetailsViewState
1 parent b4e310b commit fc1ae2f

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsScreen.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ fun BookingDetailsScreen(
4646
BookingDetailsScreen(
4747
viewState = it,
4848
onBack = onBack,
49-
onCancelBooking = viewModel::onCancelBooking,
5049
onAttendanceStatusSelected = viewModel::onAttendanceStatusSelected,
5150
onViewOrder = onViewOrder,
5251
)
@@ -57,7 +56,6 @@ fun BookingDetailsScreen(
5756
fun BookingDetailsScreen(
5857
viewState: BookingDetailsViewState,
5958
onBack: () -> Unit,
60-
onCancelBooking: () -> Unit,
6159
onAttendanceStatusSelected: (AttendanceStatus) -> Unit,
6260
onViewOrder: (Long) -> Unit,
6361
) {
@@ -86,7 +84,7 @@ fun BookingDetailsScreen(
8684
)
8785
BookingAppointmentDetails(
8886
model = viewState.bookingsAppointmentDetails,
89-
onCancelBooking = onCancelBooking,
87+
onCancelBooking = viewState.onCancelBooking,
9088
modifier = Modifier.fillMaxWidth()
9189
)
9290
BookingCustomerDetails(
@@ -145,7 +143,6 @@ private fun BookingDetailsPreview() {
145143
)
146144
),
147145
onBack = {},
148-
onCancelBooking = {},
149146
onAttendanceStatusSelected = {},
150147
onViewOrder = {}
151148
)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class BookingDetailsViewModel @Inject constructor(
2626
BookingDetailsViewState(
2727
onMarkAsPaid = ::onMarkAsPaid,
2828
onMarkAsRefunded = ::onMarkAsRefunded,
29+
onCancelBooking = ::onCancelBooking,
2930
)
3031
)
3132
val state: LiveData<BookingDetailsViewState> = _state.asLiveData()
@@ -62,7 +63,7 @@ class BookingDetailsViewModel @Inject constructor(
6263
}
6364
}
6465

65-
fun onCancelBooking() {
66+
private fun onCancelBooking() {
6667
// TODO Add logic to Cancel booking
6768
}
6869
}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/details/BookingDetailsViewState.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ data class BookingDetailsViewState(
4343
),
4444
val onMarkAsPaid: () -> Unit = {},
4545
val onMarkAsRefunded: () -> Unit = {},
46+
val onCancelBooking: () -> Unit = {},
4647
)

0 commit comments

Comments
 (0)