[Poll] Render ended poll and improve UI in the timeline

changelog.d/1113.wip

@@ -0,0 +1 @@
+[Polls] Improve UI and render ended state

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

@@ -21,7 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemPollContentProvider
-import io.element.android.features.poll.api.ActivePollContentView
+import io.element.android.features.poll.api.PollContentView
 import io.element.android.libraries.designsystem.preview.DayNightPreviews
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.matrix.api.poll.PollAnswer
@@ -33,10 +33,11 @@ fun TimelineItemPollView(
     onAnswerSelected: (PollAnswer) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    ActivePollContentView(
+    PollContentView(
         question = content.question,
         answerItems = content.answerItems.toImmutableList(),
         pollKind = content.pollKind,
+        isPollEnded = content.isEnded,
         onAnswerSelected = onAnswerSelected,
         modifier = modifier,
     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt

@@ -23,7 +23,7 @@ import io.element.android.features.poll.api.PollAnswerItem
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.matrix.api.poll.PollKind
+import io.element.android.libraries.matrix.api.poll.isDisclosed
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import javax.inject.Inject
 
@@ -36,18 +36,33 @@ class TimelineItemContentPollFactory @Inject constructor(
         if (!featureFlagService.isFeatureEnabled(FeatureFlags.Polls)) return TimelineItemUnknownContent
 
         // Todo Move this computation to the matrix rust sdk
-        val showResults = content.kind == PollKind.Disclosed && matrixClient.sessionId in content.votes.flatMap { it.value }
-        val pollVotesCount = content.votes.flatMap { it.value }.size
-        val userVotes = content.votes.filter { matrixClient.sessionId in it.value }.keys
+        val totalVoteCount = content.votes.flatMap { it.value }.size
+        val myVotes = content.votes.filter { matrixClient.sessionId in it.value }.keys
+        val isEndedPoll = content.endTime != null
+        val winnerIds = if (!isEndedPoll) {
+            emptyList()
+        } else {
+            content.answers
+                .map { answer -> answer.id }
+                .groupBy { answerId -> content.votes[answerId]?.size ?: 0 } // Group by votes count
+                .maxByOrNull { (votes, _) -> votes } // Keep max voted answers
+                ?.takeIf { (votes, _) -> votes > 0 } // Ignore if no option has been voted
+                ?.value
+                .orEmpty()
+        }
         val answerItems = content.answers.map { answer ->
-            val votesCount = content.votes[answer.id]?.size ?: 0
-            val progress = if (pollVotesCount > 0) votesCount.toFloat() / pollVotesCount.toFloat() else 0f
+            val answerVoteCount = content.votes[answer.id]?.size ?: 0
+            val isSelected = answer.id in myVotes
+            val isWinner = answer.id in winnerIds
+            val percentage = if (totalVoteCount > 0) answerVoteCount.toFloat() / totalVoteCount.toFloat() else 0f
             PollAnswerItem(
                 answer = answer,
-                isSelected = answer.id in userVotes,
-                isDisclosed = showResults,
-                votesCount = votesCount,
-                progress = progress,
+                isSelected = isSelected,
+                isEnabled = !isEndedPoll,
+                isWinner = isWinner,
+                isDisclosed = content.kind.isDisclosed || isEndedPoll,
+                votesCount = answerVoteCount,
+                percentage = percentage,
             )
         }
 
@@ -56,7 +71,7 @@ class TimelineItemContentPollFactory @Inject constructor(
             answerItems = answerItems,
             votes = content.votes,
             pollKind = content.kind,
-            isDisclosed = showResults
+            isEnded = isEndedPoll,
         )
     }
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContent.kt

@@ -25,7 +25,7 @@ data class TimelineItemPollContent(
     val answerItems: List<PollAnswerItem>,
     val votes: Map<String, List<UserId>>,
     val pollKind: PollKind,
-    val isDisclosed: Boolean,
+    val isEnded: Boolean,
 ) : TimelineItemEventContent {
     override val type: String = "TimelineItemPollContent"
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemPollContentProvider.kt

@@ -24,16 +24,16 @@ open class TimelineItemPollContentProvider : PreviewParameterProvider<TimelineIt
     override val values: Sequence<TimelineItemPollContent>
         get() = sequenceOf(
             aTimelineItemPollContent(),
-            aTimelineItemPollContent().copy(isDisclosed = true),
+            aTimelineItemPollContent().copy(pollKind = PollKind.Undisclosed),
         )
 }
 
 fun aTimelineItemPollContent(): TimelineItemPollContent {
     return TimelineItemPollContent(
         pollKind = PollKind.Disclosed,
-        isDisclosed = false,
         question = "What type of food should we have at the party?",
         answerItems = aPollAnswerItemList(),
+        isEnded = false,
         votes = emptyMap(),
     )
 }

features/poll/api/build.gradle.kts

@@ -27,8 +27,6 @@ dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.uiStrings)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.constraintlayout.compose)
     implementation(projects.libraries.matrix.api)
 
     ksp(libs.showkase.processor)

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

@@ -23,14 +23,18 @@ import io.element.android.libraries.matrix.api.poll.PollAnswer
  *
  * @property answer the poll answer.
  * @property isSelected whether the user has selected this answer.
+ * @property isEnabled whether the answer can be voted.
+ * @property isWinner whether this is the winner answer in the poll.
  * @property isDisclosed whether the votes for this answer should be disclosed.
  * @property votesCount the number of votes for this answer.
- * @property progress the percentage of votes for this answer.
+ * @property percentage the percentage of votes for this answer.
  */
 data class PollAnswerItem(
     val answer: PollAnswer,
     val isSelected: Boolean,
+    val isEnabled: Boolean,
+    val isWinner: Boolean,
     val isDisclosed: Boolean,
     val votesCount: Int,
-    val progress: Float,
+    val percentage: Float,
 )