AcceptDeclineInviteEvents -> AcceptDeclineInviteEvent

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenter.kt

@@ -37,8 +37,8 @@ import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
 import io.element.android.features.home.impl.spacefilters.into
 import io.element.android.features.home.impl.spacefilters.selectedFilter
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.AcceptInvite
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent.AcceptInvite
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.DeclineInvite
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent.DeclineInvite
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListPresenterTest.kt

@@ -25,7 +25,7 @@ import io.element.android.features.home.impl.search.aRoomListSearchState
 import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
 import io.element.android.features.home.impl.spacefilters.aDisabledSpaceFiltersState
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
@@ -474,7 +474,7 @@ class RoomListPresenterTest {
 
     @Test
     fun `present - when a room is invited then accept and decline events are sent to acceptDeclinePresenter`() = runTest {
-        val eventSinkRecorder = lambdaRecorder { _: AcceptDeclineInviteEvents -> }
+        val eventSinkRecorder = lambdaRecorder { _: AcceptDeclineInviteEvent -> }
         val acceptDeclinePresenter = Presenter {
             anAcceptDeclineInviteState(eventSink = eventSinkRecorder)
         }
@@ -513,8 +513,8 @@ class RoomListPresenterTest {
             assert(eventSinkRecorder)
                 .isCalledExactly(2)
                 .withSequence(
-                    listOf(value(AcceptDeclineInviteEvents.AcceptInvite(inviteData))),
+                    listOf(value(AcceptDeclineInviteEvent.AcceptInvite(inviteData))),
-                    listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false))),
+                    listOf(value(AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false))),
                 )
         }
     }

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvent.kt

@@ -13,7 +13,7 @@ import io.element.android.features.invite.api.InviteData
 /**
  * Events sent to the accept/decline invite presenter, from whichever screen is showing the invitation.
  */
