Merge branch 'PVW-1487-talkback-voiceover-test-findings-part-2' into 'main'

PVW-1487: Improve accessibility using Talkback/Voiceover (part 2)

See merge request wallet/nl-wallet!420

Author: daandebie

wallet_app/lib/l10n/intl_en.arb

@@ -1,6 +1,6 @@
 {
     "@@locale": "en",
-    "@@last_modified": "2023-10-19T09:09:41+02:00",
+    "@@last_modified": "2023-10-23T09:19:02+02:00",
     "aboutScreenDescription": "This demo is realized by multiple parties and was commissioned by the dutch government. For more information see edi.pleio.nl.",
     "aboutScreenPrivacyCta": "Privacy policy",
     "aboutScreenTermsCta": "Terms and conditions",
@@ -853,6 +853,19 @@
     "pinBlockedScreenHeadline": "Your app has been blocked",
     "pinBlockedScreenResetWalletCta": "Reset wallet",
     "pinBlockedScreenTitle": "App blocked",
+    "pinFieldSemanticsLabel": "Access code field, {enteredDigits} of {totalDigits} entered, secured text field.",
+    "@pinFieldSemanticsLabel": {
+        "placeholders": {
+            "enteredDigits": {
+                "example": "3",
+                "type": "int"
+            },
+            "totalDigits": {
+                "example": "6",
+                "type": "int"
+            }
+        }
+    },
     "pinKeyboardWCAGBackspaceLabel": "backspace",
     "pinKeyboardWCAGDigitKeyTapHint": "select",
     "pinScreenAboutAppTooltip": "About the app",
@@ -933,6 +946,7 @@
     "qrMyCodeTabHowToSheetDescription": "Have a reviewer scan My QR Code to start sharing. You will then receive a data request. Data will only be shared if you agree to the request.",
     "qrMyCodeTabHowToSheetTitle": "How does my QR-code work?",
     "qrScanTabCameraScanningQrScannedAnnouncement": "QR code scanned",
+    "qrScanTabCameraScanningQrScanningAnnouncement": "Point your camera at a QR code",
     "qrScanTabContinueCta": "Scan another QR-code",
     "qrScanTabErrorRetryCta": "Retry",
     "qrScanTabFlashDisableCtaTooltip": "Turn flashlight off",

wallet_app/lib/l10n/intl_nl.arb

@@ -1,6 +1,6 @@
 {
     "@@locale": "nl",
-    "@@last_modified": "2023-10-19T09:09:41+02:00",
+    "@@last_modified": "2023-10-23T09:19:02+02:00",
     "aboutScreenDescription": "Deze demo app is tot stand gekomen door een samenwerking van verschillende partijen in opdracht van de Nederlandse Overheid. Voor meer informatie over deze app verwijzen we naar de website edi.pleio.nl.",
     "aboutScreenPrivacyCta": "Privacybeleid",
     "aboutScreenTermsCta": "Gebruiksvoorwaarden",
@@ -853,6 +853,19 @@
     "pinBlockedScreenHeadline": "Je app is geblokkeerd",
     "pinBlockedScreenResetWalletCta": "Wallet wissen",
     "pinBlockedScreenTitle": "Geblokkeerd",
+    "pinFieldSemanticsLabel": "Toegangscode veld, {enteredDigits} van {totalDigits} ingevoerd, beveiligd tekstveld",
+    "@pinFieldSemanticsLabel": {
+        "placeholders": {
+            "enteredDigits": {
+                "example": "3",
+                "type": "int"
+            },
+            "totalDigits": {
+                "example": "6",
+                "type": "int"
+            }
+        }
+    },
     "pinKeyboardWCAGBackspaceLabel": "backspace",
     "pinKeyboardWCAGDigitKeyTapHint": "invoer",
     "pinScreenAboutAppTooltip": "Over de app",
@@ -933,6 +946,7 @@
     "qrMyCodeTabHowToSheetDescription": "Laat Mijn QR-code scannen door een controleur om te beginnen met delen. Vervolgens krijg je een gegevens verzoek. Alleen als je akkoord gaat met het verzoek zullen gegevens worden gedeeld.",
     "qrMyCodeTabHowToSheetTitle": "Hoe werkt mijn QR-code?",
     "qrScanTabCameraScanningQrScannedAnnouncement": "QR-code gescand",
+    "qrScanTabCameraScanningQrScanningAnnouncement": "Richt je camera op een QR-code",
     "qrScanTabContinueCta": "Nog een QR scannen",
     "qrScanTabErrorRetryCta": "Probeer opnieuw",
     "qrScanTabFlashDisableCtaTooltip": "Zet zaklamp uit",

wallet_app/lib/src/data/repository/issuance/mock/mock_issuance_response_repository.mocks.dart

@@ -164,7 +164,7 @@ const _kMockPidDataAttributes = [
   ),
   DataAttribute(
     valueType: AttributeValueType.text,
-    label: 'Geboortenaam',
+    label: 'Naam bij geboorte',
     value: 'Molenaar',
     key: 'mock.birthName',
     sourceCardId: _kPidId,

wallet_app/lib/src/feature/lock/auto_lock_observer.dart

@@ -1,7 +1,9 @@
 import 'dart:async';
+import 'dart:ui';
 
 import 'package:fimber/fimber.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/semantics.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:rxdart/rxdart.dart';
 
@@ -39,15 +41,25 @@ class _AutoLockObserverState extends State<AutoLockObserver> with WidgetsBinding
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addObserver(this);
+
     _setupNoInteractionListener();
+    _setupSemanticActionListener();
+
+    WidgetsBinding.instance.addObserver(this);
     if (WidgetsBinding.instance.lifecycleState != AppLifecycleState.resumed) {
       _lockWallet();
     } else {
       _resetIdleTimeout();
     }
   }
 
+  void _setupSemanticActionListener() {
+    PlatformDispatcher.instance.onSemanticsActionEvent = (SemanticsActionEvent event) {
+      if (event.type != SemanticsAction.didLoseAccessibilityFocus) _resetIdleTimeout();
+      WidgetsBinding.instance.performSemanticsAction(event);
+    };
+  }
+
   void _setupNoInteractionListener() {
     _inactiveSubscription?.cancel();
     _inactiveSubscription =

wallet_app/lib/src/feature/pin/widget/pin_field.dart

@@ -80,7 +80,7 @@ class _PinFieldState extends State<PinField> with TickerProviderStateMixin {
   @override
   Widget build(BuildContext context) {
     return Semantics(
-      label: context.l10n.setupSecurityScreenWCAGEnteredDigitsAnnouncement(widget.enteredDigits, widget.digits),
+      label: context.l10n.pinFieldSemanticsLabel(widget.enteredDigits, widget.digits),
       child: Transform.translate(
         offset: _calcShakeOffset(),
         child: Row(

wallet_app/lib/src/feature/qr/tab/qr_scan/qr_scan_tab.dart

@@ -39,8 +39,13 @@ class QrScanTab extends StatelessWidget {
         children: [
           BlocListener<QrScanBloc, QrScanState>(
             listener: (context, state) {
-              if (state is QrScanSuccess) {
-                SemanticsService.announce(context.l10n.qrScanTabCameraScanningQrScannedAnnouncement, TextDirection.ltr);
+              final String? announcement = switch (state) {
+                QrScanScanning() => context.l10n.qrScanTabCameraScanningQrScanningAnnouncement,
+                QrScanSuccess() => context.l10n.qrScanTabCameraScanningQrScanningAnnouncement,
+                _ => null,
+              };
+              if (announcement != null) {
+                SemanticsService.announce(announcement, TextDirection.ltr);
               }
             },
             child: BlocBuilder<QrScanBloc, QrScanState>(

wallet_app/test/src/feature/wallet/personalize/wallet_personalize_screen_test.dart

@@ -50,7 +50,7 @@ void main() {
     ),
     DataAttribute(
       valueType: AttributeValueType.text,
-      label: 'Geboortenaam',
+      label: 'Naam bij geboorte',
       value: 'John',
       key: 'mock.birthName',
       sourceCardId: kPidId,