Merge branch 'develop' into feature/bma/dataObject

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/ActivePollContentView.kt

@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.poll.api
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.BarChart
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import io.element.android.libraries.designsystem.preview.DayNightPreviews
-import io.element.android.libraries.designsystem.preview.ElementPreview
-import io.element.android.libraries.designsystem.theme.components.Icon
-import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.matrix.api.poll.PollAnswer
-import io.element.android.libraries.matrix.api.poll.PollKind
-import io.element.android.libraries.theme.ElementTheme
-import io.element.android.libraries.ui.strings.CommonStrings
-import kotlinx.collections.immutable.ImmutableList
-
-@Composable
-fun ActivePollContentView(
-    question: String,
-    answerItems: ImmutableList<PollAnswerItem>,
-    pollKind: PollKind,
-    onAnswerSelected: (PollAnswer) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    val showResults = answerItems.any { it.isSelected }
-    Column(
-        modifier = modifier
-            .selectableGroup()
-            .fillMaxWidth(),
-        verticalArrangement = Arrangement.spacedBy(16.dp),
-    ) {
-        Row(
-            horizontalArrangement = Arrangement.spacedBy(4.dp),
-        ) {
-            Icon(imageVector = Icons.Default.BarChart, contentDescription = null)
-            Text(
-                text = question,
-                style = ElementTheme.typography.fontBodyLgMedium
-            )
-        }
-
-        answerItems.forEach { answerItem ->
-            PollAnswerView(
-                answerItem = answerItem,
-                onClick = { onAnswerSelected(answerItem.answer) }
-            )
-        }
-
-        val votesCount = answerItems.sumOf { it.votesCount }
-        when {
-            pollKind == PollKind.Undisclosed -> {
-                Text(
-                    modifier = Modifier
-                        .align(Alignment.Start)
-                        .padding(start = 32.dp),
-                    style = ElementTheme.typography.fontBodyXsRegular,
-                    color = ElementTheme.colors.textSecondary,
-                    text = stringResource(CommonStrings.common_poll_undisclosed_text),
-                )
-            }
-            showResults -> {
-                Text(
-                    modifier = Modifier.align(Alignment.End),
-                    style = ElementTheme.typography.fontBodyXsRegular,
-                    color = ElementTheme.colors.textSecondary,
-                    text = stringResource(CommonStrings.common_poll_total_votes, votesCount),
-                )
-            }
-        }
-    }
-}
-
-@DayNightPreviews
-@Composable
-internal fun ActivePollContentNoResultsPreview() = ElementPreview {
-    ActivePollContentView(
-        question = "What type of food should we have at the party?",
-        answerItems = aPollAnswerItemList(isDisclosed = false),
-        pollKind = PollKind.Undisclosed,
-        onAnswerSelected = { },
-    )
-}
-
-@DayNightPreviews
-@Composable
-internal fun ActivePollContentWithResultsPreview() = ElementPreview {
-    ActivePollContentView(
-        question = "What type of food should we have at the party?",
-        answerItems = aPollAnswerItemList(),
-        pollKind = PollKind.Disclosed,
-        onAnswerSelected = { },
-    )
-}

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,
 )

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

@@ -16,110 +16,166 @@
 
 package io.element.android.features.poll.api
 
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.selection.selectable
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.RadioButtonUnchecked
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.constraintlayout.compose.ConstraintLayout
-import androidx.constraintlayout.compose.Dimension
-import androidx.constraintlayout.compose.Visibility
-import io.element.android.libraries.designsystem.preview.DayNightPreviews
-import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.ElementThemedPreview
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconToggleButton
 import io.element.android.libraries.designsystem.theme.components.LinearProgressIndicator
-import io.element.android.libraries.designsystem.theme.components.RadioButton
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.toEnabledColor
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonPlurals
 
