Skip to content

Fix textfield cursor position for accessibility #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martenrebane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix textfield cursor position for accessibility #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
243 changes: 60 additions & 183 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/myeid/pinandcertificate/MyEidPinScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ import androidx.compose.foundation.focusable
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
Expand Down Expand Up @@ -90,7 +88,6 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.MPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.SPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeM
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeXXS
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.getAccessibilityEventType
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.isTalkBackEnabled
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.sendAccessibilityEvent
Expand Down Expand Up @@ -139,9 +136,6 @@ fun MyEidPinScreen(

val actionContinue = stringResource(R.string.action_continue)

val clearButtonText = stringResource(R.string.clear_text)
val buttonName = stringResource(id = R.string.button_name)

val codeType = content?.codeType ?: CodeType.PIN1
val isForgottenPin = content?.isForgottenPin == true
val title = stringResource(content?.title ?: R.string.myeid_pin_change_title, codeType.name)
Expand Down Expand Up @@ -622,72 +616,33 @@ fun MyEidPinScreen(
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.titleLarge,
)
Row(
SecurePinTextField(
modifier =
modifier
.fillMaxWidth()
.padding(top = MPadding),
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
) {
SecurePinTextField(
modifier =
modifier
.weight(1f)
.zIndex(3f)
.semantics {
traversalIndex = 3f
testTagsAsResourceId = true
}.testTag("myEidCurrentPinTextField"),
pin = currentPinState,
label = pinCodeLabel,
focusRequester = currentPinFocusRequester,
pinCodeTextEdited = null,
isError = !isCurrentPinValid,
keyboardImeAction = ImeAction.Next,
onDone = {
if (isCurrentPinValid) {
showCurrentPinField.value = false
showNewRepeatPinField.value = false
showNewPinField.value = true
} else {
focusManager.clearFocus()
}
},
)
if (isTalkBackEnabled(context) && currentPinState.value.isNotEmpty()) {
IconButton(
modifier =
modifier
.zIndex(4f)
.align(Alignment.CenterVertically)
.semantics {
traversalIndex = 4f
testTagsAsResourceId = true
}.testTag("myEidCurrentPinRemoveButton"),
onClick = {
currentPinState.value = byteArrayOf()
scope.launch(Main) {
currentPinFocusRequester.requestFocus()
focusManager.clearFocus()
delay(200)
currentPinFocusRequester.requestFocus()
}
},
) {
Icon(
modifier =
modifier
.size(iconSizeXXS)
.semantics {
testTagsAsResourceId = true
}.testTag("idCardCurrentPinRemoveIconButton"),
imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove),
contentDescription = "$clearButtonText $buttonName",
)
.padding(top = MPadding)
.zIndex(3f)
.semantics {
traversalIndex = 3f
testTagsAsResourceId = true
}.testTag("myEidCurrentPinTextField"),
pin = currentPinState,
label = pinCodeLabel,
focusRequester = currentPinFocusRequester,
pinCodeTextEdited = null,
isError = !isCurrentPinValid,
keyboardImeAction = ImeAction.Next,
removeIconTestTag = "myEidCurrentPinRemoveButton",
onDone = {
if (isCurrentPinValid) {
showCurrentPinField.value = false
showNewRepeatPinField.value = false
showNewPinField.value = true
} else {
focusManager.clearFocus()
}
}
}
},
)
Text(
modifier =
modifier
Expand Down Expand Up @@ -723,72 +678,33 @@ fun MyEidPinScreen(
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.titleLarge,
)
Row(
SecurePinTextField(
modifier =
modifier
.fillMaxWidth()
.padding(top = MPadding),
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
) {
SecurePinTextField(
modifier =
modifier
.weight(1f)
.zIndex(7f)
.semantics {
traversalIndex = 7f
testTagsAsResourceId = true
}.testTag("myEidNewPinTextField"),
pin = newPinState,
label = pinCodeLabel,
focusRequester = newPinFocusRequester,
pinCodeTextEdited = null,
isError = !isNewPinValid,
keyboardImeAction = ImeAction.Next,
onDone = {
if (isNewPinValid) {
showCurrentPinField.value = false
showNewPinField.value = false
showNewRepeatPinField.value = true
} else {
focusManager.clearFocus()
}
},
)
if (isTalkBackEnabled(context) && newPinState.value.isNotEmpty()) {
IconButton(
modifier =
modifier
.zIndex(8f)
.align(Alignment.CenterVertically)
.semantics {
traversalIndex = 8f
testTagsAsResourceId = true
}.testTag("myEidNewPinRemoveButton"),
onClick = {
newPinState.value = byteArrayOf()
scope.launch(Main) {
newPinFocusRequester.requestFocus()
focusManager.clearFocus()
delay(200)
newPinFocusRequester.requestFocus()
}
},
) {
Icon(
modifier =
modifier
.size(iconSizeXXS)
.semantics {
testTagsAsResourceId = true
}.testTag("idCardNewPinRemoveIconButton"),
imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove),
contentDescription = "$clearButtonText $buttonName",
)
.padding(top = MPadding)
.zIndex(7f)
.semantics {
traversalIndex = 7f
testTagsAsResourceId = true
}.testTag("myEidNewPinTextField"),
pin = newPinState,
label = pinCodeLabel,
focusRequester = newPinFocusRequester,
pinCodeTextEdited = null,
isError = !isNewPinValid,
keyboardImeAction = ImeAction.Next,
removeIconTestTag = "myEidNewPinRemoveButton",
onDone = {
if (isNewPinValid) {
showCurrentPinField.value = false
showNewPinField.value = false
showNewRepeatPinField.value = true
} else {
focusManager.clearFocus()
}
}
}
},
)
Text(
modifier =
modifier
Expand Down Expand Up @@ -853,62 +769,23 @@ fun MyEidPinScreen(
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.titleLarge,
)
Row(
SecurePinTextField(
modifier =
modifier
.fillMaxWidth()
.padding(top = MPadding),
horizontalArrangement = Arrangement.Start,
verticalAlignment = Alignment.CenterVertically,
) {
SecurePinTextField(
modifier =
modifier
.weight(1f)
.zIndex(11f)
.semantics {
traversalIndex = 11f
testTagsAsResourceId = true
}.testTag("myEidNewPinRepeatedTextField"),
pin = newPinRepeatedState,
label = pinCodeLabel,
focusRequester = newPinRepeatedFocusRequester,
pinCodeTextEdited = null,
isError = !isNewRepeatedPinValid,
)
if (isTalkBackEnabled(context) && newPinRepeatedState.value.isNotEmpty()) {
IconButton(
modifier =
modifier
.zIndex(12f)
.align(Alignment.CenterVertically)
.semantics {
traversalIndex = 12f
testTagsAsResourceId = true
}.testTag("myEidNewPinRepeatedRemoveButton"),
onClick = {
newPinRepeatedState.value = byteArrayOf()
scope.launch(Main) {
newPinRepeatedFocusRequester.requestFocus()
focusManager.clearFocus()
delay(200)
newPinRepeatedFocusRequester.requestFocus()
}
},
) {
Icon(
modifier =
modifier
.size(iconSizeXXS)
.semantics {
testTagsAsResourceId = true
}.testTag("idCardNewPinRepeatedRemoveIconButton"),
imageVector = ImageVector.vectorResource(R.drawable.ic_icon_remove),
contentDescription = "$clearButtonText $buttonName",
)
}
}
}
.padding(top = MPadding)
.zIndex(11f)
.semantics {
traversalIndex = 11f
testTagsAsResourceId = true
}.testTag("myEidNewPinRepeatedTextField"),
pin = newPinRepeatedState,
label = pinCodeLabel,
focusRequester = newPinRepeatedFocusRequester,
pinCodeTextEdited = null,
isError = !isNewRepeatedPinValid,
removeIconTestTag = "myEidNewPinRepeatedRemoveButton",
)
Text(
modifier =
modifier
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/ui/component/shared/PrimaryTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ import androidx.compose.ui.text.style.TextAlign
import ee.ria.DigiDoc.R
import ee.ria.DigiDoc.ui.theme.Dimensions.MSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.addInvisibleElement
import ee.ria.DigiDoc.utils.accessibility.AccessibilityUtil.Companion.isTalkBackEnabled
import ee.ria.DigiDoc.utils.extensions.notAccessible
import kotlinx.coroutines.Dispatchers.Main
Expand Down Expand Up @@ -267,3 +268,11 @@ fun PrimaryTextField(
}
}
}

fun talkBackTextFieldValue(text: String): TextFieldValue {
val withInvisibleElements = addInvisibleElement(text)
return TextFieldValue(
text = withInvisibleElements,
selection = TextRange(withInvisibleElements.length),
)
}
Loading
Loading