mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Rename Event of PollHistoryEvents
This commit is contained in:
+3
-3
@@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.core.EventId
|
|||||||
|
|
||||||
sealed interface PollHistoryEvents {
|
sealed interface PollHistoryEvents {
|
||||||
data object LoadMore : PollHistoryEvents
|
data object LoadMore : PollHistoryEvents
|
||||||
data class PollAnswerSelected(val pollStartId: EventId, val answerId: String) : PollHistoryEvents
|
data class SelectPollAnswer(val pollStartId: EventId, val answerId: String) : PollHistoryEvents
|
||||||
data class PollEndClicked(val pollStartId: EventId) : PollHistoryEvents
|
data class EndPoll(val pollStartId: EventId) : PollHistoryEvents
|
||||||
data class OnFilterSelected(val filter: PollHistoryFilter) : PollHistoryEvents
|
data class SelectFilter(val filter: PollHistoryFilter) : PollHistoryEvents
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -73,13 +73,13 @@ class PollHistoryPresenter @Inject constructor(
|
|||||||
is PollHistoryEvents.LoadMore -> {
|
is PollHistoryEvents.LoadMore -> {
|
||||||
coroutineScope.loadMore(timeline)
|
coroutineScope.loadMore(timeline)
|
||||||
}
|
}
|
||||||
is PollHistoryEvents.PollAnswerSelected -> appCoroutineScope.launch {
|
is PollHistoryEvents.SelectPollAnswer -> appCoroutineScope.launch {
|
||||||
sendPollResponseAction.execute(pollStartId = event.pollStartId, answerId = event.answerId)
|
sendPollResponseAction.execute(pollStartId = event.pollStartId, answerId = event.answerId)
|
||||||
}
|
}
|
||||||
is PollHistoryEvents.PollEndClicked -> appCoroutineScope.launch {
|
is PollHistoryEvents.EndPoll -> appCoroutineScope.launch {
|
||||||
endPollAction.execute(pollStartId = event.pollStartId)
|
endPollAction.execute(pollStartId = event.pollStartId)
|
||||||
}
|
}
|
||||||
is PollHistoryEvents.OnFilterSelected -> {
|
is PollHistoryEvents.SelectFilter -> {
|
||||||
activeFilter = event.filter
|
activeFilter = event.filter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -75,11 +75,11 @@ fun PollHistoryView(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun onSelectAnswer(pollStartId: EventId, answerId: String) {
|
fun onSelectAnswer(pollStartId: EventId, answerId: String) {
|
||||||
state.eventSink(PollHistoryEvents.PollAnswerSelected(pollStartId, answerId))
|
state.eventSink(PollHistoryEvents.SelectPollAnswer(pollStartId, answerId))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onEndPoll(pollStartId: EventId) {
|
fun onEndPoll(pollStartId: EventId) {
|
||||||
state.eventSink(PollHistoryEvents.PollEndClicked(pollStartId))
|
state.eventSink(PollHistoryEvents.EndPoll(pollStartId))
|
||||||
}
|
}
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
@@ -111,7 +111,7 @@ fun PollHistoryView(
|
|||||||
}
|
}
|
||||||
PollHistoryFilterButtons(
|
PollHistoryFilterButtons(
|
||||||
activeFilter = state.activeFilter,
|
activeFilter = state.activeFilter,
|
||||||
onSelectFilter = { state.eventSink(PollHistoryEvents.OnFilterSelected(it)) },
|
onSelectFilter = { state.eventSink(PollHistoryEvents.SelectFilter(it)) },
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
|
|||||||
+4
-4
@@ -99,12 +99,12 @@ class PollHistoryPresenterTest {
|
|||||||
}.test {
|
}.test {
|
||||||
awaitItem().also { state ->
|
awaitItem().also { state ->
|
||||||
assertThat(state.activeFilter).isEqualTo(PollHistoryFilter.ONGOING)
|
assertThat(state.activeFilter).isEqualTo(PollHistoryFilter.ONGOING)
|
||||||
state.eventSink(PollHistoryEvents.OnFilterSelected(PollHistoryFilter.PAST))
|
state.eventSink(PollHistoryEvents.SelectFilter(PollHistoryFilter.PAST))
|
||||||
}
|
}
|
||||||
skipItems(1)
|
skipItems(1)
|
||||||
awaitItem().also { state ->
|
awaitItem().also { state ->
|
||||||
assertThat(state.activeFilter).isEqualTo(PollHistoryFilter.PAST)
|
assertThat(state.activeFilter).isEqualTo(PollHistoryFilter.PAST)
|
||||||
state.eventSink(PollHistoryEvents.OnFilterSelected(PollHistoryFilter.ONGOING))
|
state.eventSink(PollHistoryEvents.SelectFilter(PollHistoryFilter.ONGOING))
|
||||||
}
|
}
|
||||||
awaitItem().also { state ->
|
awaitItem().also { state ->
|
||||||
assertThat(state.activeFilter).isEqualTo(PollHistoryFilter.ONGOING)
|
assertThat(state.activeFilter).isEqualTo(PollHistoryFilter.ONGOING)
|
||||||
@@ -125,10 +125,10 @@ class PollHistoryPresenterTest {
|
|||||||
presenter.present()
|
presenter.present()
|
||||||
}.test {
|
}.test {
|
||||||
val state = awaitItem()
|
val state = awaitItem()
|
||||||
state.eventSink(PollHistoryEvents.PollEndClicked(AN_EVENT_ID))
|
state.eventSink(PollHistoryEvents.EndPoll(AN_EVENT_ID))
|
||||||
runCurrent()
|
runCurrent()
|
||||||
endPollAction.verifyExecutionCount(1)
|
endPollAction.verifyExecutionCount(1)
|
||||||
state.eventSink(PollHistoryEvents.PollAnswerSelected(AN_EVENT_ID, "answer"))
|
state.eventSink(PollHistoryEvents.SelectPollAnswer(AN_EVENT_ID, "answer"))
|
||||||
runCurrent()
|
runCurrent()
|
||||||
sendPollResponseAction.verifyExecutionCount(1)
|
sendPollResponseAction.verifyExecutionCount(1)
|
||||||
cancelAndConsumeRemainingEvents()
|
cancelAndConsumeRemainingEvents()
|
||||||
|
|||||||
+3
-3
@@ -114,7 +114,7 @@ class PollHistoryViewTest {
|
|||||||
eventsRecorder.assertEmpty()
|
eventsRecorder.assertEmpty()
|
||||||
rule.clickOn(CommonStrings.action_ok)
|
rule.clickOn(CommonStrings.action_ok)
|
||||||
eventsRecorder.assertSingle(
|
eventsRecorder.assertSingle(
|
||||||
PollHistoryEvents.PollEndClicked(eventId)
|
PollHistoryEvents.EndPoll(eventId)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ class PollHistoryViewTest {
|
|||||||
)
|
)
|
||||||
rule.onNodeWithText(answer.text).performClick()
|
rule.onNodeWithText(answer.text).performClick()
|
||||||
eventsRecorder.assertSingle(
|
eventsRecorder.assertSingle(
|
||||||
PollHistoryEvents.PollAnswerSelected(eventId, answer.id)
|
PollHistoryEvents.SelectPollAnswer(eventId, answer.id)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,7 +156,7 @@ class PollHistoryViewTest {
|
|||||||
)
|
)
|
||||||
rule.clickOn(R.string.screen_polls_history_filter_past)
|
rule.clickOn(R.string.screen_polls_history_filter_past)
|
||||||
eventsRecorder.assertSingle(
|
eventsRecorder.assertSingle(
|
||||||
PollHistoryEvents.OnFilterSelected(filter = PollHistoryFilter.PAST)
|
PollHistoryEvents.SelectFilter(filter = PollHistoryFilter.PAST)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user