Rename some fun regarding polls

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

@@ -38,11 +38,11 @@ fun TimelineItemPollView(
         eventSink(TimelineEvents.SelectPollAnswer(pollStartId, answerId))
     }
 
-    fun onPollEnd(pollStartId: EventId) {
+    fun onEndPoll(pollStartId: EventId) {
         eventSink(TimelineEvents.EndPoll(pollStartId))
     }
 
-    fun onPollEdit(pollStartId: EventId) {
+    fun onEditPoll(pollStartId: EventId) {
         eventSink(TimelineEvents.EditPoll(pollStartId))
     }
 
@@ -55,8 +55,8 @@ fun TimelineItemPollView(
         isPollEditable = content.isEditable,
         isMine = content.isMine,
         onSelectAnswer = ::onSelectAnswer,
-        onPollEdit = ::onPollEdit,
-        onPollEnd = ::onPollEnd,
+        onEditPoll = ::onEditPoll,
+        onEndPoll = ::onEndPoll,
         modifier = modifier,
     )
 }

features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt

@@ -53,8 +53,8 @@ import kotlinx.collections.immutable.ImmutableList
 fun PollContentView(
     state: PollContentState,
     onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
-    onPollEdit: (pollStartId: EventId) -> Unit,
-    onPollEnd: (pollStartId: EventId) -> Unit,
+    onEditPoll: (pollStartId: EventId) -> Unit,
+    onEndPoll: (pollStartId: EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     PollContentView(
@@ -65,9 +65,9 @@ fun PollContentView(
         isPollEditable = state.isPollEditable,
         isPollEnded = state.isPollEnded,
         isMine = state.isMine,
-        onPollEdit = onPollEdit,
+        onEditPoll = onEditPoll,
         onSelectAnswer = onSelectAnswer,
-        onPollEnd = onPollEnd,
+        onEndPoll = onEndPoll,
         modifier = modifier,
     )
 }
@@ -82,8 +82,8 @@ fun PollContentView(
     isPollEnded: Boolean,
     isMine: Boolean,
     onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
-    onPollEdit: (pollStartId: EventId) -> Unit,
-    onPollEnd: (pollStartId: EventId) -> Unit,
+    onEditPoll: (pollStartId: EventId) -> Unit,
+    onEndPoll: (pollStartId: EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val votesCount = remember(answerItems) { answerItems.sumOf { it.votesCount } }
@@ -92,12 +92,12 @@ fun PollContentView(
         eventId?.let { onSelectAnswer(it, pollAnswer.id) }
     }
 
-    fun onPollEdit() {
-        eventId?.let { onPollEdit(it) }
+    fun onEditPoll() {
+        eventId?.let { onEditPoll(it) }
     }
 
-    fun onPollEnd() {
-        eventId?.let { onPollEnd(it) }
+    fun onEndPoll() {
+        eventId?.let { onEndPoll(it) }
     }
 
     var showConfirmation: Boolean by remember { mutableStateOf(false) }
@@ -106,7 +106,7 @@ fun PollContentView(
         ConfirmationDialog(
             content = stringResource(id = CommonStrings.common_poll_end_confirmation),
             onSubmitClick = {
-                onPollEnd()
+                onEndPoll()
                 showConfirmation = false
             },
             onDismiss = { showConfirmation = false },
@@ -131,8 +131,8 @@ fun PollContentView(
             CreatorView(
                 isPollEnded = isPollEnded,
                 isPollEditable = isPollEditable,
-                onPollEdit = ::onPollEdit,
-                onPollEnd = { showConfirmation = true },
+                onEditPoll = ::onEditPoll,
+                onEndPoll = { showConfirmation = true },
                 modifier = Modifier.fillMaxWidth(),
             )
         }
@@ -219,21 +219,21 @@ private fun ColumnScope.UndisclosedPollBottomNotice() {
 private fun CreatorView(
     isPollEnded: Boolean,
     isPollEditable: Boolean,
-    onPollEdit: () -> Unit,
-    onPollEnd: () -> Unit,
+    onEditPoll: () -> Unit,
+    onEndPoll: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     when {
         isPollEditable ->
             Button(
                 text = stringResource(id = CommonStrings.action_edit_poll),
-                onClick = onPollEdit,
+                onClick = onEditPoll,
                 modifier = modifier,
             )
         !isPollEnded ->
             Button(
                 text = stringResource(id = CommonStrings.action_end_poll),
-                onClick = onPollEnd,
+                onClick = onEndPoll,
                 modifier = modifier,
             )
     }
@@ -251,8 +251,8 @@ internal fun PollContentViewUndisclosedPreview() = ElementPreview {
         isPollEditable = false,
         isMine = false,
         onSelectAnswer = { _, _ -> },
-        onPollEdit = {},
-        onPollEnd = {},
+        onEditPoll = {},
+        onEndPoll = {},
     )
 }
 
@@ -268,8 +268,8 @@ internal fun PollContentViewDisclosedPreview() = ElementPreview {
         isPollEditable = false,
         isMine = false,
         onSelectAnswer = { _, _ -> },
-        onPollEdit = {},
-        onPollEnd = {},
+        onEditPoll = {},
+        onEndPoll = {},
     )
 }
 
@@ -285,8 +285,8 @@ internal fun PollContentViewEndedPreview() = ElementPreview {
         isPollEditable = false,
         isMine = false,
         onSelectAnswer = { _, _ -> },
-        onPollEdit = {},
-        onPollEnd = {},
+        onEditPoll = {},
+        onEndPoll = {},
     )
 }
 
@@ -302,8 +302,8 @@ internal fun PollContentViewCreatorEditablePreview() = ElementPreview {
         isPollEditable = true,
         isMine = true,
         onSelectAnswer = { _, _ -> },
-        onPollEdit = {},
-        onPollEnd = {},
+        onEditPoll = {},
+        onEndPoll = {},
     )
 }
 
@@ -319,8 +319,8 @@ internal fun PollContentViewCreatorPreview() = ElementPreview {
         isPollEditable = false,
         isMine = true,
         onSelectAnswer = { _, _ -> },
-        onPollEdit = {},
-        onPollEnd = {},
+        onEditPoll = {},
+        onEndPoll = {},
     )
 }
 
@@ -336,7 +336,7 @@ internal fun PollContentViewCreatorEndedPreview() = ElementPreview {
         isPollEditable = false,
         isMine = true,
         onSelectAnswer = { _, _ -> },
-        onPollEdit = {},
-        onPollEnd = {},
+        onEditPoll = {},
+        onEndPoll = {},
     )
 }

features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt

@@ -78,7 +78,7 @@ fun PollHistoryView(
         state.eventSink(PollHistoryEvents.PollAnswerSelected(pollStartId, answerId))
     }
 
-    fun onPollEnd(pollStartId: EventId) {
+    fun onEndPoll(pollStartId: EventId) {
         state.eventSink(PollHistoryEvents.PollEndClicked(pollStartId))
     }
 
@@ -129,8 +129,8 @@ fun PollHistoryView(
                     hasMoreToLoad = state.hasMoreToLoad,
                     isLoading = state.isLoading,
                     onSelectAnswer = ::onSelectAnswer,
-                    onPollEdit = onEditPoll,
-                    onPollEnd = ::onPollEnd,
+                    onEditPoll = onEditPoll,
+                    onEndPoll = ::onEndPoll,
                     onLoadMore = ::onLoadMore,
                     modifier = Modifier.fillMaxSize(),
                 )
@@ -166,8 +166,8 @@ private fun PollHistoryList(
     hasMoreToLoad: Boolean,
     isLoading: Boolean,
     onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
-    onPollEdit: (pollStartId: EventId) -> Unit,
-    onPollEnd: (pollStartId: EventId) -> Unit,
+    onEditPoll: (pollStartId: EventId) -> Unit,
+    onEndPoll: (pollStartId: EventId) -> Unit,
     onLoadMore: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -181,8 +181,8 @@ private fun PollHistoryList(
             PollHistoryItemRow(
                 pollHistoryItem = pollHistoryItem,
                 onSelectAnswer = onSelectAnswer,
-                onPollEdit = onPollEdit,
-                onPollEnd = onPollEnd,
+                onEditPoll = onEditPoll,
+                onEndPoll = onEndPoll,
                 modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
             )
         }
@@ -233,8 +233,8 @@ private fun LoadMoreButton(isLoading: Boolean, onClick: () -> Unit) {
 private fun PollHistoryItemRow(
     pollHistoryItem: PollHistoryItem,
     onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
-    onPollEdit: (pollStartId: EventId) -> Unit,
-    onPollEnd: (pollStartId: EventId) -> Unit,
+    onEditPoll: (pollStartId: EventId) -> Unit,
+    onEndPoll: (pollStartId: EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Surface(
@@ -252,8 +252,8 @@ private fun PollHistoryItemRow(
             PollContentView(
                 state = pollHistoryItem.state,
                 onSelectAnswer = onSelectAnswer,
-                onPollEdit = onPollEdit,
-                onPollEnd = onPollEnd,
+                onEditPoll = onEditPoll,
+                onEndPoll = onEndPoll,
             )
         }
     }