diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvent.kt similarity index 65% rename from features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt rename to features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvent.kt index 740982b612..b8cd9345c2 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvents.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerEvent.kt @@ -8,7 +8,7 @@ package io.element.android.features.knockrequests.impl.banner -sealed interface KnockRequestsBannerEvents { - data object AcceptSingleRequest : KnockRequestsBannerEvents - data object Dismiss : KnockRequestsBannerEvents +sealed interface KnockRequestsBannerEvent { + data object AcceptSingleRequest : KnockRequestsBannerEvent + data object Dismiss : KnockRequestsBannerEvent } diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt index f340d597b1..a96b6d3de3 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt @@ -53,15 +53,15 @@ class KnockRequestsBannerPresenter( } } - fun handleEvent(event: KnockRequestsBannerEvents) { + fun handleEvent(event: KnockRequestsBannerEvent) { when (event) { - is KnockRequestsBannerEvents.AcceptSingleRequest -> { + is KnockRequestsBannerEvent.AcceptSingleRequest -> { sessionCoroutineScope.acceptSingleKnockRequest( knockRequests = knockRequests, displayAcceptError = showAcceptError, ) } - is KnockRequestsBannerEvents.Dismiss -> { + is KnockRequestsBannerEvent.Dismiss -> { sessionCoroutineScope.launch { knockRequestsService.markAllKnockRequestsAsSeen() } diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt index e9291b501a..2b6532c355 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt @@ -20,7 +20,7 @@ data class KnockRequestsBannerState( val knockRequests: ImmutableList, val displayAcceptError: Boolean, val canAccept: Boolean, - val eventSink: (KnockRequestsBannerEvents) -> Unit, + val eventSink: (KnockRequestsBannerEvent) -> Unit, ) { val subtitle = knockRequests.singleOrNull()?.userId?.value val reason = knockRequests.singleOrNull()?.reason diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStatePreviewParam.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStatePreviewParam.kt index fb05ae1fe0..8df5e08985 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStatePreviewParam.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStatePreviewParam.kt @@ -64,7 +64,7 @@ fun aKnockRequestsBannerState( displayAcceptError: Boolean = false, canAccept: Boolean = true, isVisible: Boolean = true, - eventSink: (KnockRequestsBannerEvents) -> Unit = {} + eventSink: (KnockRequestsBannerEvent) -> Unit = {} ) = KnockRequestsBannerState( knockRequests = knockRequests.toImmutableList(), displayAcceptError = displayAcceptError, diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt index 037ec16d00..329e7a2a56 100644 --- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt +++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt @@ -109,11 +109,11 @@ private fun KnockRequestsBannerContent( modifier: Modifier = Modifier, ) { fun onDismissClick() { - state.eventSink(KnockRequestsBannerEvents.Dismiss) + state.eventSink(KnockRequestsBannerEvent.Dismiss) } fun onAcceptClick() { - state.eventSink(KnockRequestsBannerEvents.AcceptSingleRequest) + state.eventSink(KnockRequestsBannerEvent.AcceptSingleRequest) } Column( diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt index 1595fcdbd9..2c1a185ba2 100644 --- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt +++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt @@ -146,7 +146,7 @@ import org.junit.Test presenter.test { skipItems(2) awaitItem().also { state -> - state.eventSink(KnockRequestsBannerEvents.AcceptSingleRequest) + state.eventSink(KnockRequestsBannerEvent.AcceptSingleRequest) } awaitItem().also { state -> assertThat(state.isVisible).isFalse() @@ -182,7 +182,7 @@ import org.junit.Test skipItems(2) awaitItem().also { state -> assertThat(state.knockRequests).hasSize(1) - state.eventSink(KnockRequestsBannerEvents.AcceptSingleRequest) + state.eventSink(KnockRequestsBannerEvent.AcceptSingleRequest) } awaitItem().also { state -> assertThat(state.isVisible).isFalse() @@ -206,7 +206,7 @@ import org.junit.Test presenter.test { skipItems(2) awaitItem().also { state -> - state.eventSink(KnockRequestsBannerEvents.Dismiss) + state.eventSink(KnockRequestsBannerEvent.Dismiss) } advanceUntilIdle() assert(markAsSeenLambda).isCalledExactly(3) diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt index f55ccb0cef..441b782a4a 100644 --- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt +++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt @@ -29,7 +29,7 @@ import org.junit.Test class KnockRequestsBannerViewTest : RobolectricTest() { @Test fun `clicking on view on single request invoke the expected callback`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder(expectEvents = false) + val eventsRecorder = EventsRecorder(expectEvents = false) ensureCalledOnce { setKnockRequestsBannerView( state = aKnockRequestsBannerState( @@ -43,7 +43,7 @@ class KnockRequestsBannerViewTest : RobolectricTest() { @Test fun `clicking on view all when multiple requests invoke the expected callback`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder(expectEvents = false) + val eventsRecorder = EventsRecorder(expectEvents = false) ensureCalledOnce { setKnockRequestsBannerView( state = aKnockRequestsBannerState( @@ -62,19 +62,19 @@ class KnockRequestsBannerViewTest : RobolectricTest() { @Test fun `clicking on accept on a single request emit the expected event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setKnockRequestsBannerView( state = aKnockRequestsBannerState( eventSink = eventsRecorder, ), ) clickOn(CommonStrings.action_accept) - eventsRecorder.assertSingle(KnockRequestsBannerEvents.AcceptSingleRequest) + eventsRecorder.assertSingle(KnockRequestsBannerEvent.AcceptSingleRequest) } @Test fun `clicking on dismiss emit the expected event`() = runAndroidComposeUiTest { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() setKnockRequestsBannerView( state = aKnockRequestsBannerState( eventSink = eventsRecorder, @@ -82,7 +82,7 @@ class KnockRequestsBannerViewTest : RobolectricTest() { ) val close = activity!!.getString(CommonStrings.action_close) onNodeWithContentDescription(close).performClick() - eventsRecorder.assertSingle(KnockRequestsBannerEvents.Dismiss) + eventsRecorder.assertSingle(KnockRequestsBannerEvent.Dismiss) } }