Skip to content

Commit 4a856cc

Browse files
Merge pull request #14709 from woocommerce/issue/WOOMOB-1237-booking-list-filter-button-visibility
[Booings] Show filter button only for All tab
2 parents f5681d1 + 0caa5ad commit 4a856cc

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/list/BookingListScreen.kt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -268,18 +268,20 @@ private fun BookingListControls(
268268
tint = MaterialTheme.colorScheme.onSurfaceVariant
269269
)
270270
}
271-
OutlinedButton(
272-
modifier = Modifier.defaultMinSize(minWidth = 88.dp, minHeight = 36.dp),
273-
contentPadding = PaddingValues(horizontal = 16.dp),
274-
colors = ButtonDefaults.outlinedButtonColors().copy(
275-
contentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
276-
),
277-
onClick = state.onFilterClick,
278-
) {
279-
Text(
280-
text = stringResource(R.string.bookings_filters_default_title),
281-
style = MaterialTheme.typography.bodyMedium,
282-
)
271+
if (state.isFilterButtonVisible) {
272+
OutlinedButton(
273+
modifier = Modifier.defaultMinSize(minWidth = 88.dp, minHeight = 36.dp),
274+
contentPadding = PaddingValues(horizontal = 16.dp),
275+
colors = ButtonDefaults.outlinedButtonColors().copy(
276+
contentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
277+
),
278+
onClick = state.onFilterClick,
279+
) {
280+
Text(
281+
text = stringResource(R.string.bookings_filters_default_title),
282+
style = MaterialTheme.typography.bodyMedium,
283+
)
284+
}
283285
}
284286
}
285287
}
@@ -321,6 +323,7 @@ private fun BookingListPreview() {
321323
),
322324
controlsState = BookingListControlsState(
323325
selectedSortOption = BookingListSortOption.NewestToOldest,
326+
isFilterButtonVisible = true,
324327
onSortClick = {},
325328
onFilterClick = {}
326329
),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/list/BookingListViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class BookingListViewModel @Inject constructor(
8585
),
8686
controlsState = BookingListControlsState(
8787
selectedSortOption = sortOption,
88+
isFilterButtonVisible = selectedTab == BookingListTab.All,
8889
onSortClick = ::onSortClicked,
8990
onFilterClick = ::onFilterClicked
9091
),

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/list/BookingListViewState.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ data class BookingListTabState(
3939

4040
data class BookingListControlsState(
4141
val selectedSortOption: BookingListSortOption,
42+
val isFilterButtonVisible: Boolean,
4243
val onSortClick: () -> Unit,
4344
val onFilterClick: () -> Unit
4445
)

0 commit comments

Comments
 (0)