From 5eccea5ada17a4f7a28d82d2c8517a9b31ea39c2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jan 2026 15:01:57 +0100 Subject: [PATCH] RoomListFiltersEvents -> RoomListFiltersEvent --- .../{RoomListFiltersEvents.kt => RoomListFiltersEvent.kt} | 6 +++--- .../home/impl/filters/RoomListFiltersPresenter.kt | 6 +++--- .../features/home/impl/filters/RoomListFiltersState.kt | 2 +- .../home/impl/filters/RoomListFiltersStateProvider.kt | 2 +- .../features/home/impl/filters/RoomListFiltersView.kt | 4 ++-- .../home/impl/filters/RoomListFiltersPresenterTest.kt | 8 ++++---- .../features/home/impl/filters/RoomListFiltersViewTest.kt | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) rename features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/{RoomListFiltersEvents.kt => RoomListFiltersEvent.kt} (75%) diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvent.kt similarity index 75% rename from features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvent.kt index 8b1906d28f..a34e91e089 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvents.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersEvent.kt @@ -8,7 +8,7 @@ package io.element.android.features.home.impl.filters -sealed interface RoomListFiltersEvents { - data class ToggleFilter(val filter: RoomListFilter) : RoomListFiltersEvents - data object ClearSelectedFilters : RoomListFiltersEvents +sealed interface RoomListFiltersEvent { + data class ToggleFilter(val filter: RoomListFilter) : RoomListFiltersEvent + data object ClearSelectedFilters : RoomListFiltersEvent } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt index 4b20c69751..bda6bee6bd 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenter.kt @@ -28,12 +28,12 @@ class RoomListFiltersPresenter( @Composable override fun present(): RoomListFiltersState { - fun handleEvent(event: RoomListFiltersEvents) { + fun handleEvent(event: RoomListFiltersEvent) { when (event) { - RoomListFiltersEvents.ClearSelectedFilters -> { + RoomListFiltersEvent.ClearSelectedFilters -> { filterSelectionStrategy.clear() } - is RoomListFiltersEvents.ToggleFilter -> { + is RoomListFiltersEvent.ToggleFilter -> { filterSelectionStrategy.toggle(event.filter) } } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt index 104a99cfbd..50cd0decd6 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersState.kt @@ -14,7 +14,7 @@ import kotlinx.collections.immutable.toImmutableList data class RoomListFiltersState( val filterSelectionStates: ImmutableList, - val eventSink: (RoomListFiltersEvents) -> Unit, + val eventSink: (RoomListFiltersEvent) -> Unit, ) { val hasAnyFilterSelected = filterSelectionStates.any { it.isSelected } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt index 7d73727484..7e095512fe 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersStateProvider.kt @@ -24,7 +24,7 @@ class RoomListFiltersStateProvider : PreviewParameterProvider = RoomListFilter.entries.map { FilterSelectionState(it, isSelected = false) }, - eventSink: (RoomListFiltersEvents) -> Unit = {}, + eventSink: (RoomListFiltersEvent) -> Unit = {}, ) = RoomListFiltersState( filterSelectionStates = filterSelectionStates.toImmutableList(), eventSink = eventSink, diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt index 588da6b9db..9931a98c4e 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersView.kt @@ -60,11 +60,11 @@ fun RoomListFiltersView( modifier: Modifier = Modifier ) { fun onClearFiltersClick() { - state.eventSink(RoomListFiltersEvents.ClearSelectedFilters) + state.eventSink(RoomListFiltersEvent.ClearSelectedFilters) } fun onToggleFilter(filter: RoomListFilter) { - state.eventSink(RoomListFiltersEvents.ToggleFilter(filter)) + state.eventSink(RoomListFiltersEvent.ToggleFilter(filter)) } var scrollToStart by remember { mutableIntStateOf(0) } diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt index df1bc18107..6d345565f6 100644 --- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersPresenterTest.kt @@ -49,7 +49,7 @@ class RoomListFiltersPresenterTest { moleculeFlow(RecompositionMode.Immediate) { presenter.present() }.test { - awaitItem().eventSink.invoke(RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms)) + awaitItem().eventSink.invoke(RoomListFiltersEvent.ToggleFilter(RoomListFilter.Rooms)) awaitLastSequentialItem().let { state -> assertThat(state.hasAnyFilterSelected).isTrue() @@ -66,7 +66,7 @@ class RoomListFiltersPresenterTest { assertThat(roomListCurrentFilter.filters).containsExactly( MatrixRoomListFilter.Category.Group, ) - state.eventSink.invoke(RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms)) + state.eventSink.invoke(RoomListFiltersEvent.ToggleFilter(RoomListFilter.Rooms)) } awaitLastSequentialItem().let { state -> assertThat(state.hasAnyFilterSelected).isFalse() @@ -91,10 +91,10 @@ class RoomListFiltersPresenterTest { moleculeFlow(RecompositionMode.Immediate) { presenter.present() }.test { - awaitItem().eventSink.invoke(RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms)) + awaitItem().eventSink.invoke(RoomListFiltersEvent.ToggleFilter(RoomListFilter.Rooms)) awaitLastSequentialItem().let { state -> assertThat(state.hasAnyFilterSelected).isTrue() - state.eventSink.invoke(RoomListFiltersEvents.ClearSelectedFilters) + state.eventSink.invoke(RoomListFiltersEvent.ClearSelectedFilters) } awaitLastSequentialItem().let { state -> assertThat(state.hasAnyFilterSelected).isFalse() diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt index 9e99220885..4c361b47f3 100644 --- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/filters/RoomListFiltersViewTest.kt @@ -27,7 +27,7 @@ class RoomListFiltersViewTest { @Test fun `clicking on filters generates expected Event`() { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() rule.setContent { RoomListFiltersView( state = aRoomListFiltersState(eventSink = eventsRecorder), @@ -36,14 +36,14 @@ class RoomListFiltersViewTest { rule.clickOn(R.string.screen_roomlist_filter_rooms) eventsRecorder.assertList( listOf( - RoomListFiltersEvents.ToggleFilter(RoomListFilter.Rooms), + RoomListFiltersEvent.ToggleFilter(RoomListFilter.Rooms), ) ) } @Test fun `clicking on clear filters generates expected Event`() { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() rule.setContent { RoomListFiltersView( state = aRoomListFiltersState( @@ -55,7 +55,7 @@ class RoomListFiltersViewTest { rule.pressTag(TestTags.homeScreenClearFilters.value) eventsRecorder.assertList( listOf( - RoomListFiltersEvents.ClearSelectedFilters, + RoomListFiltersEvent.ClearSelectedFilters, ) ) }