Skip to content

Commit 818f9e2

Browse files
committed
Show filter count in booking filters title
Updates the title of the booking filters screen to display the number of currently active filters.
1 parent 9208b21 commit 818f9e2

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ data class BookingFilterListUiState(
6060
)
6161
}
6262

63+
val updatedBookingFiltersCount = updatedBookingFilters.enabledFiltersCount
64+
6365
@DrawableRes
6466
val navigationIcon: Int = when (currentPage) {
6567
BookingFilterPage.List -> R.drawable.ic_gridicons_cross_24dp
@@ -88,6 +90,18 @@ data class BookingFilterListUiState(
8890
BookingFilterPage.TeamMember,
8991
BookingFilterPage.List -> null
9092
}
93+
94+
val title: UiString
95+
get() = if (currentPage != BookingFilterPage.List) {
96+
UiString.UiStringRes(currentPage.titleRes)
97+
} else if (updatedBookingFiltersCount > 0) {
98+
UiString.UiStringRes(
99+
stringRes = R.string.bookings_filters_title_with_count,
100+
params = listOf(UiString.UiStringText(updatedBookingFiltersCount.toString()))
101+
)
102+
} else {
103+
UiString.UiStringRes(R.string.bookings_filters_default_title)
104+
}
91105
}
92106

93107
val BookingFilterPage.titleRes: Int

WooCommerce/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4236,7 +4236,7 @@
42364236
<string name="bookings_empty_state_clear_filters_button">Clear filters</string>
42374237
<string name="bookings_filters_default_title">Filters</string>
42384238
<string name="bookings_filters_enabled_title">Filters • %d</string>
4239-
<string name="bookings_filters_count_title">Filters (%d)</string>
4239+
<string name="bookings_filters_title_with_count">Filters (%s)</string>
42404240
<string name="bookings_filters_show_bookings">Show bookings</string>
42414241
<string name="bookings_filter_title_team_member">Assigned team member</string>
42424242
<string name="bookings_filter_title_attendance_status">Attendance status</string>

0 commit comments

Comments
 (0)