diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt index 688c08162c..e496336742 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersState.kt @@ -24,5 +24,5 @@ data class RoomListFiltersState( val isFeatureEnabled: Boolean, val eventSink: (RoomListFiltersEvents) -> Unit, ) { - val showClearFilterButton = selectedFilters.isNotEmpty() + val hasAnyFilterSelected = selectedFilters.isNotEmpty() } diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt index ae5b6145e1..4d3e1811af 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt @@ -64,12 +64,12 @@ fun RoomListFiltersView( state.eventSink(RoomListFiltersEvents.ToggleFilter(filter)) } - val startPadding = if (state.showClearFilterButton) 4.dp else 16.dp + val startPadding = if (state.hasAnyFilterSelected) 4.dp else 16.dp Row( modifier = modifier.padding(start = startPadding, end = 16.dp), verticalAlignment = Alignment.CenterVertically, ) { - AnimatedVisibility(visible = state.showClearFilterButton) { + AnimatedVisibility(visible = state.hasAnyFilterSelected) { RoomListClearFiltersButton(onClick = ::onClearFiltersClicked) } val lazyListState = rememberLazyListState() diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTests.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTests.kt index 8bdb10c4b2..995c02762a 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTests.kt +++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersPresenterTests.kt @@ -38,7 +38,7 @@ class RoomListFiltersPresenterTests { }.test { awaitItem().let { state -> assertThat(state.selectedFilters).isEmpty() - assertThat(state.showClearFilterButton).isFalse() + assertThat(state.hasAnyFilterSelected).isFalse() assertThat(state.unselectedFilters).containsExactly( RoomListFilter.Rooms, RoomListFilter.People, @@ -62,7 +62,7 @@ class RoomListFiltersPresenterTests { awaitLastSequentialItem().let { state -> assertThat(state.selectedFilters).containsExactly(RoomListFilter.Rooms) - assertThat(state.showClearFilterButton).isTrue() + assertThat(state.hasAnyFilterSelected).isTrue() assertThat(state.unselectedFilters).containsExactly( RoomListFilter.Unread, RoomListFilter.Favourites, @@ -78,7 +78,7 @@ class RoomListFiltersPresenterTests { awaitLastSequentialItem().let { state -> assertThat(state.selectedFilters).isEmpty() - assertThat(state.showClearFilterButton).isFalse() + assertThat(state.hasAnyFilterSelected).isFalse() assertThat(state.unselectedFilters).containsExactly( RoomListFilter.Rooms, RoomListFilter.People, @@ -103,12 +103,12 @@ class RoomListFiltersPresenterTests { awaitItem().eventSink.invoke(RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms)) awaitLastSequentialItem().let { state -> assertThat(state.selectedFilters).isNotEmpty() - assertThat(state.showClearFilterButton).isTrue() + assertThat(state.hasAnyFilterSelected).isTrue() state.eventSink.invoke(RoomListFiltersEvents.ClearSelectedFilters) } awaitLastSequentialItem().let { state -> assertThat(state.selectedFilters).isEmpty() - assertThat(state.showClearFilterButton).isFalse() + assertThat(state.hasAnyFilterSelected).isFalse() } } }