Message announcement fixes

Author: martenrebane

RIADigiDoc/UI/Component/Container/Crypto/DecryptRootView.swift

@@ -24,6 +24,7 @@ import IdCardLib
 import CommonsLib
 
 struct DecryptRootView: View {
+    @Environment(\.accessibilityVoiceOverEnabled) private var voiceOverEnabled
     @Environment(\.dismiss) private var dismiss
     @Environment(LanguageSettings.self) private var languageSettings
     @Environment(NavigationPathManager.self) private var pathManager
@@ -36,6 +37,10 @@ struct DecryptRootView: View {
 
     private let sharedContainerViewModel: SharedContainerViewModelProtocol
 
+    private var containerSuccessfullyDecryptedMessage: String {
+        languageSettings.localized("Container successfully decrypted")
+    }
+
     init() {
         _viewModel = State(wrappedValue: Container.shared.decryptRootViewModel())
         self.sharedContainerViewModel = Container.shared.sharedContainerViewModel()
@@ -60,8 +65,12 @@ struct DecryptRootView: View {
                             sharedContainerViewModel.setCryptoContainer(container)
 
                             Toast.show(languageSettings.localized(
-                                "Container successfully decrypted"
+                                containerSuccessfullyDecryptedMessage
                             ), type: .success)
+
+                            if voiceOverEnabled {
+                                AccessibilityUtil.announceMessage(containerSuccessfullyDecryptedMessage)
+                            }
                         }
                     )
                 }
@@ -79,8 +88,12 @@ struct DecryptRootView: View {
                             sharedContainerViewModel.setCryptoContainer(container)
 
                             Toast.show(languageSettings.localized(
-                                "Container successfully decrypted"
+                                containerSuccessfullyDecryptedMessage
                             ), type: .success)
+
+                            if voiceOverEnabled {
+                                AccessibilityUtil.announceMessage(containerSuccessfullyDecryptedMessage)
+                            }
                         }
                     )
                 }

RIADigiDoc/UI/Component/Container/Signing/IdCard/IdCardView.swift

@@ -121,6 +121,10 @@ struct IdCardView: View {
         languageSettings.localized("Signature added")
     }
 
+    private var generalErrorMessage: String {
+        languageSettings.localized("General error")
+    }
+
     init(
         actionType: ActionType,
         actionMethods: [ActionMethod],
@@ -187,6 +191,11 @@ struct IdCardView: View {
 
                                 await MainActor.run {
                                     Toast.show(errorMessage)
+
+                                    if voiceOverEnabled {
+                                        AccessibilityUtil.announceMessage(generalErrorMessage)
+                                    }
+
                                     viewModel.resetErrors()
                                     resetIdCardAction()
                                     if shouldDismiss {
@@ -394,6 +403,11 @@ struct IdCardView: View {
         await viewModel.stopDiscoveringReaders()
         await MainActor.run {
             Toast.show(errorMessage)
+
+            if voiceOverEnabled {
+                AccessibilityUtil.announceMessage(errorMessage)
+            }
+
             viewModel.resetErrors()
             resetIdCardAction()
 
@@ -436,9 +450,12 @@ struct IdCardView: View {
         resetIdCardAction()
 
         guard let container = signedContainer else {
-            Toast.show(
-                languageSettings.localized("General error")
-            )
+            Toast.show(generalErrorMessage)
+
+            if voiceOverEnabled {
+                AccessibilityUtil.announceMessage(generalErrorMessage)
+            }
+
             return
         }
 
@@ -467,6 +484,11 @@ struct IdCardView: View {
 
                 await MainActor.run {
                     Toast.show(errorMessage)
+
+                    if voiceOverEnabled {
+                        AccessibilityUtil.announceMessage(generalErrorMessage)
+                    }
+
                     viewModel.resetErrors()
                     resetIdCardAction()
                     if shouldDismiss {