Use UiString for booking filter subtitles

Replaced the custom `BookingFilterListItemSubtitle` class with the generic `UiString` model to handle subtitle text in the bookings filter list.

Author: irfano

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

@@ -1,15 +1,14 @@
 package com.woocommerce.android.ui.bookings.filter
 
 import androidx.annotation.StringRes
+import com.woocommerce.android.model.UiString
 
 /**
  * UI model simple filter item
  */
 data class BookingFilterListItem(
     @StringRes val title: Int,
-    val subtitle: BookingFilterListItemSubtitle? = null,
+    val subtitle: UiString? = null,
     val selected: Boolean = false,
     val onClick: () -> Unit = {}
-) {
-    data class BookingFilterListItemSubtitle(val valueString: String? = null, @StringRes val valueRes: Int? = null)
-}
+)

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

@@ -3,6 +3,7 @@ package com.woocommerce.android.ui.bookings.filter
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.woocommerce.android.R
+import com.woocommerce.android.model.UiString
 import com.woocommerce.android.ui.bookings.filter.type.titleRes
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingFilters
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
@@ -48,28 +49,23 @@ data class BookingFilterListUiState(
         else -> R.drawable.ic_back_24dp
     }
 
-    val BookingFilterPage.filterValue: BookingFilterListItem.BookingFilterListItemSubtitle?
+    val BookingFilterPage.filterValue: UiString?
         get() = when (this) {
             BookingFilterPage.Customer -> {
-                BookingFilterListItem.BookingFilterListItemSubtitle(
-                    valueString = newBookingFilters.getOrDefault<BookingsFilterOption.Customer>(
-                        initialBookingFilters?.customer
-                    )?.customerName
-                )
+                newBookingFilters.getOrDefault<BookingsFilterOption.Customer>(
+                    initialBookingFilters?.customer
+                )?.customerName?.let { name -> UiString.UiStringText(name) }
             }
 
             BookingFilterPage.BookingType -> {
-                BookingFilterListItem.BookingFilterListItemSubtitle(
-                    valueRes = newBookingFilters.getOrDefault<BookingsFilterOption.BookingType>(
-                        initialBookingFilters?.bookingType
-                    )?.titleRes
-                )
+                newBookingFilters.getOrDefault<BookingsFilterOption.BookingType>(
+                    initialBookingFilters?.bookingType
+                )?.titleRes?.let { res -> UiString.UiStringRes(res) }
             }
 
             BookingFilterPage.DateTime,
             BookingFilterPage.Location,
             BookingFilterPage.AttendanceStatus,
-            BookingFilterPage.BookingType,
             BookingFilterPage.PaymentStatus,
             BookingFilterPage.ServiceEvent,
             BookingFilterPage.TeamMember,

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

@@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.compose.component.WCListItemWithInlineSubtitle
+import com.woocommerce.android.ui.compose.component.getText
 
 @Composable
 fun BookingFilterRootPage(
@@ -34,9 +35,7 @@ private fun BookingFilterListRow(item: BookingFilterListItem) {
     Column(modifier = Modifier.fillMaxWidth()) {
         WCListItemWithInlineSubtitle(
             text = stringResource(item.title),
-            subtitle = item.subtitle?.valueString
-                ?: item.subtitle?.valueRes?.let { stringResource(id = it) }
-                ?: stringResource(id = R.string.bookings_filter_default),
+            subtitle = item.subtitle?.getText() ?: stringResource(id = R.string.bookings_filter_default),
             modifier = Modifier
                 .defaultMinSize(minHeight = 64.dp)
                 .clickable { item.onClick() }