Feature/accessibility fixes (#70)

* Accessibility fix #43 * Accessibility fix #44 * Accessibility fix #45 * Accessibility fix #46 * Accessibility fix #47 * Accessibility fix #48 * Accessibility fix #49 * Accessibility fix #51 * Accessibility fix #50 * Accessibility fix #52 * Skip signing debug builds To simplify local development * Fix infinite loading state for remote signing
slovensko-digital · Nov 17, 2024 · e8b3fef · e8b3fef
1 parent cf70cf0
commit e8b3fef
Show file tree

Hide file tree

Showing 17 changed files with 284 additions and 120 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -59,7 +59,10 @@ android {
 
     signingConfigs {
         release {
-            storeFile file(System.getenv("AVM_KEYSTORE_FILE"))
+            def keystorePath = System.getenv("AVM_KEYSTORE_FILE")
+            if (keystorePath != null) {
+                storeFile file(keystorePath)
+            }
             storePassword System.getenv("AVM_KEYSTORE_PASSWORD")
             keyAlias System.getenv("AVM_KEY_ALIAS")
             keyPassword System.getenv("AVM_KEY_PASSWORD")
@@ -70,6 +73,10 @@ android {
         release {
             signingConfig signingConfigs.release
         }
+
+        debug {
+            // no signing config for debug builds
+        }
     }
 }
 

diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/lib/bloc/present_signed_document_cubit.dart b/lib/bloc/present_signed_document_cubit.dart
@@ -11,6 +11,7 @@ import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
 
 import '../app_service.dart';
+import '../data/document_signing_type.dart';
 import '../file_extensions.dart';
 import '../file_system_entity_extensions.dart';
 import '../ui/screens/present_signed_document_screen.dart';
@@ -31,11 +32,17 @@ class PresentSignedDocumentCubit extends Cubit<PresentSignedDocumentState> {
 
   final SignDocumentResponseBody signedDocument;
 
-  PresentSignedDocumentCubit({
-    required AppService appService,
-    @factoryParam required this.signedDocument,
-  })  : _appService = appService,
-        super(const PresentSignedDocumentInitialState());
+  PresentSignedDocumentCubit(
+      {required AppService appService,
+      @factoryParam required this.signedDocument,
+      @factoryParam required DocumentSigningType signingType})
+      : _appService = appService,
+        super(
+          signingType == DocumentSigningType.local
+              ? const PresentSignedDocumentInitialState()
+              // Remote documents are not saved locally, so we go directly to success state
+              : const PresentSignedRemoteDocumentSuccessState(),
+        );
 
   /// Saves [signedDocument] into public directory.
   Future<void> saveDocument() async {
@@ -67,7 +74,7 @@ class PresentSignedDocumentCubit extends Cubit<PresentSignedDocumentState> {
   Future<File> getShareableFile() async {
     final state = this.state;
 
-    if (state is PresentSignedDocumentSuccessState) {
+    if (state is PresentSignedLocalDocumentSuccessState) {
       final file = state.file;
 
       if (await file.exists()) {

diff --git a/lib/bloc/present_signed_document_state.dart b/lib/bloc/present_signed_document_state.dart
@@ -15,8 +15,8 @@ sealed class PresentSignedDocumentState {
     return PresentSignedDocumentErrorState(error);
   }
 
-  PresentSignedDocumentSuccessState toSuccess(File file) {
-    return PresentSignedDocumentSuccessState(file);
+  PresentSignedLocalDocumentSuccessState toSuccess(File file) {
+    return PresentSignedLocalDocumentSuccessState(file);
   }
 
   @override
@@ -44,13 +44,24 @@ class PresentSignedDocumentErrorState extends PresentSignedDocumentState {
   }
 }
 
-class PresentSignedDocumentSuccessState extends PresentSignedDocumentState {
+class PresentSignedLocalDocumentSuccessState
+    extends PresentSignedDocumentState {
   final File file;
 
-  const PresentSignedDocumentSuccessState(this.file);
+  const PresentSignedLocalDocumentSuccessState(this.file);
 
   @override
   String toString() {
     return "$runtimeType(file: $file)";
   }
 }
+
+class PresentSignedRemoteDocumentSuccessState
+    extends PresentSignedDocumentState {
+  const PresentSignedRemoteDocumentSuccessState();
+
+  @override
+  String toString() {
+    return "$runtimeType()";
+  }
+}
diff --git a/lib/di.config.dart b/lib/di.config.dart
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
@@ -217,6 +217,48 @@ abstract class AppLocalizations {
   /// **'Podpísať iným certifikátom'**
   String get buttonSignWithDifferentCertificateLabel;
 
+  /// No description provided for @buttonMenuLabelSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Otvoriť menu'**
+  String get buttonMenuLabelSemantics;
+
+  /// No description provided for @qrCodeScannerTorchOnSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Zapnúť blesk'**
+  String get qrCodeScannerTorchOnSemantics;
+
+  /// No description provided for @qrCodeScannerTorchOffSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Vypnúť blesk'**
+  String get qrCodeScannerTorchOffSemantics;
+
+  /// No description provided for @qrCodeScannerBackSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Späť'**
+  String get qrCodeScannerBackSemantics;
+
+  /// No description provided for @qrCodeScannerOpenSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Podpísať vzdialený dokument pomocou QR kódu'**
+  String get qrCodeScannerOpenSemantics;
+
+  /// No description provided for @shareDocumentPreviewSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Zdieľať náhľad dokumentu'**
+  String get shareDocumentPreviewSemantics;
+
+  /// No description provided for @previewDocumentSemantics.
+  ///
+  /// In sk, this message translates to:
+  /// **'Náhľad dokumentu'**
+  String get previewDocumentSemantics;
+
   /// No description provided for @deepLinkParseErrorMessage.
   ///
   /// In sk, this message translates to:

diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart
@@ -71,6 +71,27 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get buttonSignWithDifferentCertificateLabel => 'Podpísať iným certifikátom';
 
+  @override
+  String get buttonMenuLabelSemantics => 'Otvoriť menu';
+
+  @override
+  String get qrCodeScannerTorchOnSemantics => 'Zapnúť blesk';
+
+  @override
+  String get qrCodeScannerTorchOffSemantics => 'Vypnúť blesk';
+
+  @override
+  String get qrCodeScannerBackSemantics => 'Späť';
+
+  @override
+  String get qrCodeScannerOpenSemantics => 'Podpísať vzdialený dokument pomocou QR kódu';
+
+  @override
+  String get shareDocumentPreviewSemantics => 'Zdieľať náhľad dokumentu';
+
+  @override
+  String get previewDocumentSemantics => 'Náhľad dokumentu';
+
   @override
   String deepLinkParseErrorMessage(Object error) {
     return 'Nepodporovaný alebo nesprávny odkaz:\n$error';

diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
@@ -22,6 +22,13 @@
   "buttonSelectCertificateLabel": "Vybrať certifikát",
   "buttonSignWithCertificateLabel": "Podpísať ako {subject}",
   "buttonSignWithDifferentCertificateLabel": "Podpísať iným certifikátom",
+  "buttonMenuLabelSemantics": "Otvoriť menu",
+  "qrCodeScannerTorchOnSemantics": "Zapnúť blesk",
+  "qrCodeScannerTorchOffSemantics": "Vypnúť blesk",
+  "qrCodeScannerBackSemantics": "Späť",
+  "qrCodeScannerOpenSemantics": "Podpísať vzdialený dokument pomocou QR kódu",
+  "shareDocumentPreviewSemantics": "Zdieľať náhľad dokumentu",
+  "previewDocumentSemantics": "Náhľad dokumentu",
 
   "deepLinkParseErrorMessage": "Nepodporovaný alebo nesprávny odkaz:\n{error}",
   "stepIndicatorText": "Krok {stepNumber} z {totalSteps}",

diff --git a/lib/ui/screens/about_screen.dart b/lib/ui/screens/about_screen.dart
@@ -40,10 +40,13 @@ class _Body extends StatelessWidget {
 
     final child = Column(
       children: [
-        Text(
-          strings.appName,
-          textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.headlineLarge,
+        Semantics(
+          header: true,
+          child: Text(
+            strings.appName,
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.headlineLarge,
+          ),
         ),
         const SizedBox(height: 16),
         const AppVersionText(),

diff --git a/lib/ui/screens/main_menu_screen.dart b/lib/ui/screens/main_menu_screen.dart
@@ -29,12 +29,15 @@ class MainMenuScreen extends StatelessWidget {
           const Spacer(flex: 1),
           Padding(
             padding: const EdgeInsets.only(bottom: 20),
-            child: Text(
-              strings.menuTitle,
-              style: const TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w700,
-                letterSpacing: 0.15,
+            child: Semantics(
+              header: true,
+              child: Text(
+                strings.menuTitle,
+                style: const TextStyle(
+                  fontSize: 20,
+                  fontWeight: FontWeight.w700,
+                  letterSpacing: 0.15,
+                ),
               ),
             ),
           ),
@@ -157,11 +160,14 @@ class _MenuItem extends StatelessWidget {
 
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 4),
-      child: InkWell(
-        onTap: onPressed,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 8),
-          child: text,
+      child: Semantics(
+        button: true,
+        child: InkWell(
+          onTap: onPressed,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(vertical: 8),
+            child: text,
+          ),
         ),
       ),
     );