New icon for "poll end" in both action menu and timeline item. (#1203)

- Also fixes preview of action list (reply is included as it will soon be added).
This commit is contained in:
Marco Romano 2023-08-31 15:40:51 +02:00 committed by GitHub
parent 33683abf59
commit 00828b6714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 43 additions and 27 deletions

View file

@ -31,6 +31,7 @@ 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.VectorIcons
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
@ -62,7 +63,7 @@ fun PollContentView(
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
PollTitle(title = question)
PollTitle(title = question, isPollEnded = isPollEnded)
PollAnswers(answerItems = answerItems, onAnswerSelected = ::onAnswerSelected)
@ -76,17 +77,26 @@ fun PollContentView(
@Composable
internal fun PollTitle(
title: String,
isPollEnded: Boolean,
modifier: Modifier = Modifier
) {
Row(
modifier = modifier,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
Icon(
modifier = Modifier.size(22.dp),
imageVector = Icons.Outlined.Poll,
contentDescription = null
)
if (isPollEnded) {
Icon(
resourceId = VectorIcons.EndPoll,
contentDescription = null,
modifier = Modifier.size(22.dp)
)
} else {
Icon(
imageVector = Icons.Outlined.Poll,
contentDescription = null,
modifier = Modifier.size(22.dp)
)
}
Text(
text = title,
style = ElementTheme.typography.fontBodyLgMedium
@ -170,7 +180,7 @@ internal fun PollContentEndedPreview() = ElementPreview {
question = "What type of food should we have at the party?",
answerItems = aPollAnswerItemList(isEnded = true),
pollKind = PollKind.Disclosed,
isPollEnded = false,
isPollEnded = true,
onAnswerSelected = { _, _ -> },
)
}