[a11y] Ensure that the header is focused on each verification step change

This commit is contained in:
Benoit Marty 2025-07-11 15:33:52 +02:00
parent ca8298b91c
commit b262c4f9ff
2 changed files with 10 additions and 2 deletions

View file

@ -8,6 +8,7 @@
package io.element.android.features.verifysession.impl.incoming
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
@ -20,6 +21,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.focused
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
@ -152,7 +154,9 @@ private fun IncomingVerificationHeader(step: Step, request: VerificationRequest.
.padding(bottom = 16.dp)
.semantics(mergeDescendants = true) {
contentDescription = timeLimitMessage
},
focused = true
}
.focusable(),
iconStyle = iconStyle,
title = stringResource(id = titleTextId),
subTitle = stringResource(id = subtitleTextId),

View file

@ -9,6 +9,7 @@ package io.element.android.features.verifysession.impl.outgoing
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
@ -23,6 +24,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.focused
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
@ -192,7 +194,9 @@ private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest.
.padding(bottom = 16.dp)
.semantics(mergeDescendants = true) {
contentDescription = timeLimitMessage
},
focused = true
}
.focusable(),
iconStyle = iconStyle,
title = stringResource(id = titleTextId),
subTitle = stringResource(id = subtitleTextId),