Fix

martenrebane · Jan 24, 2024 · 874acab · 874acab
1 parent d4c7aee
commit 874acab
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 298 deletions.
diff --git a/MoppApp/MoppApp/CertificateDetailViewController.swift b/MoppApp/MoppApp/CertificateDetailViewController.swift
@@ -79,7 +79,11 @@ class CertificateDetailViewController: MoppViewController {
             UIAccessibility.post(notification: .layoutChanged, argument: navigationItem.leftBarButtonItem)
         }
     }
-
+
+    @objc internal override func backAction() {
+        dismiss(animated: true)
+    }
+
     func setCertificateDetails() -> Void {
         certificateSections.append(CertificateSection(header: L(.subjectName), certificateDetail: [
             CertificateDetail(title: L(.countryOrRegion), value: certificateDetail?.x509Certificate?.subject(oid: .countryName)?[0] ?? ""),

diff --git a/MoppApp/MoppApp/LocalizationKeys.swift b/MoppApp/MoppApp/LocalizationKeys.swift
@@ -493,4 +493,9 @@ enum LocKey : String
     case voiceControlDisableDefaultTimestampingService = "voice-control-disable-default-timestamping-service";
     case voiceControlEnableRoleAndAddress = "voice-control-enable-role-and-address";
     case voiceControlDisableRoleAndAddress = "voice-control-disable-role-and-address";
+    case voiceControlHelpButton = "voice-control-help-button";
+    case voiceControlAccessibilityButton = "voice-control-accessibility-button";
+    case voiceControlSettingsButton = "voice-control-settings-button";
+    case voiceControlInfoButton = "voice-control-info-button";
+    case voiceControlDiagnosticsButton = "voice-control-diagnostics-button";
 }
diff --git a/MoppApp/MoppApp/MenuViewController.swift b/MoppApp/MoppApp/MenuViewController.swift
@@ -125,6 +125,10 @@ extension MenuViewController : UITableViewDataSource {
                 } else {
                     cell.accessibilityTraits = UIAccessibilityTraits.button
                 }
+
+                // Support Voice Control without setting the whole cell as VoiceOver element
+                cell.isAccessibilityElement = !UIAccessibility.isVoiceOverRunning
+                cell.accessibilityUserInputLabels = [getVoiceControlLabel(title: title)]
                 return cell
             }
         }
@@ -191,6 +195,22 @@ extension MenuViewController : UITableViewDelegate {
         }
     }
 
+    func getVoiceControlLabel(title: String) -> String {
+        if title == L(.menuHelp) {
+            return L(.voiceControlHelpButton)
+        } else if title == L(.menuAccessibility) {
+            return L(.voiceControlAccessibilityButton)
+        } else if title == L(.menuSettings) {
+            return L(.voiceControlSettingsButton)
+        } else if title == L(.menuAbout) {
+            return L(.voiceControlInfoButton)
+        } else if title == L(.menuDiagnostics) {
+            return L(.voiceControlDiagnosticsButton)
+        }
+
+        return ""
+    }
+
 }
 
 extension MenuViewController : MenuHeaderDelegate {

diff --git a/MoppApp/MoppApp/Settings.storyboard b/MoppApp/MoppApp/Settings.storyboard
diff --git a/MoppApp/MoppApp/en.lproj/Localizable.strings b/MoppApp/MoppApp/en.lproj/Localizable.strings
@@ -536,3 +536,8 @@
 "voice-control-disable-default-timestamping-service" = "Disable default TimeStamping service access";
 "voice-control-enable-role-and-address" = "Enable role and address";
 "voice-control-disable-role-and-address" = "Disable role and address";
+"voice-control-help-button" = "Help";
+"voice-control-accessibility-button" = "Accessibility";
+"voice-control-settings-button" = "Settings";
+"voice-control-info-button" = "Info";
+"voice-control-diagnostics-button" = "Diagnostics";
diff --git a/MoppApp/MoppApp/et.lproj/Localizable.strings b/MoppApp/MoppApp/et.lproj/Localizable.strings
@@ -536,3 +536,8 @@
 "voice-control-disable-default-timestamping-service" = "Disable default TimeStamping service access";
 "voice-control-enable-role-and-address" = "Enable role and address";
 "voice-control-disable-role-and-address" = "Disable role and address";
+"voice-control-help-button" = "Help";
+"voice-control-accessibility-button" = "Accessibility";
+"voice-control-settings-button" = "Settings";
+"voice-control-info-button" = "Info";
+"voice-control-diagnostics-button" = "Diagnostics";
diff --git a/MoppApp/MoppApp/ru.lproj/Localizable.strings b/MoppApp/MoppApp/ru.lproj/Localizable.strings
@@ -537,3 +537,8 @@
 "voice-control-disable-default-timestamping-service" = "Disable default TimeStamping service access";
 "voice-control-enable-role-and-address" = "Enable role and address";
 "voice-control-disable-role-and-address" = "Disable role and address";
+"voice-control-help-button" = "Help";
+"voice-control-accessibility-button" = "Accessibility";
+"voice-control-settings-button" = "Settings";
+"voice-control-info-button" = "Info";
+"voice-control-diagnostics-button" = "Diagnostics";