Skip to content

Add accessibility description to options buttons #325

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 4 commits into
base: main
Choose a base branch
from
Open

Add accessibility description to options buttons #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f86d0d
Add accessibility description to options buttons
martenrebane Apr 24, 2026
9858d17
Fix imports
martenrebane Apr 24, 2026
c628563
Fix ktlint
martenrebane Aug 3, 2026
0db2b77
Fix accessibility
martenrebane Aug 5, 2026
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
25 changes: 19 additions & 6 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AccessibilityScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
Expand Down Expand Up @@ -200,7 +201,9 @@ fun AccessibilityScreen(
.padding(
horizontal = SPadding,
vertical = SPadding,
).testTag("mainAccessibilityIntroductionScreenReaderIntroductionIos"),
).semantics {
stateDescription = "link"
}.testTag("mainAccessibilityIntroductionScreenReaderIntroductionIos"),
text = stringResource(R.string.main_accessibility_introduction_screen_reader_introduction_ios),
)
DynamicText(
Expand All @@ -209,7 +212,9 @@ fun AccessibilityScreen(
.padding(
horizontal = SPadding,
vertical = SPadding,
).testTag("mainAccessibilityIntroductionScreenReaderIntroductionAndroid"),
).semantics {
stateDescription = "link"
}.testTag("mainAccessibilityIntroductionScreenReaderIntroductionAndroid"),
text = stringResource(R.string.main_accessibility_introduction_screen_reader_introduction_android),
)
Text(
Expand Down Expand Up @@ -249,7 +254,9 @@ fun AccessibilityScreen(
.padding(
horizontal = SPadding,
vertical = SPadding,
).testTag("mainAccessibilityIntroductionScreenMagnificationScreenToolsIos"),
).semantics {
stateDescription = "link"
}.testTag("mainAccessibilityIntroductionScreenMagnificationScreenToolsIos"),
text =
stringResource(
R.string.main_accessibility_introduction_screen_magnification_screen_tools_ios,
Expand All @@ -261,7 +268,9 @@ fun AccessibilityScreen(
.padding(
horizontal = SPadding,
vertical = SPadding,
).testTag("mainAccessibilityIntroductionScreenMagnificationScreenToolsAndroid"),
).semantics {
stateDescription = "link"
}.testTag("mainAccessibilityIntroductionScreenMagnificationScreenToolsAndroid"),
text =
stringResource(
R.string.main_accessibility_introduction_screen_magnification_screen_tools_android,
Expand All @@ -282,7 +291,9 @@ fun AccessibilityScreen(
.padding(
horizontal = SPadding,
vertical = SPadding,
).testTag("mainAccessibilityIntroductionScreenMagnificationToolsIos"),
).semantics {
stateDescription = "link"
}.testTag("mainAccessibilityIntroductionScreenMagnificationToolsIos"),
text = stringResource(R.string.main_accessibility_introduction_screen_magnification_tools_ios),
)
DynamicText(
Expand All @@ -291,7 +302,9 @@ fun AccessibilityScreen(
.padding(
horizontal = SPadding,
vertical = SPadding,
).testTag("mainAccessibilityIntroductionScreenMagnificationToolsAndroid"),
).semantics {
stateDescription = "link"
}.testTag("mainAccessibilityIntroductionScreenMagnificationToolsAndroid"),
text = stringResource(R.string.main_accessibility_introduction_screen_magnification_tools_android),
)
InvisibleElement(modifier = modifier)
Expand Down
85 changes: 40 additions & 45 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/DiagnosticsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,58 +650,53 @@ fun DiagnosticsScreen(
}.testTag("mainDiagnosticsRestartConfirmationDialog"),
onDismissRequest = dismissRestartConfirmationDialog,
) {
Surface(
Column(
modifier =
modifier
.padding(SPadding)
.wrapContentHeight()
.wrapContentWidth()
.verticalScroll(rememberScrollState()),
.verticalScroll(rememberScrollState())
.semantics {
testTagsAsResourceId = true
}.testTag("diagnosticsActivateLoggingContainer"),
) {
Column(
modifier =
modifier
.semantics {
testTagsAsResourceId = true
}.testTag("diagnosticsActivateLoggingContainer"),
) {
HrefMessageDialog(
text1 = R.string.main_diagnostics_restart_message,
text2 = R.string.main_diagnostics_restart_message_restart_now,
linkText = R.string.read_more_here,
linkUrl = R.string.main_diagnostics_restart_message_href,
newLineBeforeLink = true,
newLineBeforeText2 = true,
)
HrefMessageDialog(
text1 = R.string.main_diagnostics_restart_message,
text2 = R.string.main_diagnostics_restart_message_restart_now,
linkText = R.string.read_more_here,
linkUrl = R.string.main_diagnostics_restart_message_href,
newLineBeforeLink = true,
newLineBeforeText2 = true,
)

CancelAndOkButtonRow(
okButtonTestTag = "hrefMessageDialogOkButton",
cancelButtonTestTag = "hrefMessageDialogCancelButton",
cancelButtonClick = dismissRestartConfirmationDialog,
okButtonClick = {
enableOneTimeLogGeneration = true
diagnosticsViewModel.dataStore.setIsLogFileGenerationEnabled(
true,
)
closeRestartConfirmationDialog()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
settingValueChanged,
)
sharedSettingsViewModel.recreateActivity(true)
},
cancelButtonTitle = R.string.cancel_button,
okButtonTitle = R.string.ok_button,
cancelButtonContentDescription =
stringResource(
id = R.string.cancel_button,
).lowercase(),
okButtonContentDescription = stringResource(id = R.string.ok_button).lowercase(),
showCancelButton = true,
)
InvisibleElement(modifier = modifier)
}
CancelAndOkButtonRow(
okButtonTestTag = "hrefMessageDialogOkButton",
cancelButtonTestTag = "hrefMessageDialogCancelButton",
cancelButtonClick = dismissRestartConfirmationDialog,
okButtonClick = {
enableOneTimeLogGeneration = true
diagnosticsViewModel.dataStore.setIsLogFileGenerationEnabled(
true,
)
closeRestartConfirmationDialog()
sendAccessibilityEvent(
context,
getAccessibilityEventType(),
settingValueChanged,
)
sharedSettingsViewModel.recreateActivity(true)
},
cancelButtonTitle = R.string.cancel_button,
okButtonTitle = R.string.ok_button,
cancelButtonContentDescription =
stringResource(
id = R.string.cancel_button,
).lowercase(),
okButtonContentDescription = stringResource(id = R.string.ok_button).lowercase(),
showCancelButton = true,
)
InvisibleElement(modifier = modifier)
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/EncryptionServicesSettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.ImeAction
Expand Down Expand Up @@ -183,6 +184,8 @@ fun EncryptionServicesSettingsScreen(
val fetchUrlLabel = stringResource(R.string.main_settings_crypto_fetch_url)
val postUrlLabel = stringResource(R.string.main_settings_crypto_post_url)

val panelDescription = stringResource(R.string.panel)

var uuidText by rememberSaveable(stateSaver = textFieldValueSaver) {
mutableStateOf(
TextFieldValue(
Expand Down Expand Up @@ -476,6 +479,7 @@ fun EncryptionServicesSettingsScreen(
).semantics {
contentDescription =
"$serverLabel: ${selectedCdoc2Conf.name}"
stateDescription = panelDescription
},
)
} else {
Expand Down
12 changes: 10 additions & 2 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.isTraversalGroup
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.semantics.traversalIndex
import androidx.compose.ui.tooling.preview.Preview
Expand All @@ -80,6 +82,7 @@ import ee.ria.DigiDoc.ui.theme.Dimensions.XSPadding
import ee.ria.DigiDoc.ui.theme.Dimensions.iconSizeM
import ee.ria.DigiDoc.ui.theme.RIADigiDocTheme
import ee.ria.DigiDoc.utils.Route
import ee.ria.DigiDoc.utils.extensions.notAccessible
import ee.ria.DigiDoc.viewmodel.HomeViewModel
import ee.ria.DigiDoc.viewmodel.shared.SharedMenuViewModel
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -166,7 +169,9 @@ fun HomeScreen(
},
sharedMenuViewModel = sharedMenuViewModel,
leftIcon = R.drawable.ic_m3_menu_48dp_wght400,
leftIconContentDescription = R.string.main_home_menu_button,
title = null,
isPanel = true,
onLeftButtonClick = {
isMainMenuBottomSheetVisible.value = true
isSettingsMenuBottomSheetVisible.value = false
Expand Down Expand Up @@ -252,10 +257,13 @@ fun HomeScreen(
modifier =
modifier
.padding(end = XSPadding)
.width(iconSizeM),
.width(iconSizeM)
.semantics {
stateDescription = "logo"
},
)
Text(
modifier = modifier,
modifier = modifier.notAccessible(),
style = MaterialTheme.typography.displayMedium,
color = MaterialTheme.colorScheme.onSurface,
text = stringResource(id = R.string.digidoc),
Expand Down
33 changes: 21 additions & 12 deletions app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InfoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.role
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -199,6 +200,7 @@ fun InfoScreen(
.aspectRatio(cofundedLogoWidthPx.toFloat() / cofundedLogo.height)
.semantics {
contentDescription = logoDescription
stateDescription = "logo"
role = Role.Image
}.drawBehind {
drawRect(logoSurfaceColor)
Expand All @@ -215,23 +217,29 @@ fun InfoScreen(
modifier = Modifier.weight(1f),
horizontalAlignment = Alignment.Start,
) {
Text(
text = stringResource(id = R.string.main_about_ria_digidoc_title),
style = MaterialTheme.typography.titleLarge,
)
Text(
text =
String.format(
stringResource(id = R.string.main_about_version_title),
BuildConfig.VERSION_NAME + '.' + BuildConfig.VERSION_CODE,
),
style = MaterialTheme.typography.bodyMedium,
)
Column(
modifier = modifier.semantics(mergeDescendants = true) {},
) {
Text(
text = stringResource(id = R.string.main_about_ria_digidoc_title),
style = MaterialTheme.typography.titleLarge,
)
Text(
text =
String.format(
stringResource(id = R.string.main_about_version_title),
BuildConfig.VERSION_NAME + '.' + BuildConfig.VERSION_CODE,
),
style = MaterialTheme.typography.bodyMedium,
)
}

Text(
modifier = Modifier.padding(vertical = SPadding),
text = stringResource(id = R.string.main_about_info_title),
style = MaterialTheme.typography.labelMedium,
)

val helpButtonContentDescriptionText =
if (isEstonianLanguageUsed.value) {
stringResource(id = R.string.main_home_menu_help) +
Expand All @@ -256,6 +264,7 @@ fun InfoScreen(
).clip(buttonRoundCornerShape)
.semantics {
contentDescription = helpButtonContentDescriptionText
stateDescription = "link"
testTagsAsResourceId = true
}.testTag("mainInfoHelpButton"),
colors =
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/InitScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.semantics.stateDescription
import androidx.compose.ui.semantics.testTagsAsResourceId
import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.NavHostController
Expand Down Expand Up @@ -87,7 +88,9 @@ fun InitScreen(
top = LPadding,
bottom = zeroPadding,
end = XLPadding,
),
).semantics {
stateDescription = "logo"
},
)
Text(
text = stringResource(id = R.string.digidoc_all_caps),
Expand Down
Loading
Loading