From 6cebe2d9484a475ec4ef6e8803bfa76da33ca0be Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jan 2026 15:04:39 +0100 Subject: [PATCH] RoomListSearchEvents -> RoomListSearchEvent --- .../features/home/impl/roomlist/RoomListPresenter.kt | 4 ++-- ...{RoomListSearchEvents.kt => RoomListSearchEvent.kt} | 6 +++--- .../home/impl/search/RoomListSearchPresenter.kt | 6 +++--- .../features/home/impl/search/RoomListSearchState.kt | 2 +- .../home/impl/search/RoomListSearchStateProvider.kt | 2 +- .../features/home/impl/search/RoomListSearchView.kt | 6 +++--- .../home/impl/roomlist/RoomListPresenterTest.kt | 10 +++++----- .../home/impl/search/RoomListSearchPresenterTest.kt | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) rename features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/{RoomListSearchEvents.kt => RoomListSearchEvent.kt} (66%) diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt index a5e68ab3cf..1c11390a86 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt @@ -29,7 +29,7 @@ import io.element.android.features.announcement.api.Announcement import io.element.android.features.announcement.api.AnnouncementService import io.element.android.features.home.impl.datasource.RoomListDataSource import io.element.android.features.home.impl.filters.RoomListFiltersState -import io.element.android.features.home.impl.search.RoomListSearchEvents +import io.element.android.features.home.impl.search.RoomListSearchEvent import io.element.android.features.home.impl.search.RoomListSearchState import io.element.android.features.invite.api.SeenInvitesStore import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.AcceptInvite @@ -126,7 +126,7 @@ class RoomListPresenter( RoomListEvent.DismissNewNotificationSoundBanner -> coroutineScope.launch { announcementService.onAnnouncementDismissed(Announcement.NewNotificationSound) } - RoomListEvent.ToggleSearchResults -> searchState.eventSink(RoomListSearchEvents.ToggleSearchVisibility) + RoomListEvent.ToggleSearchResults -> searchState.eventSink(RoomListSearchEvent.ToggleSearchVisibility) is RoomListEvent.ShowContextMenu -> { coroutineScope.showContextMenu(event, contextMenu) } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvent.kt similarity index 66% rename from features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt rename to features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvent.kt index d8269fbc04..25fb7896bc 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvents.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchEvent.kt @@ -8,7 +8,7 @@ package io.element.android.features.home.impl.search -sealed interface RoomListSearchEvents { - data object ToggleSearchVisibility : RoomListSearchEvents - data object ClearQuery : RoomListSearchEvents +sealed interface RoomListSearchEvent { + data object ToggleSearchVisibility : RoomListSearchEvent + data object ClearQuery : RoomListSearchEvent } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt index 05aa88b7a4..f42dd2a6d8 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenter.kt @@ -45,12 +45,12 @@ class RoomListSearchPresenter( dataSource.setSearchQuery(searchQuery.text.toString()) } - fun handleEvent(event: RoomListSearchEvents) { + fun handleEvent(event: RoomListSearchEvent) { when (event) { - RoomListSearchEvents.ClearQuery -> { + RoomListSearchEvent.ClearQuery -> { searchQuery.clearText() } - RoomListSearchEvents.ToggleSearchVisibility -> { + RoomListSearchEvent.ToggleSearchVisibility -> { isSearchActive = !isSearchActive searchQuery.clearText() } diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt index c2d889388b..dd6c406b85 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchState.kt @@ -16,5 +16,5 @@ data class RoomListSearchState( val isSearchActive: Boolean, val query: TextFieldState, val results: ImmutableList, - val eventSink: (RoomListSearchEvents) -> Unit + val eventSink: (RoomListSearchEvent) -> Unit ) diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt index 645eb791ba..e6ec92f68b 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchStateProvider.kt @@ -31,7 +31,7 @@ fun aRoomListSearchState( isSearchActive: Boolean = false, query: String = "", results: ImmutableList = persistentListOf(), - eventSink: (RoomListSearchEvents) -> Unit = { }, + eventSink: (RoomListSearchEvent) -> Unit = { }, ) = RoomListSearchState( isSearchActive = isSearchActive, query = TextFieldState(initialText = query), diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt index 3df53bc35d..d0b41c73ae 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/search/RoomListSearchView.kt @@ -59,7 +59,7 @@ internal fun RoomListSearchView( modifier: Modifier = Modifier, ) { BackHandler(enabled = state.isSearchActive) { - state.eventSink(RoomListSearchEvents.ToggleSearchVisibility) + state.eventSink(RoomListSearchEvent.ToggleSearchVisibility) } AnimatedVisibility( @@ -89,7 +89,7 @@ private fun RoomListSearchContent( val borderColor = MaterialTheme.colorScheme.tertiary val strokeWidth = 1.dp fun onBackButtonClick() { - state.eventSink(RoomListSearchEvents.ToggleSearchVisibility) + state.eventSink(RoomListSearchEvent.ToggleSearchVisibility) } fun onRoomClick(room: RoomListRoomSummary) { @@ -127,7 +127,7 @@ private fun RoomListSearchContent( ), trailingIcon = if (state.query.text.isNotEmpty()) { @Composable { - IconButton(onClick = { state.eventSink(RoomListSearchEvents.ClearQuery) }) { + IconButton(onClick = { state.eventSink(RoomListSearchEvent.ClearQuery) }) { Icon( imageVector = CompoundIcons.Close(), contentDescription = stringResource(CommonStrings.action_cancel) diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt index 9bb9d64def..8621875752 100644 --- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt @@ -21,7 +21,7 @@ import io.element.android.features.home.impl.datasource.aRoomListRoomSummaryFact import io.element.android.features.home.impl.filters.RoomListFiltersState import io.element.android.features.home.impl.filters.aRoomListFiltersState import io.element.android.features.home.impl.model.createRoomListRoomSummary -import io.element.android.features.home.impl.search.RoomListSearchEvents +import io.element.android.features.home.impl.search.RoomListSearchEvent import io.element.android.features.home.impl.search.RoomListSearchState import io.element.android.features.home.impl.search.aRoomListSearchState import io.element.android.features.invite.api.SeenInvitesStore @@ -327,7 +327,7 @@ class RoomListPresenterTest { @Test fun `present - toggle search menu`() = runTest { - val eventRecorder = EventsRecorder() + val eventRecorder = EventsRecorder() val searchPresenter: Presenter = Presenter { aRoomListSearchState( eventSink = eventRecorder @@ -343,13 +343,13 @@ class RoomListPresenterTest { eventRecorder.assertEmpty() initialState.eventSink(RoomListEvent.ToggleSearchResults) eventRecorder.assertSingle( - RoomListSearchEvents.ToggleSearchVisibility + RoomListSearchEvent.ToggleSearchVisibility ) initialState.eventSink(RoomListEvent.ToggleSearchResults) eventRecorder.assertList( listOf( - RoomListSearchEvents.ToggleSearchVisibility, - RoomListSearchEvents.ToggleSearchVisibility + RoomListSearchEvent.ToggleSearchVisibility, + RoomListSearchEvent.ToggleSearchVisibility ) ) } diff --git a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt index bf453ea0d9..a7cdc2b573 100644 --- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt +++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/search/RoomListSearchPresenterTest.kt @@ -48,11 +48,11 @@ class RoomListSearchPresenterTest { }.test { awaitItem().let { state -> assertThat(state.isSearchActive).isFalse() - state.eventSink(RoomListSearchEvents.ToggleSearchVisibility) + state.eventSink(RoomListSearchEvent.ToggleSearchVisibility) } awaitItem().let { state -> assertThat(state.isSearchActive).isTrue() - state.eventSink(RoomListSearchEvents.ToggleSearchVisibility) + state.eventSink(RoomListSearchEvent.ToggleSearchVisibility) } awaitItem().let { state -> assertThat(state.isSearchActive).isFalse() @@ -82,7 +82,7 @@ class RoomListSearchPresenterTest { ).isEqualTo( RoomListFilter.NormalizedMatchRoomName("Search") ) - state.eventSink(RoomListSearchEvents.ClearQuery) + state.eventSink(RoomListSearchEvent.ClearQuery) } awaitItem().let { state -> assertThat(state.query.text.toString()).isEmpty()