Accessibility mark iii (#779)

Author: etoledom

Demo/Demo/Gravatar-Demo/DemoQuickEditorViewController.swift

@@ -48,7 +48,7 @@ final class DemoQuickEditorViewController: BaseFormViewController {
     )
 
     lazy var initialPageButton = ButtonLabelField(
-        title: "Initital Page",
+        title: "Initial Page",
         subtitle: selectedInitialPage.rawValue,
         buttonTitle: "Select",
         menuActions: InitialPage.allCases.compactMap { [weak self] page in

Sources/GravatarUI/Resources/en.lproj/Localizable.strings

@@ -264,3 +264,9 @@
 
 /* This confirmation message shows when the user updates fields of their profile. */
 "Profile.Update.Success" = "Profile updated successfully";
+
+/* Accessible label for button to switch to the About editor. */
+"AvatarPickerProfile.PageSwitchButton.AboutEditor" = "Switch to about editor";
+
+/* Accessible label for button to switch to the Avatar picker. */
+"AvatarPickerProfile.PageSwitchButton.AvatarPicker" = "Switch to avatar picker";

Sources/GravatarUI/SwiftUI/AboutEditor/AboutEditorView.swift

@@ -218,6 +218,7 @@ struct AboutEditorView: View {
             Text(title)
                 .font(Constants.primaryFont)
                 .multilineTextAlignment(.leading)
+                .accessibilityHidden(true)
             if isLarge {
                 TextEditor(text: value)
                     .font(Constants.primaryFont)
@@ -227,6 +228,7 @@ struct AboutEditorView: View {
                     .inputBorders(colorScheme: colorScheme)
                     .frame(height: dynamicTypeSize >= .accessibility1 ? 150 : 120)
                     .disabled(isSaving)
+                    .accessibilityLabel(title)
             } else {
                 TextField(
                     "",
@@ -236,6 +238,7 @@ struct AboutEditorView: View {
                 .padding(.DS.Padding.split)
                 .inputBorders(colorScheme: colorScheme)
                 .disabled(isSaving)
+                .accessibilityLabel(title)
             }
 
             if let footerText {

Sources/GravatarUI/SwiftUI/AvatarPicker/AvatarPickerProfileViewWrapper.swift

@@ -27,7 +27,7 @@ struct AvatarPickerProfileViewWrapper: View {
                     isLoading: $isLoading,
                     avatarAccessoryView: {
                         if case .avatar = buttonsMode {
-                            editButton {
+                            editButton(accessibilityLabel: .localizedEditAvatarsButtonLabel) {
                                 buttonTapHandler?(.avatar)
                             }
                         } else {
@@ -47,7 +47,7 @@ struct AvatarPickerProfileViewWrapper: View {
                 .background(profileBackground)
                 .cornerRadius(8)
                 if case .aboutInfo = buttonsMode {
-                    editButton {
+                    editButton(accessibilityLabel: .localizedEditAboutEditorButtonLabel) {
                         buttonTapHandler?(.aboutInfo)
                     }.padding()
                 }
@@ -74,7 +74,7 @@ struct AvatarPickerProfileViewWrapper: View {
     }
 
     @ViewBuilder
-    private func editButton(action: @escaping () -> Void) -> some View {
+    private func editButton(accessibilityLabel: String, action: @escaping () -> Void) -> some View {
         Button(action: action) {
             Image("pencil", bundle: Bundle.module)
                 .resizable()
@@ -83,10 +83,29 @@ struct AvatarPickerProfileViewWrapper: View {
                 .padding(6)
                 .background(Color.white)
                 .clipShape(Circle())
+                .accessibilityLabel(accessibilityLabel)
         }
     }
 }
 
+extension String {
+    fileprivate static var localizedEditAboutEditorButtonLabel: String {
+        SDKLocalizedString(
+            "AvatarPickerProfile.PageSwitchButton.AboutEditor",
+            value: "Switch to about editor",
+            comment: "Accessible label for button to switch to the About editor"
+        )
+    }
+
+    fileprivate static var localizedEditAvatarsButtonLabel: String {
+        SDKLocalizedString(
+            "AvatarPickerProfile.PageSwitchButton.AvatarPicker",
+            value: "Switch to avatar picker",
+            comment: "Accessible label for button to switch to the Avatar picker"
+        )
+    }
+}
+
 #Preview {
     AvatarPickerProfileViewWrapper(
         avatarID: .constant(nil),