File tree Expand file tree Collapse file tree 2 files changed +15
-19
lines changed
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter Expand file tree Collapse file tree 2 files changed +15
-19
lines changed Original file line number Diff line number Diff line change @@ -45,6 +45,21 @@ data class BookingFilterListUiState(
4545 initialBookingFilters?.bookingType
4646 ) ? : BookingsFilterOption .BookingType (BookingsFilterOption .BookingType .Type .ANY )
4747
48+ val updatedBookingFilters: BookingFilters
49+ get() {
50+ val initial = initialBookingFilters ? : BookingFilters ()
51+ return BookingFilters (
52+ dateRange = newBookingFilters.getOrDefault(initial.dateRange),
53+ customer = newBookingFilters.getOrDefault(initial.customer),
54+ teamMember = newBookingFilters.getOrDefault(initial.teamMember),
55+ attendanceStatus = newBookingFilters.getOrDefault(initial.attendanceStatus),
56+ paymentStatus = newBookingFilters.getOrDefault(initial.paymentStatus),
57+ bookingType = newBookingFilters.getOrDefault(initial.bookingType),
58+ location = newBookingFilters.getOrDefault(initial.location),
59+ serviceEvent = newBookingFilters.getOrDefault(initial.serviceEvent),
60+ )
61+ }
62+
4863 @DrawableRes
4964 val navigationIcon: Int = when (currentPage) {
5065 BookingFilterPage .List -> R .drawable.ic_gridicons_cross_24dp
Original file line number Diff line number Diff line change @@ -114,22 +114,3 @@ class BookingFilterListViewModel @Inject constructor(
114114 return updated != initial
115115 }
116116}
117-
118- private val BookingFilterListUiState .updatedBookingFilters: BookingFilters
119- get() {
120- val initial = initialBookingFilters ? : BookingFilters ()
121- val updates = this @updatedBookingFilters.newBookingFilters
122-
123- return BookingFilters (
124- dateRange = updates.getOrDefault(initial.dateRange),
125- customer = updates.getOrDefault(initial.customer),
126- teamMember = updates.getOrDefault(
127- initial.teamMember
128- ),
129- attendanceStatus = updates.getOrDefault(initial.attendanceStatus),
130- paymentStatus = updates.getOrDefault(initial.paymentStatus),
131- bookingType = updates.getOrDefault(initial.bookingType),
132- location = updates.getOrDefault(initial.location),
133- serviceEvent = updates.getOrDefault(initial.serviceEvent),
134- )
135- }
You can’t perform that action at this time.
0 commit comments