From f237b31db9e3586d7ca5a0cbe2f942d56dbf5d9c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jan 2026 09:59:18 +0100 Subject: [PATCH] PinnedMessagesBannerEvents -> PinnedMessagesBannerEvent --- ...MessagesBannerEvents.kt => PinnedMessagesBannerEvent.kt} | 4 ++-- .../impl/pinned/banner/PinnedMessagesBannerPresenter.kt | 6 +++--- .../impl/pinned/banner/PinnedMessagesBannerState.kt | 2 +- .../impl/pinned/banner/PinnedMessagesBannerStateProvider.kt | 2 +- .../messages/impl/pinned/banner/PinnedMessagesBannerView.kt | 2 +- .../impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt | 4 ++-- .../impl/pinned/banner/PinnedMessagesBannerViewTest.kt | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) rename features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/{PinnedMessagesBannerEvents.kt => PinnedMessagesBannerEvent.kt} (74%) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvent.kt similarity index 74% rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt rename to features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvent.kt index d4926404fe..42363c952d 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvents.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerEvent.kt @@ -8,6 +8,6 @@ package io.element.android.features.messages.impl.pinned.banner -sealed interface PinnedMessagesBannerEvents { - data object MoveToNextPinned : PinnedMessagesBannerEvents +sealed interface PinnedMessagesBannerEvent { + data object MoveToNextPinned : PinnedMessagesBannerEvent } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt index eada4b06d7..088959ea18 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt @@ -58,9 +58,9 @@ class PinnedMessagesBannerPresenter( }, ) - fun handleEvent(event: PinnedMessagesBannerEvents) { + fun handleEvent(event: PinnedMessagesBannerEvent) { when (event) { - is PinnedMessagesBannerEvents.MoveToNextPinned -> { + is PinnedMessagesBannerEvent.MoveToNextPinned -> { val loadedCount = pinnedItems.value.dataOrNull().orEmpty().size currentPinnedMessageIndex = (currentPinnedMessageIndex - 1).mod(loadedCount) } @@ -80,7 +80,7 @@ class PinnedMessagesBannerPresenter( expectedPinnedMessagesCount: Int, pinnedItems: AsyncData>, currentPinnedMessageIndex: Int, - eventSink: (PinnedMessagesBannerEvents) -> Unit + eventSink: (PinnedMessagesBannerEvent) -> Unit ): PinnedMessagesBannerState { return when (pinnedItems) { is AsyncData.Failure, is AsyncData.Uninitialized -> PinnedMessagesBannerState.Hidden diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt index 0ed43376ff..b6deb2edb4 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerState.kt @@ -41,6 +41,6 @@ sealed interface PinnedMessagesBannerState { val currentPinnedMessage: PinnedMessagesBannerItem, val currentPinnedMessageIndex: Int, val loadedPinnedMessagesCount: Int, - val eventSink: (PinnedMessagesBannerEvents) -> Unit + val eventSink: (PinnedMessagesBannerEvent) -> Unit ) : Visible } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt index ad7713e6f3..2a2c30bf6b 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerStateProvider.kt @@ -50,7 +50,7 @@ internal fun aLoadedPinnedMessagesBannerState( eventId = EventId("\$" + Random.nextInt().toString()), formatted = AnnotatedString(message) ), - eventSink: (PinnedMessagesBannerEvents) -> Unit = {} + eventSink: (PinnedMessagesBannerEvent) -> Unit = {} ) = PinnedMessagesBannerState.Loaded( currentPinnedMessage = currentPinnedMessage, currentPinnedMessageIndex = currentPinnedMessageIndex, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt index ee44f7b95d..21b89da5d1 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerView.kt @@ -96,7 +96,7 @@ private fun PinnedMessagesBannerRow( if (state is PinnedMessagesBannerState.Loaded) { analyticsService.captureInteraction(Interaction.Name.PinnedMessageBannerClick) onClick(state.currentPinnedMessage.eventId) - state.eventSink(PinnedMessagesBannerEvents.MoveToNextPinned) + state.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned) } }, verticalAlignment = Alignment.CenterVertically, diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt index d8269f85d8..1f95baccc9 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt @@ -127,7 +127,7 @@ class PinnedMessagesBannerPresenterTest { assertThat(loadedState.currentPinnedMessageIndex).isEqualTo(1) assertThat(loadedState.loadedPinnedMessagesCount).isEqualTo(2) assertThat(loadedState.currentPinnedMessage.formatted.text).isEqualTo(messageContent2.toString()) - loadedState.eventSink(PinnedMessagesBannerEvents.MoveToNextPinned) + loadedState.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned) } awaitItem().also { loadedState -> @@ -135,7 +135,7 @@ class PinnedMessagesBannerPresenterTest { assertThat(loadedState.currentPinnedMessageIndex).isEqualTo(0) assertThat(loadedState.loadedPinnedMessagesCount).isEqualTo(2) assertThat(loadedState.currentPinnedMessage.formatted.text).isEqualTo(messageContent1.toString()) - loadedState.eventSink(PinnedMessagesBannerEvents.MoveToNextPinned) + loadedState.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned) } awaitItem().also { loadedState -> diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt index a7bbdf999a..2c33e348c0 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerViewTest.kt @@ -33,7 +33,7 @@ class PinnedMessagesBannerViewTest { @Test fun `clicking on the banner invoke expected callback`() { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() val state = aLoadedPinnedMessagesBannerState( eventSink = eventsRecorder ) @@ -44,13 +44,13 @@ class PinnedMessagesBannerViewTest { onClick = callback ) rule.onRoot().performClick() - eventsRecorder.assertSingle(PinnedMessagesBannerEvents.MoveToNextPinned) + eventsRecorder.assertSingle(PinnedMessagesBannerEvent.MoveToNextPinned) } } @Test fun `clicking on view all emit the expected event`() { - val eventsRecorder = EventsRecorder(expectEvents = true) + val eventsRecorder = EventsRecorder(expectEvents = true) val state = aLoadedPinnedMessagesBannerState( eventSink = eventsRecorder )