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

[a11y] Group emoji labels so that they are read out all together.

Browse source
This commit is contained in:
Benoit Marty 2025-07-11 14:43:25 +02:00
parent 9f5acd24fa
commit 7ec37b5123
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationContentVerifying.kt
View file

@ -24,6 +24,8 @@ 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.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextAlign 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.unit.dp import androidx.compose.ui.unit.dp
@ -39,14 +41,20 @@ internal fun VerificationContentVerifying(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Box( Box(
modifier = modifier.fillMaxSize().padding(bottom = 20.dp), modifier = modifier
.fillMaxSize()
.padding(bottom = 20.dp),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
when (data) { when (data) {
is SessionVerificationData.Decimals -> { is SessionVerificationData.Decimals -> {
val text = data.decimals.joinToString(separator = " - ") { it.toString() } val text = data.decimals.joinToString(separator = " - ")
Text( Text(
modifier = Modifier.fillMaxWidth(), modifier = Modifier
.fillMaxWidth()
.semantics {
contentDescription = data.decimals.joinToString()
},
text = text, text = text,
style = ElementTheme.typography.fontHeadingLgBold, style = ElementTheme.typography.fontHeadingLgBold,
color = ElementTheme.colors.textPrimary, color = ElementTheme.colors.textPrimary,
@ -57,7 +65,9 @@ internal fun VerificationContentVerifying(
// We want each row to have up to 4 emojis // We want each row to have up to 4 emojis
val rows = data.emojis.chunked(4) val rows = data.emojis.chunked(4)
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier
.fillMaxWidth()
.semantics(mergeDescendants = true) {},
verticalArrangement = Arrangement.spacedBy(40.dp), verticalArrangement = Arrangement.spacedBy(40.dp),
) { ) {
rows.forEach { emojis -> rows.forEach { emojis ->