diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index fdd3e47a4..46b752ca8 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -2494,7 +2494,7 @@ To enable access, tap Settings> Location and select Always"; // Mark: - WYSIWYG Composer -//Send Media Actions +// Send Media Actions "wysiwyg_composer_start_action_media_picker" = "Photo Library"; "wysiwyg_composer_start_action_stickers" = "Stickers"; "wysiwyg_composer_start_action_attachments" = "Attachments"; @@ -2503,6 +2503,12 @@ To enable access, tap Settings> Location and select Always"; "wysiwyg_composer_start_action_camera" = "Camera"; "wysiwyg_composer_start_action_text_formatting" = "Text Formatting"; +// Formatting Actions +"wysiwyg_composer_format_action_bold" = "Apply bold format"; +"wysiwyg_composer_format_action_italic" = "Apply italic format"; +"wysiwyg_composer_format_action_underline" = "Apply strikethrough format"; +"wysiwyg_composer_format_action_strikethrough" = "Apply underline format"; + // MARK: - MatrixKit diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index 5a60209ff..016337eed 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -9159,6 +9159,22 @@ public class VectorL10n: NSObject { public static var widgetStickerPickerNoStickerpacksAlertAddNow: String { return VectorL10n.tr("Vector", "widget_sticker_picker_no_stickerpacks_alert_add_now") } + /// Apply bold format + public static var wysiwygComposerFormatActionBold: String { + return VectorL10n.tr("Vector", "wysiwyg_composer_format_action_bold") + } + /// Apply italic format + public static var wysiwygComposerFormatActionItalic: String { + return VectorL10n.tr("Vector", "wysiwyg_composer_format_action_italic") + } + /// Apply underline format + public static var wysiwygComposerFormatActionStrikethrough: String { + return VectorL10n.tr("Vector", "wysiwyg_composer_format_action_strikethrough") + } + /// Apply strikethrough format + public static var wysiwygComposerFormatActionUnderline: String { + return VectorL10n.tr("Vector", "wysiwyg_composer_format_action_underline") + } /// Attachments public static var wysiwygComposerStartActionAttachments: String { return VectorL10n.tr("Vector", "wysiwyg_composer_start_action_attachments") diff --git a/RiotSwiftUI/Modules/Room/Composer/Model/ComposerModels.swift b/RiotSwiftUI/Modules/Room/Composer/Model/ComposerModels.swift index 0060c99c9..00470aa53 100644 --- a/RiotSwiftUI/Modules/Room/Composer/Model/ComposerModels.swift +++ b/RiotSwiftUI/Modules/Room/Composer/Model/ComposerModels.swift @@ -73,6 +73,19 @@ extension FormatItem { return "underlineButton" } } + + var accessibilityLabel: String { + switch type { + case .bold: + return VectorL10n.wysiwygComposerFormatActionBold + case .italic: + return VectorL10n.wysiwygComposerFormatActionItalic + case .strikethrough: + return VectorL10n.wysiwygComposerFormatActionStrikethrough + case .underline: + return VectorL10n.wysiwygComposerFormatActionUnderline + } + } } extension FormatType { diff --git a/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift b/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift index 136e96a48..3f42ee5ca 100644 --- a/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift +++ b/RiotSwiftUI/Modules/Room/Composer/View/Composer.swift @@ -140,6 +140,7 @@ struct Composer: View { .padding(11) .background(Circle().fill(theme.colors.system)) } + .accessibilityLabel(VectorL10n.create) FormattingToolbar(formatItems: formatItems) { type in wysiwygViewModel.apply(type.action) } @@ -167,6 +168,7 @@ struct Composer: View { } } .accessibilityIdentifier(actionButtonAccessibilityIdentifier) + .accessibilityLabel(VectorL10n.send) .isHidden(!showSendButton) } .onChange(of: wysiwygViewModel.isContentEmpty) { empty in diff --git a/RiotSwiftUI/Modules/Room/Composer/View/FormattingToolbar.swift b/RiotSwiftUI/Modules/Room/Composer/View/FormattingToolbar.swift index aeacb0108..253354835 100644 --- a/RiotSwiftUI/Modules/Room/Composer/View/FormattingToolbar.swift +++ b/RiotSwiftUI/Modules/Room/Composer/View/FormattingToolbar.swift @@ -45,6 +45,7 @@ struct FormattingToolbar: View { .background(item.active ? theme.colors.accent.opacity(0.1) : theme.colors.background) .cornerRadius(8) .accessibilityIdentifier(item.accessibilityIdentifier) + .accessibilityLabel(item.accessibilityLabel) } } }