Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename some Events regarding polls

Browse source
This commit is contained in:
Benoit Marty 2024-05-29 12:31:12 +02:00
parent 87689d787e
commit 929d8d1549
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
View file

@ -424,7 +424,7 @@ class MessagesPresenter @AssistedInject constructor(
event: TimelineItem.Event, event: TimelineItem.Event,
timelineState: TimelineState, 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) { private suspend fun handleCopyLink(event: TimelineItem.Event) {

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineEvents.kt
View file

@ -37,16 +37,16 @@ sealed interface TimelineEvents {
*/ */
sealed interface TimelineItemPollEvents : EventFromTimelineItem sealed interface TimelineItemPollEvents : EventFromTimelineItem
data class PollAnswerSelected( data class SelectPollAnswer(
val pollStartId: EventId, val pollStartId: EventId,
val answerId: String val answerId: String
) : TimelineItemPollEvents ) : TimelineItemPollEvents
data class PollEndClicked( data class EndPoll(
val pollStartId: EventId, val pollStartId: EventId,
) : TimelineItemPollEvents ) : TimelineItemPollEvents
data class PollEditClicked( data class EditPoll(
val pollStartId: EventId, val pollStartId: EventId,
) : TimelineItemPollEvents ) : TimelineItemPollEvents
} }

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
View file

@ -122,18 +122,18 @@ class TimelinePresenter @AssistedInject constructor(
newEventState.value = NewEventState.None newEventState.value = NewEventState.None
} }
} }
is TimelineEvents.PollAnswerSelected -> appScope.launch { is TimelineEvents.SelectPollAnswer -> appScope.launch {
sendPollResponseAction.execute( sendPollResponseAction.execute(
pollStartId = event.pollStartId, pollStartId = event.pollStartId,
answerId = event.answerId answerId = event.answerId
) )
} }
is TimelineEvents.PollEndClicked -> appScope.launch { is TimelineEvents.EndPoll -> appScope.launch {
endPollAction.execute( endPollAction.execute(
pollStartId = event.pollStartId, pollStartId = event.pollStartId,
) )
} }
is TimelineEvents.PollEditClicked -> { is TimelineEvents.EditPoll -> {
navigator.onEditPollClick(event.pollStartId) navigator.onEditPollClick(event.pollStartId)
} }
is TimelineEvents.FocusOnEvent -> localScope.launch { is TimelineEvents.FocusOnEvent -> localScope.launch {

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
View file

@ -35,15 +35,15 @@ fun TimelineItemPollView(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
fun onSelectAnswer(pollStartId: EventId, answerId: String) { fun onSelectAnswer(pollStartId: EventId, answerId: String) {
eventSink(TimelineEvents.PollAnswerSelected(pollStartId, answerId)) eventSink(TimelineEvents.SelectPollAnswer(pollStartId, answerId))
} }
fun onPollEnd(pollStartId: EventId) { fun onPollEnd(pollStartId: EventId) {
eventSink(TimelineEvents.PollEndClicked(pollStartId)) eventSink(TimelineEvents.EndPoll(pollStartId))
} }
fun onPollEdit(pollStartId: EventId) { fun onPollEdit(pollStartId: EventId) {
eventSink(TimelineEvents.PollEditClicked(pollStartId)) eventSink(TimelineEvents.EditPoll(pollStartId))
} }
PollContentView( PollContentView(

6
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
View file

@ -409,7 +409,7 @@ private const val FAKE_UNIQUE_ID_2 = "FAKE_UNIQUE_ID_2"
presenter.present() presenter.present()
}.test { }.test {
val initialState = awaitFirstItem() val initialState = awaitFirstItem()
initialState.eventSink.invoke(TimelineEvents.PollAnswerSelected(AN_EVENT_ID, "anAnswerId")) initialState.eventSink.invoke(TimelineEvents.SelectPollAnswer(AN_EVENT_ID, "anAnswerId"))
} }
delay(1) delay(1)
sendPollResponseAction.verifyExecutionCount(1) sendPollResponseAction.verifyExecutionCount(1)
@ -425,7 +425,7 @@ private const val FAKE_UNIQUE_ID_2 = "FAKE_UNIQUE_ID_2"
presenter.present() presenter.present()
}.test { }.test {
val initialState = awaitFirstItem() val initialState = awaitFirstItem()
initialState.eventSink.invoke(TimelineEvents.PollEndClicked(AN_EVENT_ID)) initialState.eventSink.invoke(TimelineEvents.EndPoll(AN_EVENT_ID))
} }
delay(1) delay(1)
endPollAction.verifyExecutionCount(1) endPollAction.verifyExecutionCount(1)
@ -440,7 +440,7 @@ private const val FAKE_UNIQUE_ID_2 = "FAKE_UNIQUE_ID_2"
moleculeFlow(RecompositionMode.Immediate) { moleculeFlow(RecompositionMode.Immediate) {
presenter.present() presenter.present()
}.test { }.test {
awaitFirstItem().eventSink(TimelineEvents.PollEditClicked(AN_EVENT_ID)) awaitFirstItem().eventSink(TimelineEvents.EditPoll(AN_EVENT_ID))
assertThat(navigator.onEditPollClickedCount).isEqualTo(1) assertThat(navigator.onEditPollClickedCount).isEqualTo(1)
} }
} }

6
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollViewTest.kt
View file

@ -57,7 +57,7 @@ class TimelineItemPollViewTest {
} }
val answer = content.answerItems[answerIndex].answer val answer = content.answerItems[answerIndex].answer
rule.onNode(hasText(answer.text)).performClick() rule.onNode(hasText(answer.text)).performClick()
eventsRecorder.assertSingle(TimelineEvents.PollAnswerSelected(content.eventId!!, answer.id)) eventsRecorder.assertSingle(TimelineEvents.SelectPollAnswer(content.eventId!!, answer.id))
} }
@Test @Test
@ -74,7 +74,7 @@ class TimelineItemPollViewTest {
) )
} }
rule.clickOn(CommonStrings.action_edit_poll) rule.clickOn(CommonStrings.action_edit_poll)
eventsRecorder.assertSingle(TimelineEvents.PollEditClicked(content.eventId!!)) eventsRecorder.assertSingle(TimelineEvents.EditPoll(content.eventId!!))
} }
@Test @Test
@ -93,6 +93,6 @@ class TimelineItemPollViewTest {
// A confirmation dialog should be shown // A confirmation dialog should be shown
eventsRecorder.assertEmpty() eventsRecorder.assertEmpty()
rule.pressTag(TestTags.dialogPositive.value) rule.pressTag(TestTags.dialogPositive.value)
eventsRecorder.assertSingle(TimelineEvents.PollEndClicked(content.eventId!!)) eventsRecorder.assertSingle(TimelineEvents.EndPoll(content.eventId!!))
} }
} }