-interface AcceptDeclineInviteEvents {
+interface AcceptDeclineInviteEvent {
-    data class AcceptInvite(val invite: InviteData) : AcceptDeclineInviteEvents
+    data class AcceptInvite(val invite: InviteData) : AcceptDeclineInviteEvent
-    data class DeclineInvite(val invite: InviteData, val blockUser: Boolean, val shouldConfirm: Boolean) : AcceptDeclineInviteEvents
+    data class DeclineInvite(val invite: InviteData, val blockUser: Boolean, val shouldConfirm: Boolean) : AcceptDeclineInviteEvent
 }

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt

@@ -14,5 +14,5 @@ import io.element.android.libraries.matrix.api.core.RoomId
 data class AcceptDeclineInviteState(
     val acceptAction: AsyncAction<RoomId>,
     val declineAction: AsyncAction<RoomId>,
-    val eventSink: (AcceptDeclineInviteEvents) -> Unit,
+    val eventSink: (AcceptDeclineInviteEvent) -> Unit,
 )

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStatePreviewParam.kt

@@ -14,7 +14,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 fun anAcceptDeclineInviteState(
     acceptAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
     declineAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
-    eventSink: (AcceptDeclineInviteEvents) -> Unit = {},
+    eventSink: (AcceptDeclineInviteEvent) -> Unit = {},
 ) = AcceptDeclineInviteState(
     acceptAction = acceptAction,
     declineAction = declineAction,

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt

@@ -15,7 +15,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import dev.zacsweers.metro.Inject
 import io.element.android.features.invite.api.InviteData
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInvite
 import io.element.android.features.invite.impl.AcceptInvite
@@ -40,13 +40,13 @@ class AcceptDeclineInvitePresenter(
         val declinedAction: MutableState<AsyncAction<RoomId>> =
             remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        fun handleEvent(event: AcceptDeclineInviteEvents) {
+        fun handleEvent(event: AcceptDeclineInviteEvent) {
             when (event) {
-                is AcceptDeclineInviteEvents.AcceptInvite -> {
+                is AcceptDeclineInviteEvent.AcceptInvite -> {
                     localCoroutineScope.acceptInvite(event.invite.roomId, acceptedAction)
                 }
 
-                is AcceptDeclineInviteEvents.DeclineInvite -> {
+                is AcceptDeclineInviteEvent.DeclineInvite -> {
                     val inviteData = event.invite
                     if (event.shouldConfirm) {
                         declinedAction.value = ConfirmingDeclineInvite(inviteData, event.blockUser)

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt

@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.invite.api.InviteData
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInvite
 import io.element.android.features.invite.impl.AcceptInvite
@@ -77,7 +77,7 @@ fun AcceptDeclineInviteView(
                         blockUser = confirming.blockUser,
                         onConfirmClick = {
                             state.eventSink(
-                                AcceptDeclineInviteEvents.DeclineInvite(
+                                AcceptDeclineInviteEvent.DeclineInvite(
                                     confirming.inviteData,
                                     blockUser = confirming.blockUser,
                                     shouldConfirm = false

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt

@@ -8,9 +8,9 @@
 
 package io.element.android.features.invite.impl.acceptdecline
 
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 
-sealed interface InternalAcceptDeclineInviteEvents : AcceptDeclineInviteEvents {
+sealed interface InternalAcceptDeclineInviteEvents : AcceptDeclineInviteEvent {
     data object ClearAcceptActionState : InternalAcceptDeclineInviteEvents
     data object ClearDeclineActionState : InternalAcceptDeclineInviteEvents
 }

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt

@@ -10,7 +10,7 @@ package io.element.android.features.invite.impl.acceptdecline
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.invite.api.InviteData
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInvite
 import io.element.android.features.invite.impl.AcceptInvite
 import io.element.android.features.invite.impl.DeclineInvite
@@ -51,7 +51,7 @@ class AcceptDeclineInvitePresenterTest {
             val inviteData = anInviteData()
             awaitItem().also { state ->
                 state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
+                    AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
                 )
             }
             awaitItem().also { state ->
@@ -78,13 +78,13 @@ class AcceptDeclineInvitePresenterTest {
             val inviteData = anInviteData()
             awaitItem().also { state ->
                 state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
+                    AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
                 )
             }
             awaitItem().also { state ->
                 assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, false))
                 state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false)
+                    AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false)
                 )
             }
             assertThat(awaitItem().declineAction.isLoading()).isTrue()
@@ -114,13 +114,13 @@ class AcceptDeclineInvitePresenterTest {
             val inviteData = anInviteData()
             awaitItem().also { state ->
                 state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
+                    AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
                 )
             }
             awaitItem().also { state ->
                 assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, blockUser = false))
                 state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false)
+                    AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false)
                 )
             }
             assertThat(awaitItem().declineAction.isLoading()).isTrue()
@@ -146,7 +146,7 @@ class AcceptDeclineInvitePresenterTest {
             val inviteData = anInviteData()
             awaitItem().also { state ->
                 state.eventSink(
-                    AcceptDeclineInviteEvents.AcceptInvite(inviteData)
+                    AcceptDeclineInviteEvent.AcceptInvite(inviteData)
                 )
             }
             awaitItem().also { state ->
@@ -178,7 +178,7 @@ class AcceptDeclineInvitePresenterTest {
             val inviteData = anInviteData()
             awaitItem().also { state ->
                 state.eventSink(
-                    AcceptDeclineInviteEvents.AcceptInvite(inviteData)
+                    AcceptDeclineInviteEvent.AcceptInvite(inviteData)
                 )
             }
             awaitItem().also { state ->

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

@@ -26,7 +26,7 @@ import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.InviteData
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.toInviteData
 import io.element.android.features.joinroom.impl.di.CancelKnockRoom
@@ -157,12 +157,12 @@ class JoinRoomPresenter(
                 is JoinRoomEvents.KnockRoom -> coroutineScope.knockRoom(knockAction, knockMessage)
                 is JoinRoomEvents.AcceptInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.AcceptInvite(event.inviteData)
+                        AcceptDeclineInviteEvent.AcceptInvite(event.inviteData)
                     )
                 }
                 is JoinRoomEvents.DeclineInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.DeclineInvite(invite = event.inviteData, blockUser = event.blockUser, shouldConfirm = true)
+                        AcceptDeclineInviteEvent.DeclineInvite(invite = event.inviteData, blockUser = event.blockUser, shouldConfirm = true)
                     )
                 }
                 is JoinRoomEvents.CancelKnock -> coroutineScope.cancelKnockRoom(event.requiresConfirmation, cancelKnockAction)

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt

@@ -12,7 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.InviteData
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.invite.api.toInviteData
@@ -365,7 +365,7 @@ class JoinRoomPresenterTest {
 
     @Test
     fun `present - when room is invited then accept and decline events are sent to acceptDeclinePresenter`() = runTest {
-        val eventSinkRecorder = lambdaRecorder { _: AcceptDeclineInviteEvents -> }
+        val eventSinkRecorder = lambdaRecorder { _: AcceptDeclineInviteEvent -> }
         val acceptDeclinePresenter = Presenter {
             anAcceptDeclineInviteState(eventSink = eventSinkRecorder)
         }
@@ -394,8 +394,8 @@ class JoinRoomPresenterTest {
                 assert(eventSinkRecorder)
                     .isCalledExactly(2)
                     .withSequence(
-                        listOf(value(AcceptDeclineInviteEvents.AcceptInvite(inviteData))),
+                        listOf(value(AcceptDeclineInviteEvent.AcceptInvite(inviteData))),
-                        listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true))),
+                        listOf(value(AcceptDeclineInviteEvent.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true))),
                     )
             }
         }

features/space/impl/src/main/kotlin/io/element/android/features/space/impl/root/SpacePresenter.kt

@@ -22,7 +22,7 @@ import androidx.compose.runtime.setValue
 import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.JoinedRoom.Trigger
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.toInviteData
 import io.element.android.libraries.architecture.AsyncAction
@@ -165,12 +165,12 @@ class SpacePresenter(
                 }
                 is SpaceEvents.AcceptInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.AcceptInvite(event.spaceRoom.toInviteData())
+                        AcceptDeclineInviteEvent.AcceptInvite(event.spaceRoom.toInviteData())
                     )
                 }
                 is SpaceEvents.DeclineInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.DeclineInvite(invite = event.spaceRoom.toInviteData(), shouldConfirm = true, blockUser = false)
+                        AcceptDeclineInviteEvent.DeclineInvite(invite = event.spaceRoom.toInviteData(), shouldConfirm = true, blockUser = false)
                     )
                 }
                 SpaceEvents.HideTopicViewer -> topicViewerState = TopicViewerState.Hidden

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpacePresenterTest.kt

@@ -15,7 +15,7 @@ import com.google.testing.junit.testparameterinjector.KotlinTestParameters.named
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterInjector
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvent
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.invite.api.toInviteData
@@ -272,7 +272,7 @@ class SpacePresenterTest {
             "decline" to false,
         ),
     ) = runTest {
-        val eventRecorder = EventsRecorder<AcceptDeclineInviteEvents>()
+        val eventRecorder = EventsRecorder<AcceptDeclineInviteEvent>()
         val anInvitedRoom = aSpaceRoom(
             roomId = A_ROOM_ID_2,
             state = CurrentUserMembership.INVITED,
@@ -302,14 +302,14 @@ class SpacePresenterTest {
             if (acceptInvite) {
                 state.eventSink(SpaceEvents.AcceptInvite(anInvitedRoom))
                 eventRecorder.assertSingle(
-                    AcceptDeclineInviteEvents.AcceptInvite(
+                    AcceptDeclineInviteEvent.AcceptInvite(
                         invite = anInvitedRoom.toInviteData(),
                     )
                 )
             } else {
                 state.eventSink(SpaceEvents.DeclineInvite(anInvitedRoom))
                 eventRecorder.assertSingle(
-                    AcceptDeclineInviteEvents.DeclineInvite(
+                    AcceptDeclineInviteEvent.DeclineInvite(
                         invite = anInvitedRoom.toInviteData(),
                         shouldConfirm = true,
                         blockUser = false,