From fc161c11d1b235e47f709f387c56902004465fc8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 May 2024 12:31:12 +0200 Subject: [PATCH] Rename some Events regarding polls --- .../android/features/messages/impl/MessagesPresenter.kt | 2 +- .../features/messages/impl/timeline/TimelineEvents.kt | 6 +++--- .../features/messages/impl/timeline/TimelinePresenter.kt | 6 +++--- .../impl/timeline/components/event/TimelineItemPollView.kt | 6 +++--- .../messages/impl/timeline/TimelinePresenterTest.kt | 6 +++--- .../timeline/components/event/TimelineItemPollViewTest.kt | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt index 47fdcde912..69ae082620 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt @@ -424,7 +424,7 @@ class MessagesPresenter @AssistedInject constructor( event: TimelineItem.Event, timelineState: TimelineState, ) { - event.eventId?.let { timelineState.eventSink(TimelineEvents.PollEndClicked(it)) } + event.eventId?.let { timelineState.eventSink(TimelineEvents.EndPoll(it)) } } private suspend fun handleCopyLink(event: TimelineItem.Event) { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt index 8a5d3cd275..65600f48cf 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt @@ -37,16 +37,16 @@ sealed interface TimelineEvents { */ sealed interface TimelineItemPollEvents : EventFromTimelineItem - data class PollAnswerSelected( + data class SelectPollAnswer( val pollStartId: EventId, val answerId: String ) : TimelineItemPollEvents - data class PollEndClicked( + data class EndPoll( val pollStartId: EventId, ) : TimelineItemPollEvents - data class PollEditClicked( + data class EditPoll( val pollStartId: EventId, ) : TimelineItemPollEvents } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt index 9be590932b..fca11f6d8e 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt @@ -122,18 +122,18 @@ class TimelinePresenter @AssistedInject constructor( newEventState.value = NewEventState.None } } - is TimelineEvents.PollAnswerSelected -> appScope.launch { + is TimelineEvents.SelectPollAnswer -> appScope.launch { sendPollResponseAction.execute( pollStartId = event.pollStartId, answerId = event.answerId ) } - is TimelineEvents.PollEndClicked -> appScope.launch { + is TimelineEvents.EndPoll -> appScope.launch { endPollAction.execute( pollStartId = event.pollStartId, ) } - is TimelineEvents.PollEditClicked -> { + is TimelineEvents.EditPoll -> { navigator.onEditPollClick(event.pollStartId) } is TimelineEvents.FocusOnEvent -> localScope.launch { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt index c192d55a36..c1a226cc31 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt @@ -35,15 +35,15 @@ fun TimelineItemPollView( modifier: Modifier = Modifier, ) { fun onSelectAnswer(pollStartId: EventId, answerId: String) { - eventSink(TimelineEvents.PollAnswerSelected(pollStartId, answerId)) + eventSink(TimelineEvents.SelectPollAnswer(pollStartId, answerId)) } fun onPollEnd(pollStartId: EventId) { - eventSink(TimelineEvents.PollEndClicked(pollStartId)) + eventSink(TimelineEvents.EndPoll(pollStartId)) } fun onPollEdit(pollStartId: EventId) { - eventSink(TimelineEvents.PollEditClicked(pollStartId)) + eventSink(TimelineEvents.EditPoll(pollStartId)) } PollContentView( diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt index bfca79d714..265e3ef636 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt @@ -409,7 +409,7 @@ private const val FAKE_UNIQUE_ID_2 = "FAKE_UNIQUE_ID_2" presenter.present() }.test { val initialState = awaitFirstItem() - initialState.eventSink.invoke(TimelineEvents.PollAnswerSelected(AN_EVENT_ID, "anAnswerId")) + initialState.eventSink.invoke(TimelineEvents.SelectPollAnswer(AN_EVENT_ID, "anAnswerId")) } delay(1) sendPollResponseAction.verifyExecutionCount(1) @@ -425,7 +425,7 @@ private const val FAKE_UNIQUE_ID_2 = "FAKE_UNIQUE_ID_2" presenter.present() }.test { val initialState = awaitFirstItem() - initialState.eventSink.invoke(TimelineEvents.PollEndClicked(AN_EVENT_ID)) + initialState.eventSink.invoke(TimelineEvents.EndPoll(AN_EVENT_ID)) } delay(1) endPollAction.verifyExecutionCount(1) @@ -440,7 +440,7 @@ private const val FAKE_UNIQUE_ID_2 = "FAKE_UNIQUE_ID_2" moleculeFlow(RecompositionMode.Immediate) { presenter.present() }.test { - awaitFirstItem().eventSink(TimelineEvents.PollEditClicked(AN_EVENT_ID)) + awaitFirstItem().eventSink(TimelineEvents.EditPoll(AN_EVENT_ID)) assertThat(navigator.onEditPollClickedCount).isEqualTo(1) } } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt index 4ea16a26b0..4c791da406 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt @@ -57,7 +57,7 @@ class TimelineItemPollViewTest { } val answer = content.answerItems[answerIndex].answer rule.onNode(hasText(answer.text)).performClick() - eventsRecorder.assertSingle(TimelineEvents.PollAnswerSelected(content.eventId!!, answer.id)) + eventsRecorder.assertSingle(TimelineEvents.SelectPollAnswer(content.eventId!!, answer.id)) } @Test @@ -74,7 +74,7 @@ class TimelineItemPollViewTest { ) } rule.clickOn(CommonStrings.action_edit_poll) - eventsRecorder.assertSingle(TimelineEvents.PollEditClicked(content.eventId!!)) + eventsRecorder.assertSingle(TimelineEvents.EditPoll(content.eventId!!)) } @Test @@ -93,6 +93,6 @@ class TimelineItemPollViewTest { // A confirmation dialog should be shown eventsRecorder.assertEmpty() rule.pressTag(TestTags.dialogPositive.value) - eventsRecorder.assertSingle(TimelineEvents.PollEndClicked(content.eventId!!)) + eventsRecorder.assertSingle(TimelineEvents.EndPoll(content.eventId!!)) } }