From 4e9ec1b631609a2cc885bd052fc1ef72464f880e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Aug 2026 10:17:21 +0200 Subject: [PATCH] `RoomDirectoryEvents` -> `RoomDirectoryEvent` --- .../{RoomDirectoryEvents.kt => RoomDirectoryEvent.kt} | 6 +++--- .../roomdirectory/impl/root/RoomDirectoryPresenter.kt | 6 +++--- .../roomdirectory/impl/root/RoomDirectoryState.kt | 2 +- .../impl/root/RoomDirectoryStatePreviewParam.kt | 2 +- .../roomdirectory/impl/root/RoomDirectoryView.kt | 4 ++-- .../impl/root/RoomDirectoryPresenterTest.kt | 4 ++-- .../roomdirectory/impl/root/RoomDirectoryViewTest.kt | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) rename features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/{RoomDirectoryEvents.kt => RoomDirectoryEvent.kt} (67%) diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvent.kt similarity index 67% rename from features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt rename to features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvent.kt index 20e866f2bf..8eb82d8ea9 100644 --- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvents.kt +++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryEvent.kt @@ -8,7 +8,7 @@ package io.element.android.features.roomdirectory.impl.root -sealed interface RoomDirectoryEvents { - data class Search(val query: String) : RoomDirectoryEvents - data object LoadMore : RoomDirectoryEvents +sealed interface RoomDirectoryEvent { + data class Search(val query: String) : RoomDirectoryEvent + data object LoadMore : RoomDirectoryEvent } diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt index 98338440a1..b99a31dced 100644 --- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt +++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenter.kt @@ -63,12 +63,12 @@ class RoomDirectoryPresenter( loadingMore = false } } - fun handleEvent(event: RoomDirectoryEvents) { + fun handleEvent(event: RoomDirectoryEvent) { when (event) { - RoomDirectoryEvents.LoadMore -> { + RoomDirectoryEvent.LoadMore -> { loadingMore = true } - is RoomDirectoryEvents.Search -> { + is RoomDirectoryEvent.Search -> { searchQuery = event.query } } diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt index a3647381dc..4066ff785a 100644 --- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt +++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryState.kt @@ -15,7 +15,7 @@ data class RoomDirectoryState( val query: String, val roomDescriptions: ImmutableList, val displayLoadMoreIndicator: Boolean, - val eventSink: (RoomDirectoryEvents) -> Unit + val eventSink: (RoomDirectoryEvent) -> Unit ) { val displayEmptyState = roomDescriptions.isEmpty() && !displayLoadMoreIndicator } diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStatePreviewParam.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStatePreviewParam.kt index d7869f3d06..89dde9605b 100644 --- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStatePreviewParam.kt +++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryStatePreviewParam.kt @@ -35,7 +35,7 @@ fun aRoomDirectoryState( query: String = "", displayLoadMoreIndicator: Boolean = false, roomDescriptions: ImmutableList = persistentListOf(), - eventSink: (RoomDirectoryEvents) -> Unit = {}, + eventSink: (RoomDirectoryEvent) -> Unit = {}, ) = RoomDirectoryState( query = query, roomDescriptions = roomDescriptions, diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt index b880a4d28e..3e9c6e05c4 100644 --- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt +++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt @@ -107,7 +107,7 @@ private fun RoomDirectoryContent( Column(modifier = modifier) { SearchTextField( query = state.query, - onQueryChange = { state.eventSink(RoomDirectoryEvents.Search(it)) }, + onQueryChange = { state.eventSink(RoomDirectoryEvent.Search(it)) }, placeholder = stringResource(id = CommonStrings.action_search), modifier = Modifier.fillMaxWidth(), ) @@ -116,7 +116,7 @@ private fun RoomDirectoryContent( displayLoadMoreIndicator = state.displayLoadMoreIndicator, displayEmptyState = state.displayEmptyState, onResultClick = onResultClick, - onReachedLoadMore = { state.eventSink(RoomDirectoryEvents.LoadMore) }, + onReachedLoadMore = { state.eventSink(RoomDirectoryEvent.LoadMore) }, ) } } diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt index 6295e4beb6..7d75703587 100644 --- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt +++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt @@ -91,7 +91,7 @@ class RoomDirectoryPresenterTest { val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService) presenter.test { awaitItem().also { state -> - state.eventSink(RoomDirectoryEvents.Search("test")) + state.eventSink(RoomDirectoryEvent.Search("test")) } awaitItem().also { state -> assertThat(state.query).isEqualTo("test") @@ -112,7 +112,7 @@ class RoomDirectoryPresenterTest { val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService) presenter.test { awaitItem().also { state -> - state.eventSink(RoomDirectoryEvents.LoadMore) + state.eventSink(RoomDirectoryEvent.LoadMore) } advanceUntilIdle() cancelAndIgnoreRemainingEvents() diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt index b3b935596f..1c26290f10 100644 --- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt +++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt @@ -30,7 +30,7 @@ import org.junit.Test class RoomDirectoryViewTest : RobolectricTest() { @Test fun `typing text in search field emits the expected Event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setRoomDirectoryView( state = aRoomDirectoryState( eventSink = eventsRecorder, @@ -39,12 +39,12 @@ class RoomDirectoryViewTest : RobolectricTest() { onNodeWithTag(TestTags.searchTextField.value).performTextInput( text = "Test" ) - eventsRecorder.assertSingle(RoomDirectoryEvents.Search("Test")) + eventsRecorder.assertSingle(RoomDirectoryEvent.Search("Test")) } @Test fun `clicking on room item then onResultClick lambda is called once`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() val state = aRoomDirectoryState( roomDescriptions = aRoomDescriptionList(), eventSink = eventsRecorder, @@ -61,13 +61,13 @@ class RoomDirectoryViewTest : RobolectricTest() { @Test fun `composing load more indicator emits expected Event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() val state = aRoomDirectoryState( displayLoadMoreIndicator = true, eventSink = eventsRecorder, ) setRoomDirectoryView(state = state) - eventsRecorder.assertSingle(RoomDirectoryEvents.LoadMore) + eventsRecorder.assertSingle(RoomDirectoryEvent.LoadMore) } }