diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt index cf46e896b9..edf61d90cd 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesStateProvider.kt @@ -32,7 +32,7 @@ import io.element.android.features.messages.impl.timeline.components.customreact import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionState import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryEvent import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryState -import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetEvents +import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetEvent import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetState import io.element.android.features.messages.impl.timeline.model.TimelineItem import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent @@ -206,7 +206,7 @@ fun aCustomReactionState( fun aReadReceiptBottomSheetState( selectedEvent: TimelineItem.Event? = null, - eventSink: (ReadReceiptBottomSheetEvents) -> Unit = {}, + eventSink: (ReadReceiptBottomSheetEvent) -> Unit = {}, ) = ReadReceiptBottomSheetState( selectedEvent = selectedEvent, eventSink = eventSink, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt index 87efc50528..437e652cff 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt @@ -79,7 +79,7 @@ import io.element.android.features.messages.impl.timeline.components.customreact import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryEvent import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryView import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheet -import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetEvents +import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetEvent import io.element.android.features.messages.impl.timeline.model.TimelineItem import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent @@ -259,7 +259,7 @@ fun MessagesView( onReactionLongClick = ::onEmojiReactionLongClick, onMoreReactionsClick = ::onMoreReactionsClick, onReadReceiptClick = { event -> - state.readReceiptBottomSheetState.eventSink(ReadReceiptBottomSheetEvents.EventSelected(event)) + state.readReceiptBottomSheetState.eventSink(ReadReceiptBottomSheetEvent.EventSelected(event)) }, onSendLocationClick = onSendLocationClick, onCreatePollClick = onCreatePollClick, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt index 57c46a6326..b65e326045 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt @@ -55,7 +55,7 @@ internal fun ReadReceiptBottomSheet( onDismissRequest = { coroutineScope.launch { sheetState.hide() - state.eventSink(ReadReceiptBottomSheetEvents.Dismiss) + state.eventSink(ReadReceiptBottomSheetEvent.Dismiss) } } ) { @@ -64,7 +64,7 @@ internal fun ReadReceiptBottomSheet( onUserDataClick = { coroutineScope.launch { sheetState.hide() - state.eventSink(ReadReceiptBottomSheetEvents.Dismiss) + state.eventSink(ReadReceiptBottomSheetEvent.Dismiss) onUserDataClick.invoke(it) } }, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvent.kt similarity index 78% rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt rename to features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvent.kt index 04723d0214..9c605c42df 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvents.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetEvent.kt @@ -10,7 +10,7 @@ package io.element.android.features.messages.impl.timeline.components.receipt.bo import io.element.android.features.messages.impl.timeline.model.TimelineItem -sealed interface ReadReceiptBottomSheetEvents { - data class EventSelected(val event: TimelineItem.Event) : ReadReceiptBottomSheetEvents - data object Dismiss : ReadReceiptBottomSheetEvents +sealed interface ReadReceiptBottomSheetEvent { + data class EventSelected(val event: TimelineItem.Event) : ReadReceiptBottomSheetEvent + data object Dismiss : ReadReceiptBottomSheetEvent } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt index e1264b77e7..b5b4168a28 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenter.kt @@ -23,13 +23,13 @@ class ReadReceiptBottomSheetPresenter : Presenter { override fun present(): ReadReceiptBottomSheetState { var selectedEvent: TimelineItem.Event? by remember { mutableStateOf(null) } - fun handleEvent(event: ReadReceiptBottomSheetEvents) { + fun handleEvent(event: ReadReceiptBottomSheetEvent) { @Suppress("LiftReturnOrAssignment") when (event) { - is ReadReceiptBottomSheetEvents.EventSelected -> { + is ReadReceiptBottomSheetEvent.EventSelected -> { selectedEvent = event.event } - ReadReceiptBottomSheetEvents.Dismiss -> { + ReadReceiptBottomSheetEvent.Dismiss -> { selectedEvent = null } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt index 7ec4107f8f..d708399f86 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetState.kt @@ -12,5 +12,5 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem data class ReadReceiptBottomSheetState( val selectedEvent: TimelineItem.Event?, - val eventSink: (ReadReceiptBottomSheetEvents) -> Unit, + val eventSink: (ReadReceiptBottomSheetEvent) -> Unit, ) diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt index abac682a10..c6d974bae7 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt @@ -50,7 +50,7 @@ import io.element.android.features.messages.impl.timeline.components.customreact import io.element.android.features.messages.impl.timeline.components.customreaction.CustomReactionState import io.element.android.features.messages.impl.timeline.components.reactionsummary.ReactionSummaryEvent import io.element.android.features.messages.impl.timeline.components.receipt.aReadReceiptData -import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetEvents +import io.element.android.features.messages.impl.timeline.components.receipt.bottomsheet.ReadReceiptBottomSheetEvent import io.element.android.features.messages.impl.timeline.model.TimelineItem import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent import io.element.android.libraries.matrix.api.core.RoomId @@ -216,7 +216,7 @@ class MessagesViewTest { @Test @Config(qualifiers = "h1024dp") fun `clicking on a read receipt list emits the expected Event`() { - val eventsRecorder = EventsRecorder() + val eventsRecorder = EventsRecorder() val state = aMessagesState( timelineState = aTimelineState( renderReadReceipts = true, @@ -239,7 +239,7 @@ class MessagesViewTest { state = state, ) rule.onNodeWithTag(TestTags.messageReadReceipts.value, useUnmergedTree = true).performClick() - eventsRecorder.assertSingle(ReadReceiptBottomSheetEvents.EventSelected(timelineItem)) + eventsRecorder.assertSingle(ReadReceiptBottomSheetEvent.EventSelected(timelineItem)) } @Test diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt index d39500fec2..0a10188f48 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheetPresenterTest.kt @@ -30,7 +30,7 @@ class ReadReceiptBottomSheetPresenterTest { }.test { val initialState = awaitItem() val selectedEvent = aTimelineItemEvent() - initialState.eventSink(ReadReceiptBottomSheetEvents.EventSelected(selectedEvent)) + initialState.eventSink(ReadReceiptBottomSheetEvent.EventSelected(selectedEvent)) assertThat(awaitItem().selectedEvent).isSameInstanceAs(selectedEvent) } } @@ -43,9 +43,9 @@ class ReadReceiptBottomSheetPresenterTest { }.test { val initialState = awaitItem() val selectedEvent = aTimelineItemEvent() - initialState.eventSink(ReadReceiptBottomSheetEvents.EventSelected(selectedEvent)) + initialState.eventSink(ReadReceiptBottomSheetEvent.EventSelected(selectedEvent)) skipItems(1) - initialState.eventSink(ReadReceiptBottomSheetEvents.Dismiss) + initialState.eventSink(ReadReceiptBottomSheetEvent.Dismiss) assertThat(awaitItem().selectedEvent).isNull() } }