chore: Improved some dialogs.

Author: Skyost

lib/main.dart

@@ -18,7 +18,7 @@ import 'package:open_authenticator/model/crypto.dart';
 import 'package:open_authenticator/model/settings/show_intro.dart';
 import 'package:open_authenticator/model/settings/theme.dart';
 import 'package:open_authenticator/model/totp/repository.dart';
-import 'package:open_authenticator/pages/contributor_plan_fallback_paywall.dart';
+import 'package:open_authenticator/pages/contributor_plan_paywall/page.dart';
 import 'package:open_authenticator/pages/home.dart';
 import 'package:open_authenticator/pages/intro/page.dart';
 import 'package:open_authenticator/pages/scan.dart';
@@ -231,8 +231,8 @@ class OpenAuthenticatorApp extends ConsumerWidget {
                   ),
                 );
               },
-              ContributorPlanFallbackPaywallPage.name: (_) => const _RouteWidget(
-                    child: ContributorPlanFallbackPaywallPage(),
+              ContributorPlanPaywallPage.name: (_) => const _RouteWidget(
+                    child: ContributorPlanPaywallPage(),
                   ),
             }
           : {},

lib/utils/jovial_svg.dart

@@ -25,7 +25,7 @@ class JovialSvgUtils {
       siCompactBuilder.si.writeToFile(outputSink);
       return true;
     } catch (ex, stacktrace) {
-      handleException(ex, stacktrace);
+      handleException(ex, stacktrace, sendToCrashlytics: false);
     } finally {
       await ioSink.close();
     }

lib/widgets/dialog/app_dialog.dart

@@ -55,6 +55,9 @@ class AppDialog extends StatelessWidget {
   /// The content padding.
   final EdgeInsets? contentPadding;
 
+  /// Whether to put the content in a [ListView] instead of a [Column].
+  final bool scrollable;
+
   /// Creates a new app dialog instance.
   const AppDialog({
     super.key,
@@ -65,6 +68,7 @@ class AppDialog extends StatelessWidget {
     this.borderRadius = 28,
     this.displayCloseButton,
     this.contentPadding,
+    this.scrollable = true,
   });
 
   @override
@@ -89,6 +93,19 @@ class AppDialog extends StatelessWidget {
           child: this.children[i],
         ),
     ];
+    children = [
+      if (title != null)
+        Transform.translate(
+          offset: Offset(0, -1),
+          child: _AppDialogTitle(
+            title: title!,
+            ellipsisTitleOnOverflow: ellipsisTitleOnOverflow,
+            displayCloseButton: displayCloseButton,
+            borderRadius: borderRadius,
+          ),
+        ),
+      ...children,
+    ];
     Widget dialog = AlertDialog(
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.all(
@@ -98,22 +115,15 @@ class AppDialog extends StatelessWidget {
       contentPadding: EdgeInsets.zero,
       content: SizedBox(
         width: MediaQuery.sizeOf(context).width,
-        child: ListView(
-          shrinkWrap: true,
-          children: [
-            if (title != null)
-              Transform.translate(
-                offset: Offset(0, -1),
-                child: _AppDialogTitle(
-                  title: title!,
-                  ellipsisTitleOnOverflow: ellipsisTitleOnOverflow,
-                  displayCloseButton: displayCloseButton,
-                  borderRadius: borderRadius,
-                ),
+        child: scrollable
+            ? ListView(
+                shrinkWrap: true,
+                children: children,
+              )
+            : Column(
+                mainAxisSize: MainAxisSize.min,
+                children: children,
               ),
-            ...children,
-          ],
-        ),
       ),
       actions: actions,
     );

lib/widgets/scan/scanner_error_widget.dart

@@ -17,28 +17,31 @@ class ScannerErrorWidget extends StatelessWidget {
   Widget build(BuildContext context) => ColoredBox(
         color: Colors.black,
         child: Center(
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              const Padding(
-                padding: EdgeInsets.only(bottom: 20),
-                child: Icon(
-                  Icons.error,
-                  color: Colors.white,
+          child: Padding(
+            padding: EdgeInsets.all(20),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Padding(
+                  padding: EdgeInsets.only(bottom: 20),
+                  child: Icon(
+                    Icons.error,
+                    color: Colors.white,
+                  ),
                 ),
-              ),
-              Text(
-                switch (error.errorCode) {
-                  MobileScannerErrorCode.controllerUninitialized => translations.error.scan.controllerUninitialized(exception: error.errorDetails?.details ?? error.errorCode),
-                  MobileScannerErrorCode.permissionDenied => translations.error.scan.accessDeniedDialog.message(exception: error.errorDetails?.details ?? error.errorCode),
-                  MobileScannerErrorCode.unsupported => translations.error.scan.unsupported(exception: error.errorDetails?.details ?? error.errorCode),
-                  _ => translations.error.generic.withException(exception: error.errorDetails?.details ?? error.errorCode),
-                },
-                style: const TextStyle(
-                  color: Colors.white,
+                Text(
+                  switch (error.errorCode) {
+                    MobileScannerErrorCode.controllerUninitialized => translations.error.scan.controllerUninitialized(exception: error.errorDetails?.details ?? error.errorCode),
+                    MobileScannerErrorCode.permissionDenied => translations.error.scan.accessDeniedDialog.message(exception: error.errorDetails?.details ?? error.errorCode),
+                    MobileScannerErrorCode.unsupported => translations.error.scan.unsupported(exception: error.errorDetails?.details ?? error.errorCode),
+                    _ => translations.error.generic.withException(exception: error.errorDetails?.details ?? error.errorCode),
+                  },
+                  style: const TextStyle(
+                    color: Colors.white,
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       );

lib/widgets/waiting_overlay.dart

@@ -12,8 +12,8 @@ Future<T> showWaitingOverlay<T>(
   String? timeoutMessage,
   bool Function()? onCancel,
 }) async {
-  OverlayEntry entry = OverlayEntry(builder: (context) {
-    return Stack(
+  OverlayEntry entry = OverlayEntry(
+    builder: (context) => Stack(
       children: [
         const ModalBarrier(
           dismissible: false,
@@ -26,8 +26,8 @@ Future<T> showWaitingOverlay<T>(
           onCancel: onCancel,
         ),
       ],
-    );
-  });
+    ),
+  );
   Overlay.of(context).insert(entry);
   if (future != null) {
     try {
@@ -77,6 +77,7 @@ class _WaitingDialogState extends State<_WaitingDialog> {
   Widget build(BuildContext context) => PopScope(
         canPop: false,
         child: AppDialog(
+          scrollable: false,
           actions: widget.onCancel == null
               ? null
               : [