ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do some renaming now that user can select multiple answers per poll

Browse Source
This commit is contained in:
Benoit Marty
2026-08-31 15:45:14 +02:00
parent 0ad3ab1d9d
commit 012c5a1f81
12 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryEvent.kt
+1 -1
View File
@@ -13,7 +13,7 @@ import io.element.android.libraries.matrix.api.core.EventId
sealed interface PollHistoryEvent {
data object LoadMore : PollHistoryEvent
data class SelectPollAnswer(val pollStartId: EventId, val answerIds: List<String>) : PollHistoryEvent
data class SendPollResponse(val pollStartId: EventId, val answerIds: List<String>) : PollHistoryEvent
data class EndPoll(val pollStartId: EventId) : PollHistoryEvent
data class SelectFilter(val filter: PollHistoryFilter) : PollHistoryEvent
}
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
+1 -1
View File
@@ -69,7 +69,7 @@ class PollHistoryPresenter(
is PollHistoryEvent.LoadMore -> {
coroutineScope.loadMore(timeline)
}
is PollHistoryEvent.SelectPollAnswer -> sessionCoroutineScope.launch {
is PollHistoryEvent.SendPollResponse -> sessionCoroutineScope.launch {
sendPollResponseAction.execute(
timeline = timeline,
pollStartId = event.pollStartId,
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
+7 -7
View File
@@ -65,8 +65,8 @@ fun PollHistoryView(
state.eventSink(PollHistoryEvent.LoadMore)
}
fun onSelectAnswer(pollStartId: EventId, answerIds: List<String>) {
state.eventSink(PollHistoryEvent.SelectPollAnswer(pollStartId, answerIds))
fun onSendPollResponse(pollStartId: EventId, answerIds: List<String>) {
state.eventSink(PollHistoryEvent.SendPollResponse(pollStartId, answerIds))
}
fun onEndPoll(pollStartId: EventId) {
@@ -114,7 +114,7 @@ fun PollHistoryView(
pollHistoryItems = pollHistoryItems,
hasMoreToLoad = state.hasMoreToLoad,
isLoading = state.isLoading,
onSelectAnswer = ::onSelectAnswer,
onSendPollResponse = ::onSendPollResponse,
onEditPoll = onEditPoll,
onEndPoll = ::onEndPoll,
onLoadMore = ::onLoadMore,
@@ -151,7 +151,7 @@ private fun PollHistoryList(
pollHistoryItems: ImmutableList<PollHistoryItem>,
hasMoreToLoad: Boolean,
isLoading: Boolean,
onSelectAnswer: (pollStartId: EventId, answerIds: List<String>) -> Unit,
onSendPollResponse: (pollStartId: EventId, answerIds: List<String>) -> Unit,
onEditPoll: (pollStartId: EventId) -> Unit,
onEndPoll: (pollStartId: EventId) -> Unit,
onLoadMore: () -> Unit,
@@ -166,7 +166,7 @@ private fun PollHistoryList(
items(pollHistoryItems) { pollHistoryItem ->
PollHistoryItemRow(
pollHistoryItem = pollHistoryItem,
onSelectAnswer = onSelectAnswer,
onSendPollResponse = onSendPollResponse,
onEditPoll = onEditPoll,
onEndPoll = onEndPoll,
modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
@@ -222,7 +222,7 @@ private fun LoadMoreButton(isLoading: Boolean, onClick: () -> Unit) {
@Composable
private fun PollHistoryItemRow(
pollHistoryItem: PollHistoryItem,
onSelectAnswer: (pollStartId: EventId, answerIds: List<String>) -> Unit,
onSendPollResponse: (pollStartId: EventId, answerIds: List<String>) -> Unit,
onEditPoll: (pollStartId: EventId) -> Unit,
onEndPoll: (pollStartId: EventId) -> Unit,
modifier: Modifier = Modifier,
@@ -244,7 +244,7 @@ private fun PollHistoryItemRow(
Spacer(modifier = Modifier.height(4.dp))
PollContentView(
state = pollHistoryItem.state,
onSelectAnswer = onSelectAnswer,
onSendPollResponse = onSendPollResponse,
onEditPoll = onEditPoll,
onEndPoll = onEndPoll,
)
features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
+1 -1
View File
@@ -117,7 +117,7 @@ class PollHistoryPresenterTest {
state.eventSink(PollHistoryEvent.EndPoll(AN_EVENT_ID))
runCurrent()
endPollAction.verifyExecutionCount(1)
state.eventSink(PollHistoryEvent.SelectPollAnswer(AN_EVENT_ID, listOf("answer")))
state.eventSink(PollHistoryEvent.SendPollResponse(AN_EVENT_ID, listOf("answer")))
runCurrent()
sendPollResponseAction.verifyExecutionCount(1)
cancelAndConsumeRemainingEvents()
features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryViewTest.kt
+1 -1
View File
@@ -133,7 +133,7 @@ class PollHistoryViewTest : RobolectricTest() {
useUnmergedTree = true,
).performClick()
eventsRecorder.assertSingle(
PollHistoryEvent.SelectPollAnswer(eventId, listOf(answer.id))
PollHistoryEvent.SendPollResponse(eventId, listOf(answer.id))
)
}