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

a11y: improve content description of the close formatting button. Change from "Close" to "Cancel and close text formatting"

Browse source
This commit is contained in:
Benoit Marty 2025-06-26 15:55:15 +02:00
parent a1b9266c4a
commit 707a59a4fc
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
View file

@ -178,17 +178,19 @@ fun TextComposer(
remember(state.richTextEditorState, composerMode, onResetComposerMode, onError) { remember(state.richTextEditorState, composerMode, onResetComposerMode, onError) {
@Composable { @Composable {
TextInputBox( TextInputBox(
modifier = Modifier.clickable( modifier = Modifier
interactionSource = remember { MutableInteractionSource() }, .clickable(
indication = null, interactionSource = remember { MutableInteractionSource() },
) { indication = null,
coroutineScope.launch { ) {
state.requestFocus() coroutineScope.launch {
view.showKeyboard() state.requestFocus()
view.showKeyboard()
}
} }
}.semantics { .semantics {
hideFromAccessibility() hideFromAccessibility()
}, },
composerMode = composerMode, composerMode = composerMode,
onResetComposerMode = onResetComposerMode, onResetComposerMode = onResetComposerMode,
isTextEmpty = state.richTextEditorState.messageHtml.isEmpty(), isTextEmpty = state.richTextEditorState.messageHtml.isEmpty(),
@ -317,7 +319,7 @@ fun TextComposer(
IconColorButton( IconColorButton(
onClick = onDismissTextFormatting, onClick = onDismissTextFormatting,
imageVector = CompoundIcons.Close(), imageVector = CompoundIcons.Close(),
contentDescription = stringResource(CommonStrings.action_close), contentDescription = stringResource(R.string.rich_text_editor_close_formatting_options),
) )
}, },
textFormatting = textFormattingOptions, textFormatting = textFormattingOptions,

2
libraries/textcomposer/impl/src/main/res/values/localazy.xml
View file

@ -2,7 +2,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="rich_text_editor_a11y_add_attachment">"Add attachment"</string> <string name="rich_text_editor_a11y_add_attachment">"Add attachment"</string>
<string name="rich_text_editor_bullet_list">"Toggle bullet list"</string> <string name="rich_text_editor_bullet_list">"Toggle bullet list"</string>
<string name="rich_text_editor_close_formatting_options">"Close formatting options"</string> <string name="rich_text_editor_close_formatting_options">"Cancel and close text formatting"</string>
<string name="rich_text_editor_code_block">"Toggle code block"</string> <string name="rich_text_editor_code_block">"Toggle code block"</string>
<string name="rich_text_editor_composer_caption_placeholder">"Add a caption"</string> <string name="rich_text_editor_composer_caption_placeholder">"Add a caption"</string>
<string name="rich_text_editor_composer_encrypted_placeholder">"Encrypted message…"</string> <string name="rich_text_editor_composer_encrypted_placeholder">"Encrypted message…"</string>