Update booking type filter selection

Author: irfano

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListScreen.kt

@@ -28,8 +28,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.woocommerce.android.R
-import com.woocommerce.android.ui.bookings.filter.type.BookingTypeFilterPage
-import com.woocommerce.android.ui.bookings.filter.type.DUMMY_BOOKING_TYPE_FILTER_UI_STATE
+import com.woocommerce.android.ui.bookings.filter.type.BookingTypeFilterRoute
 import com.woocommerce.android.ui.compose.component.Toolbar
 import com.woocommerce.android.ui.compose.component.WCColoredButton
 import com.woocommerce.android.ui.compose.preview.LightDarkThemePreviews
@@ -124,7 +123,9 @@ private fun FiltersNavHost(
             TODO()
         }
         composable(BookingFilterPage.BookingType.route) {
-            BookingTypeFilterPage(DUMMY_BOOKING_TYPE_FILTER_UI_STATE)
+            BookingTypeFilterRoute(initialType = state.currentBookingType) { type ->
+                state.onUpdateFilterOption(type)
+            }
         }
         composable(BookingFilterPage.Customer.route) {
             TODO()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListUiState.kt

@@ -25,6 +25,7 @@ data class BookingFilterListUiState(
     val onClose: () -> Unit = {},
     val onShowBookings: () -> Unit = {},
     val openPage: (BookingFilterPage) -> Unit = {},
+    val onUpdateFilterOption: (BookingsFilterOption) -> Unit = {}
 ) {
 
     val items: List<BookingFilterListItem> = availableBookingFilters().map { page ->
@@ -35,6 +36,11 @@ data class BookingFilterListUiState(
         )
     }
 
+    val currentBookingType: BookingsFilterOption.BookingType
+        get() = newBookingFilters.getOrDefault<BookingsFilterOption.BookingType>(
+            initialBookingFilters?.bookingType
+        ) ?: BookingsFilterOption.BookingType.Any
+
     @DrawableRes
     val navigationIcon: Int = when (currentPage) {
         BookingFilterPage.List -> R.drawable.ic_gridicons_cross_24dp

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListViewModel.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingFilters
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
 import javax.inject.Inject
 
 @HiltViewModel
@@ -24,6 +25,7 @@ class BookingFilterListViewModel @Inject constructor(
             onClose = ::onClose,
             onShowBookings = ::onShowBookings,
             openPage = ::onOpenPage,
+            onUpdateFilterOption = ::onUpdateFilterOption,
         )
     )
     val uiState = _uiState.asLiveData()
@@ -38,6 +40,22 @@ class BookingFilterListViewModel @Inject constructor(
         }
     }
 
+    private fun onUpdateFilterOption(option: BookingsFilterOption) {
+        _uiState.update { current ->
+            val filtered = when (option) {
+                is BookingsFilterOption.BookingType -> current.newBookingFilters
+                    .filterNot { it is BookingsFilterOption.BookingType }
+                else -> current.newBookingFilters
+                    .filterNot { it::class == option::class }
+            }
+            current.copy(
+                newBookingFilters = filtered
+                    .plus(option)
+                    .toSet()
+            )
+        }
+    }
+
     private fun getBookingFilter() {
         launch {
             // We don't observe changes here, just get the current value once

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/type/BookingTypeFilterUiState.kt

@@ -38,9 +38,3 @@ val BookingType.filterValue: String?
         BookingType.Event -> "event"
         BookingType.Any -> null
     }
-
-// TODO After refactoring navigation for the filter screens, replace this with a ViewModel-backed UI state.
-val DUMMY_BOOKING_TYPE_FILTER_UI_STATE = BookingTypeFilterUiState(
-    selectedType = BookingFilterType.Any,
-    onTypeSelected = {}
-)