-@Suppress("DestructuringDeclarationWithTooManyEntries") // This is necessary to declare the constraints ids
 @Composable
 fun PollAnswerView(
     answerItem: PollAnswerItem,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    ConstraintLayout(
+    Row(
         modifier
-            .wrapContentHeight()
             .fillMaxWidth()
             .selectable(
                 selected = answerItem.isSelected,
+                enabled = answerItem.isEnabled,
                 onClick = onClick,
                 role = Role.RadioButton,
             )
     ) {
-        val (radioButton, answerText, votesText, progressBar) = createRefs()
-        RadioButton(
-            modifier = Modifier.constrainAs(radioButton) {
-                top.linkTo(answerText.top)
-                bottom.linkTo(answerText.bottom)
-                start.linkTo(parent.start)
-                end.linkTo(answerText.start)
-            },
-            selected = answerItem.isSelected,
-            onClick = null // null recommended for accessibility with screenreaders
-        )
-        Text(
-            modifier = Modifier.constrainAs(answerText) {
-                width = Dimension.fillToConstraints
-                top.linkTo(parent.top)
-                start.linkTo(radioButton.end, margin = 8.dp)
-                end.linkTo(votesText.start)
-                bottom.linkTo(progressBar.top)
-            },
-            text = answerItem.answer.text,
-        )
-        Text(
-            modifier = Modifier.constrainAs(votesText) {
-                start.linkTo(answerText.end)
-                end.linkTo(parent.end)
-                bottom.linkTo(answerText.bottom)
-                visibility = if (answerItem.isDisclosed) Visibility.Visible else Visibility.Gone
-            },
-            text = pluralStringResource(
-                id = CommonPlurals.common_poll_votes_count,
-                count = answerItem.votesCount,
-                answerItem.votesCount
+        IconToggleButton(
+            modifier = Modifier.size(22.dp),
+            checked = answerItem.isSelected,
+            enabled = answerItem.isEnabled,
+            colors = IconButtonDefaults.iconToggleButtonColors(
+                contentColor = ElementTheme.colors.iconSecondary,
+                checkedContentColor = ElementTheme.colors.iconPrimary,
+                disabledContentColor = ElementTheme.colors.iconDisabled,
             ),
-            style = ElementTheme.typography.fontBodySmRegular,
-            color = ElementTheme.colors.textSecondary,
-        )
-        LinearProgressIndicator(
-            progress = answerItem.progress,
-            modifier = Modifier
-                .constrainAs(progressBar) {
-                    start.linkTo(answerText.start)
-                    end.linkTo(votesText.end)
-                    top.linkTo(answerText.bottom, margin = 10.dp)
-                    bottom.linkTo(parent.bottom)
-                    width = Dimension.fillToConstraints
-                    visibility = if (answerItem.isDisclosed) Visibility.Visible else Visibility.Gone
-
+            onCheckedChange = { onClick() },
+        ) {
+            Icon(
+                imageVector = if (answerItem.isSelected) {
+                    Icons.Default.CheckCircle
+                } else {
+                    Icons.Default.RadioButtonUnchecked
                 },
-            strokeCap = StrokeCap.Round,
-        )
+                contentDescription = null,
+            )
+        }
+        Spacer(modifier = Modifier.width(12.dp))
+        Column {
+            Row {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = answerItem.answer.text,
+                    style = if (answerItem.isWinner) ElementTheme.typography.fontBodyLgMedium else ElementTheme.typography.fontBodyLgRegular,
+                )
+                if (answerItem.isDisclosed) {
+                    Text(
+                        modifier = Modifier.align(Alignment.Bottom),
+                        text = pluralStringResource(
+                            id = CommonPlurals.common_poll_votes_count,
+                            count = answerItem.votesCount,
+                            answerItem.votesCount
+                        ),
+                        style = if (answerItem.isWinner) ElementTheme.typography.fontBodySmMedium else ElementTheme.typography.fontBodySmRegular,
+                        color = if (answerItem.isWinner) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
+                    )
+                }
+            }
+            Spacer(modifier = Modifier.height(10.dp))
+            LinearProgressIndicator(
+                modifier = Modifier.fillMaxWidth(),
+                color = if (answerItem.isWinner) ElementTheme.colors.textSuccessPrimary else answerItem.isEnabled.toEnabledColor(),
+                progress = when {
+                    answerItem.isDisclosed -> answerItem.percentage
+                    answerItem.isSelected -> 1f
+                    else -> 0f
+                },
+                strokeCap = StrokeCap.Round,
+            )
+        }
     }
 }
 
-@DayNightPreviews
+@Preview
 @Composable
-internal fun PollAnswerViewNoResultsPreview() = ElementPreview {
+internal fun PollAnswerDisclosedNotSelectedPreview() = ElementThemedPreview {
     PollAnswerView(
-        answerItem = aPollAnswerItem(),
+        answerItem = aPollAnswerItem(isDisclosed = true, isSelected = false),
         onClick = { },
     )
 }
 
-@DayNightPreviews
+@Preview
 @Composable
-internal fun PollAnswerViewWithResultPreview() = ElementPreview {
+internal fun PollAnswerDisclosedSelectedPreview() = ElementThemedPreview {
     PollAnswerView(
-        answerItem = aPollAnswerItem(isDisclosed = true),
+        answerItem = aPollAnswerItem(isDisclosed = true, isSelected = true),
+        onClick = { }
+    )
+}
+
+@Preview
+@Composable
+internal fun PollAnswerUndisclosedNotSelectedPreview() = ElementThemedPreview {
+    PollAnswerView(
+        answerItem = aPollAnswerItem(isDisclosed = false, isSelected = false),
+        onClick = { },
+    )
+}
+
+@Preview
+@Composable
+internal fun PollAnswerUndisclosedSelectedPreview() = ElementThemedPreview {
+    PollAnswerView(
+        answerItem = aPollAnswerItem(isDisclosed = false, isSelected = true),
+        onClick = { }
+    )
+}
+
+@Preview
+@Composable
+internal fun PollAnswerEndedWinnerNotSelectedPreview() = ElementThemedPreview {
+    PollAnswerView(
+        answerItem = aPollAnswerItem(isDisclosed = true, isSelected = false, isEnabled = false, isWinner = true),
+        onClick = { }
+    )
+}
+
+@Preview
+@Composable
+internal fun PollAnswerEndedWinnerSelectedPreview() = ElementThemedPreview {
+    PollAnswerView(
+        answerItem = aPollAnswerItem(isDisclosed = true, isSelected = true, isEnabled = false, isWinner = true),
+        onClick = { }
+    )
+}
+
+@Preview
+@Composable
+internal fun PollAnswerEndedSelectedPreview() = ElementThemedPreview {
+    PollAnswerView(
+        answerItem = aPollAnswerItem(isDisclosed = true, isSelected = true, isEnabled = false, isWinner = false),
         onClick = { }
     )
 }

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

@@ -19,27 +19,33 @@ package io.element.android.features.poll.api
 import io.element.android.libraries.matrix.api.poll.PollAnswer
 import kotlinx.collections.immutable.persistentListOf
 
-fun aPollAnswerItemList(isDisclosed: Boolean = true) = persistentListOf(
+fun aPollAnswerItemList(isEnded: Boolean = false, isDisclosed: Boolean = true) = persistentListOf(
     aPollAnswerItem(
         answer = PollAnswer("option_1", "Italian \uD83C\uDDEE\uD83C\uDDF9"),
         isDisclosed = isDisclosed,
+        isEnabled = !isEnded,
+        isWinner = isEnded,
         votesCount = 5,
-        progress = 0.5f
+        percentage = 0.5f
     ),
     aPollAnswerItem(
         answer = PollAnswer("option_2", "Chinese \uD83C\uDDE8\uD83C\uDDF3"),
         isDisclosed = isDisclosed,
+        isEnabled = !isEnded,
+        isWinner = false,
         votesCount = 0,
-        progress = 0f
+        percentage = 0f
     ),
     aPollAnswerItem(
         answer = PollAnswer("option_3", "Brazilian \uD83C\uDDE7\uD83C\uDDF7"),
         isDisclosed = isDisclosed,
+        isEnabled = !isEnded,
+        isWinner = false,
         isSelected = true,
         votesCount = 1,
-        progress = 0.1f
+        percentage = 0.1f
     ),
-    aPollAnswerItem(isDisclosed = isDisclosed),
+    aPollAnswerItem(isDisclosed = isDisclosed, isEnabled = !isEnded),
 )
 
 fun aPollAnswerItem(
@@ -48,13 +54,17 @@ fun aPollAnswerItem(
         "French \uD83C\uDDEB\uD83C\uDDF7 But make it a very very very long option then this should just keep expanding"
     ),
     isSelected: Boolean = false,
+    isEnabled: Boolean = true,
+    isWinner: Boolean = false,
     isDisclosed: Boolean = true,
     votesCount: Int = 4,
-    progress: Float = 0.4f,
+    percentage: Float = 0.4f,
 ) = PollAnswerItem(
     answer = answer,
     isSelected = isSelected,
+    isEnabled = isEnabled,
+    isWinner = isWinner,
     isDisclosed = isDisclosed,
     votesCount = votesCount,
-    progress = progress
+    percentage = percentage
 )

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

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.poll.api
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Poll
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import io.element.android.libraries.designsystem.preview.DayNightPreviews
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.matrix.api.poll.PollAnswer
+import io.element.android.libraries.matrix.api.poll.PollKind
+import io.element.android.libraries.theme.ElementTheme
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.collections.immutable.ImmutableList
+
+@Composable
+fun PollContentView(
+    question: String,
+    answerItems: ImmutableList<PollAnswerItem>,
+    pollKind: PollKind,
+    isPollEnded: Boolean,
+    onAnswerSelected: (PollAnswer) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .selectableGroup()
+            .fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        PollTitle(title = question)
+
+        PollAnswers(answerItems = answerItems, onAnswerSelected = onAnswerSelected)
+
+        when {
+            isPollEnded || pollKind == PollKind.Disclosed -> DisclosedPollBottomNotice(answerItems)
+            pollKind == PollKind.Undisclosed -> UndisclosedPollBottomNotice()
+        }
+    }
+}
+
+@Composable
+internal fun PollTitle(
+    title: String,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Icon(
+            modifier = Modifier.size(22.dp),
+            imageVector = Icons.Outlined.Poll,
+            contentDescription = null
+        )
+        Text(
+            text = title,
+            style = ElementTheme.typography.fontBodyLgMedium
+        )
+    }
+}
+
+@Composable
+internal fun PollAnswers(
+    answerItems: ImmutableList<PollAnswerItem>,
+    onAnswerSelected: (PollAnswer) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+
+    answerItems.forEach { answerItem ->
+        PollAnswerView(
+            modifier = modifier,
+            answerItem = answerItem,
+            onClick = { onAnswerSelected(answerItem.answer) }
+        )
+    }
+}
+
+@Composable
+internal fun ColumnScope.DisclosedPollBottomNotice(
+    answerItems: ImmutableList<PollAnswerItem>,
+    modifier: Modifier = Modifier
+) {
+    val votesCount = answerItems.sumOf { it.votesCount }
+    Text(
+        modifier = modifier.align(Alignment.End),
+        style = ElementTheme.typography.fontBodyXsRegular,
+        color = ElementTheme.colors.textSecondary,
+        text = stringResource(CommonStrings.common_poll_total_votes, votesCount),
+    )
+}
+
+@Composable
+fun ColumnScope.UndisclosedPollBottomNotice(modifier: Modifier = Modifier) {
+    Text(
+        modifier = modifier
+            .align(Alignment.Start)
+            .padding(start = 34.dp),
+        style = ElementTheme.typography.fontBodyXsRegular,
+        color = ElementTheme.colors.textSecondary,
+        text = stringResource(CommonStrings.common_poll_undisclosed_text),
+    )
+}
+
+@DayNightPreviews
+@Composable
+internal fun PollContentUndisclosedPreview() = ElementPreview {
+    PollContentView(
+        question = "What type of food should we have at the party?",
+        answerItems = aPollAnswerItemList(isDisclosed = false),
+        pollKind = PollKind.Undisclosed,
+        isPollEnded = false,
+        onAnswerSelected = { },
+    )
+}
+
+@DayNightPreviews
+@Composable
+internal fun PollContentDisclosedPreview() = ElementPreview {
+    PollContentView(
+        question = "What type of food should we have at the party?",
+        answerItems = aPollAnswerItemList(),
+        pollKind = PollKind.Disclosed,
+        isPollEnded = false,
+        onAnswerSelected = { },
+    )
+}
+
+@DayNightPreviews
+@Composable
+internal fun PollContentEndedPreview() = ElementPreview {
+    PollContentView(
+        question = "What type of food should we have at the party?",
+        answerItems = aPollAnswerItemList(isEnded = true),
+        pollKind = PollKind.Disclosed,
+        isPollEnded = false,
+        onAnswerSelected = { },
+    )
+}