mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
RoomListFilters : rename empty
This commit is contained in:
+1
-1
@@ -24,5 +24,5 @@ data class RoomListFiltersState(
|
|||||||
val isFeatureEnabled: Boolean,
|
val isFeatureEnabled: Boolean,
|
||||||
val eventSink: (RoomListFiltersEvents) -> Unit,
|
val eventSink: (RoomListFiltersEvents) -> Unit,
|
||||||
) {
|
) {
|
||||||
val showClearFilterButton = selectedFilters.isNotEmpty()
|
val hasAnyFilterSelected = selectedFilters.isNotEmpty()
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -64,12 +64,12 @@ fun RoomListFiltersView(
|
|||||||
state.eventSink(RoomListFiltersEvents.ToggleFilter(filter))
|
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(
|
Row(
|
||||||
modifier = modifier.padding(start = startPadding, end = 16.dp),
|
modifier = modifier.padding(start = startPadding, end = 16.dp),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
AnimatedVisibility(visible = state.showClearFilterButton) {
|
AnimatedVisibility(visible = state.hasAnyFilterSelected) {
|
||||||
RoomListClearFiltersButton(onClick = ::onClearFiltersClicked)
|
RoomListClearFiltersButton(onClick = ::onClearFiltersClicked)
|
||||||
}
|
}
|
||||||
val lazyListState = rememberLazyListState()
|
val lazyListState = rememberLazyListState()
|
||||||
|
|||||||
+5
-5
@@ -38,7 +38,7 @@ class RoomListFiltersPresenterTests {
|
|||||||
}.test {
|
}.test {
|
||||||
awaitItem().let { state ->
|
awaitItem().let { state ->
|
||||||
assertThat(state.selectedFilters).isEmpty()
|
assertThat(state.selectedFilters).isEmpty()
|
||||||
assertThat(state.showClearFilterButton).isFalse()
|
assertThat(state.hasAnyFilterSelected).isFalse()
|
||||||
assertThat(state.unselectedFilters).containsExactly(
|
assertThat(state.unselectedFilters).containsExactly(
|
||||||
RoomListFilter.Rooms,
|
RoomListFilter.Rooms,
|
||||||
RoomListFilter.People,
|
RoomListFilter.People,
|
||||||
@@ -62,7 +62,7 @@ class RoomListFiltersPresenterTests {
|
|||||||
awaitLastSequentialItem().let { state ->
|
awaitLastSequentialItem().let { state ->
|
||||||
|
|
||||||
assertThat(state.selectedFilters).containsExactly(RoomListFilter.Rooms)
|
assertThat(state.selectedFilters).containsExactly(RoomListFilter.Rooms)
|
||||||
assertThat(state.showClearFilterButton).isTrue()
|
assertThat(state.hasAnyFilterSelected).isTrue()
|
||||||
assertThat(state.unselectedFilters).containsExactly(
|
assertThat(state.unselectedFilters).containsExactly(
|
||||||
RoomListFilter.Unread,
|
RoomListFilter.Unread,
|
||||||
RoomListFilter.Favourites,
|
RoomListFilter.Favourites,
|
||||||
@@ -78,7 +78,7 @@ class RoomListFiltersPresenterTests {
|
|||||||
|
|
||||||
awaitLastSequentialItem().let { state ->
|
awaitLastSequentialItem().let { state ->
|
||||||
assertThat(state.selectedFilters).isEmpty()
|
assertThat(state.selectedFilters).isEmpty()
|
||||||
assertThat(state.showClearFilterButton).isFalse()
|
assertThat(state.hasAnyFilterSelected).isFalse()
|
||||||
assertThat(state.unselectedFilters).containsExactly(
|
assertThat(state.unselectedFilters).containsExactly(
|
||||||
RoomListFilter.Rooms,
|
RoomListFilter.Rooms,
|
||||||
RoomListFilter.People,
|
RoomListFilter.People,
|
||||||
@@ -103,12 +103,12 @@ class RoomListFiltersPresenterTests {
|
|||||||
awaitItem().eventSink.invoke(RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms))
|
awaitItem().eventSink.invoke(RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms))
|
||||||
awaitLastSequentialItem().let { state ->
|
awaitLastSequentialItem().let { state ->
|
||||||
assertThat(state.selectedFilters).isNotEmpty()
|
assertThat(state.selectedFilters).isNotEmpty()
|
||||||
assertThat(state.showClearFilterButton).isTrue()
|
assertThat(state.hasAnyFilterSelected).isTrue()
|
||||||
state.eventSink.invoke(RoomListFiltersEvents.ClearSelectedFilters)
|
state.eventSink.invoke(RoomListFiltersEvents.ClearSelectedFilters)
|
||||||
}
|
}
|
||||||
awaitLastSequentialItem().let { state ->
|
awaitLastSequentialItem().let { state ->
|
||||||
assertThat(state.selectedFilters).isEmpty()
|
assertThat(state.selectedFilters).isEmpty()
|
||||||
assertThat(state.showClearFilterButton).isFalse()
|
assertThat(state.hasAnyFilterSelected).isFalse()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user