Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Layout optimization

Browse source
This commit is contained in:
Benoit Marty 2023-12-08 17:16:10 +01:00
parent d422bbca50
commit 487a634990
1 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
View file

@ -19,7 +19,6 @@ package io.element.android.features.verifysession.impl
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
@ -38,6 +37,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -155,27 +155,22 @@ private fun ContentVerifying(verificationFlowStep: FlowStep.Verifying, modifier:
when (verificationFlowStep.data) { when (verificationFlowStep.data) {
is SessionVerificationData.Decimals -> { is SessionVerificationData.Decimals -> {
val text = verificationFlowStep.data.decimals.joinToString(separator = " - ") { it.toString() } val text = verificationFlowStep.data.decimals.joinToString(separator = " - ") { it.toString() }
Box( Text(
modifier = modifier.fillMaxWidth(), modifier = modifier.fillMaxWidth(),
contentAlignment = Alignment.Center, text = text,
) { style = ElementTheme.typography.fontHeadingLgBold,
Text( color = MaterialTheme.colorScheme.primary,
text = text, textAlign = TextAlign.Center,
style = ElementTheme.typography.fontHeadingLgBold, )
color = MaterialTheme.colorScheme.primary,
maxLines = 1,
)
}
} }
is SessionVerificationData.Emojis -> { is SessionVerificationData.Emojis -> {
// We want each row to have up to 4 emojis // We want each row to have up to 4 emojis
val rows = verificationFlowStep.data.emojis.chunked(4) val rows = verificationFlowStep.data.emojis.chunked(4)
Column(modifier = modifier.fillMaxWidth()) { Column(
for ((rowIndex, emojis) in rows.withIndex()) { modifier = modifier.fillMaxWidth(),
// Vertical spacing between rows verticalArrangement = Arrangement.spacedBy(40.dp),
if (rowIndex > 0) { ) {
Spacer(modifier = Modifier.height(40.dp)) rows.forEach { emojis ->
}
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) { Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
for (emoji in emojis) { for (emoji in emojis) {
EmojiItemView(emoji = emoji, modifier = Modifier.widthIn(max = 60.dp)) EmojiItemView(emoji = emoji, modifier = Modifier.widthIn(max = 60.dp))