Skip to content

Commit b262c4f

Browse files
committed
[a11y] Ensure that the header is focused on each verification step change
1 parent ca8298b commit b262c4f

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package io.element.android.features.verifysession.impl.incoming
99

1010
import androidx.activity.compose.BackHandler
11+
import androidx.compose.foundation.focusable
1112
import androidx.compose.foundation.layout.Arrangement
1213
import androidx.compose.foundation.layout.Column
1314
import androidx.compose.foundation.layout.fillMaxWidth
@@ -20,6 +21,7 @@ import androidx.compose.ui.Modifier
2021
import androidx.compose.ui.graphics.Color
2122
import androidx.compose.ui.res.stringResource
2223
import androidx.compose.ui.semantics.contentDescription
24+
import androidx.compose.ui.semantics.focused
2325
import androidx.compose.ui.semantics.semantics
2426
import androidx.compose.ui.text.style.TextAlign
2527
import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -152,7 +154,9 @@ private fun IncomingVerificationHeader(step: Step, request: VerificationRequest.
152154
.padding(bottom = 16.dp)
153155
.semantics(mergeDescendants = true) {
154156
contentDescription = timeLimitMessage
155-
},
157+
focused = true
158+
}
159+
.focusable(),
156160
iconStyle = iconStyle,
157161
title = stringResource(id = titleTextId),
158162
subTitle = stringResource(id = subtitleTextId),

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/OutgoingVerificationView.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package io.element.android.features.verifysession.impl.outgoing
99

1010
import androidx.activity.compose.BackHandler
1111
import androidx.compose.foundation.clickable
12+
import androidx.compose.foundation.focusable
1213
import androidx.compose.foundation.layout.Arrangement
1314
import androidx.compose.foundation.layout.Box
1415
import androidx.compose.foundation.layout.Row
@@ -23,6 +24,7 @@ import androidx.compose.ui.Modifier
2324
import androidx.compose.ui.graphics.Color
2425
import androidx.compose.ui.res.stringResource
2526
import androidx.compose.ui.semantics.contentDescription
27+
import androidx.compose.ui.semantics.focused
2628
import androidx.compose.ui.semantics.semantics
2729
import androidx.compose.ui.tooling.preview.PreviewParameter
2830
import androidx.compose.ui.unit.dp
@@ -192,7 +194,9 @@ private fun OutgoingVerificationHeader(step: Step, request: VerificationRequest.
192194
.padding(bottom = 16.dp)
193195
.semantics(mergeDescendants = true) {
194196
contentDescription = timeLimitMessage
195-
},
197+
focused = true
198+
}
199+
.focusable(),
196200
iconStyle = iconStyle,
197201
title = stringResource(id = titleTextId),
198202
subTitle = stringResource(id = subtitleTextId),

0 commit comments

Comments
 (0)