Merge branch '28902-change-pop-to-maybepop'

lib/app/mixins/repo_actions_mixin.dart

@@ -168,7 +168,7 @@ mixin RepositoryActionsMixin on LoggyType {
       actions: [
         TextButton(
           child: Text(S.current.actionCloseCapital),
-          onPressed: () => Navigator.of(context).pop(false),
+          onPressed: () async => await Navigator.of(context).maybePop(false),
         ),
       ],
     );
@@ -205,11 +205,12 @@ mixin RepositoryActionsMixin on LoggyType {
           Fields.dialogActions(context, buttons: [
             NegativeButton(
                 text: S.current.actionCancelCapital,
-                onPressed: () => Navigator.of(context).pop(false),
+                onPressed: () async =>
+                    await Navigator.of(context).maybePop(false),
                 buttonsAspectRatio: Dimensions.aspectRatioModalDialogButton),
             PositiveButton(
               text: S.current.actionDeleteCapital,
-              onPressed: () => Navigator.of(context).pop(true),
+              onPressed: () async => await Navigator.of(context).maybePop(true),
               buttonsAspectRatio: Dimensions.aspectRatioModalDialogButton,
               isDangerButton: true,
             )
@@ -220,7 +221,7 @@ mixin RepositoryActionsMixin on LoggyType {
 
     if (deleteRepo ?? false) {
       await Dialogs.executeFutureWithLoadingDialog(
-        context,
+        null,
         reposCubit.deleteRepository(repoLocation),
       );
 

lib/app/pages/main_page.dart

@@ -210,11 +210,13 @@ class _MainPageState extends State<MainPage>
                     actions: [
                       TextButton(
                         child: Text(S.current.actionSkip.toUpperCase()),
-                        onPressed: () => Navigator.of(context).pop(false),
+                        onPressed: () async =>
+                            await Navigator.of(context).maybePop(false),
                       ),
                       TextButton(
                         child: Text(S.current.actionInstallDokan.toUpperCase()),
-                        onPressed: () => Navigator.of(context).pop(true),
+                        onPressed: () async =>
+                            await Navigator.of(context).maybePop(true),
                       )
                     ],
                   ),
@@ -276,11 +278,13 @@ class _MainPageState extends State<MainPage>
                     actions: [
                       TextButton(
                         child: Text(S.current.actionSkip.toUpperCase()),
-                        onPressed: () => Navigator.of(context).pop(false),
+                        onPressed: () async =>
+                            Navigator.of(context).maybePop(false),
                       ),
                       TextButton(
                         child: Text(S.current.actionInstallDokan.toUpperCase()),
-                        onPressed: () => Navigator.of(context).pop(true),
+                        onPressed: () async =>
+                            await Navigator.of(context).maybePop(true),
                       )
                     ],
                   ),
@@ -341,8 +345,9 @@ class _MainPageState extends State<MainPage>
                   actions: [
                     TextButton(
                       child: Text(S.current.actionCloseCapital),
-                      onPressed: () =>
-                          Navigator.of(context, rootNavigator: true).pop(false),
+                      onPressed: () async =>
+                          await Navigator.of(context, rootNavigator: true)
+                              .maybePop(false),
                     )
                   ],
                 ),
@@ -1048,7 +1053,8 @@ class _MainPageState extends State<MainPage>
                 ])),
                 actions: [
                   TextButton(
-                      onPressed: () => Navigator.of(context).pop(),
+                      onPressed: () async =>
+                          await Navigator.of(context).maybePop(),
                       child: Text(S.current.actionCloseCapital))
                 ]);
           });

lib/app/pages/qr_scanner_page.dart

@@ -91,7 +91,8 @@ class _QRScannerState extends State<QRScanner> with AppLogger {
 
             loggy.debug('Barcode found! $code');
             scanned = true;
-            Navigator.of(context).pop(code);
+
+            await Navigator.of(context).maybePop(code);
           }
         });
   }

lib/app/pages/repo_import_page.dart

@@ -121,7 +121,8 @@ class RepoImportPage extends StatelessWidget {
               final result = await parseShareToken(reposCubit, data);
               switch (result) {
                 case ShareTokenValid(value: final token):
-                  Navigator.of(context).pop(RepoImportFromToken(token));
+                  await Navigator.of(context)
+                      .maybePop(RepoImportFromToken(token));
                 case ShareTokenInvalid(error: final error):
                   showSnackBar(error.toString());
               }
@@ -198,8 +199,8 @@ class RepoImportPage extends StatelessWidget {
       _buildButton(
         S.current.actionAddRepository.toUpperCase(),
         switch (state) {
-          ShareTokenValid(value: final token) => () =>
-              Navigator.of(context).pop(RepoImportFromToken(token)),
+          ShareTokenValid(value: final token) => () async =>
+              await Navigator.of(context).maybePop(RepoImportFromToken(token)),
           ShareTokenInvalid() || null => null,
         },
       );
@@ -231,7 +232,7 @@ class RepoImportPage extends StatelessWidget {
 
           await Future.wait(locations.map(reposCubit.importRepoFromLocation));
 
-          Navigator.of(context).pop(RepoImportFromFiles(locations));
+          await Navigator.of(context).maybePop(RepoImportFromFiles(locations));
         }),
       ],
     );

lib/app/pages/repo_qr_page.dart

@@ -23,7 +23,7 @@ class _RepositoryQRPageState extends State<RepositoryQRPage> {
       appBar: DirectionalAppBar(
         leading: Fields.actionIcon(
           const Icon(Icons.close, color: Colors.white),
-          onPressed: () => Navigator.of(context).pop(),
+          onPressed: () async => await Navigator.of(context).maybePop(),
         ),
         backgroundColor: Colors.transparent,
       ),

lib/app/pages/repo_security_page.dart

@@ -92,10 +92,10 @@ class RepoSecurityPage extends StatelessWidget {
       actions: [
         TextButton(
             child: Text(S.current.actionCancel),
-            onPressed: () => Navigator.of(context).pop(false)),
+            onPressed: () async => await Navigator.of(context).maybePop(false)),
         TextButton(
             child: Text(S.current.actionDiscard),
-            onPressed: () => Navigator.of(context).pop(true))
+            onPressed: () async => await Navigator.of(context).maybePop(true))
       ],
     ).then((pop) {
       if (pop ?? false) {
@@ -131,10 +131,10 @@ class RepoSecurityPage extends StatelessWidget {
       actions: [
         TextButton(
             child: Text(S.current.actionCancel),
-            onPressed: () => Navigator.of(context).pop(false)),
+            onPressed: () async => await Navigator.of(context).maybePop(false)),
         TextButton(
             child: Text(S.current.actionAccept),
-            onPressed: () => Navigator.of(context).pop(true))
+            onPressed: () async => await Navigator.of(context).maybePop(true))
       ],
     );
 

lib/app/utils/dialogs.dart

@@ -4,13 +4,15 @@ import 'package:build_context_provider/build_context_provider.dart';
 import 'package:flutter/material.dart';
 
 import '../../generated/l10n.dart';
-import '../cubits/cubits.dart';
-import '../widgets/widgets.dart';
-import 'utils.dart';
+import '../cubits/cubits.dart' show RepoCubit;
+import '../widgets/widgets.dart'
+    show ActionsDialog, NegativeButton, PositiveButton;
+import 'utils.dart'
+    show AppThemeExtension, Dimensions, Fields, Strings, ThemeGetter;
 
 abstract class Dialogs {
   static Future<T> executeWithLoadingDialog<T>(
-      BuildContext context, Future<T> func()) {
+      BuildContext? context, Future<T> Function() func) {
     return executeFutureWithLoadingDialog(context, func());
   }
 
@@ -26,11 +28,11 @@ abstract class Dialogs {
   }
 
   static void _showLoadingDialog(BuildContext? context) => context != null
-      ? _loadingDialog(context)
-      : WidgetsBinding.instance
-          .addPostFrameCallback((_) => BuildContextProvider()(_loadingDialog));
+      ? unawaited(_loadingDialog(context))
+      : WidgetsBinding.instance.addPostFrameCallback(
+          (_) => BuildContextProvider()((c) => unawaited(_loadingDialog(c))));
 
-  static Future<void> _loadingDialog(BuildContext context) => showDialog(
+  static Future<void> _loadingDialog(BuildContext context) async => showDialog(
       context: context,
       barrierDismissible: false,
       builder: (BuildContext context) => PopScope(
@@ -42,10 +44,10 @@ abstract class Dialogs {
             ),
           ));
 
-  static _hideLoadingDialog(BuildContext? context) => context != null
-      ? _popDialog(context)
-      : BuildContextProvider()
-          .call((globalContext) => _popDialog(globalContext));
+  static void _hideLoadingDialog(BuildContext? context) =>
+      WidgetsBinding.instance.addPostFrameCallback((_) => context != null
+          ? _popDialog(context)
+          : BuildContextProvider().call((c) => _popDialog(c)));
 
   static void _popDialog(BuildContext context) =>
       Navigator.of(context, rootNavigator: true).pop();
@@ -81,10 +83,10 @@ abstract class Dialogs {
                 [
                   TextButton(
                     child: Text(S.current.actionCloseCapital),
-                    onPressed: () => Navigator.of(
+                    onPressed: () async => await Navigator.of(
                       context,
                       rootNavigator: true,
-                    ).pop(false),
+                    ).maybePop(false),
                   ),
                 ],
           );
@@ -134,16 +136,17 @@ abstract class Dialogs {
               Fields.dialogActions(context, buttons: [
                 NegativeButton(
                     text: S.current.actionCancel,
-                    onPressed: () =>
-                        Navigator.of(context, rootNavigator: true).pop(),
+                    onPressed: () async =>
+                        await Navigator.of(context, rootNavigator: true)
+                            .maybePop(),
                     buttonsAspectRatio:
                         Dimensions.aspectRatioModalDialogButton),
                 PositiveButton(
                     text: S.current.actionDelete,
                     isDangerButton: true,
                     onPressed: () async {
                       await repo.deleteFile(path);
-                      Navigator.of(context).pop(fileName);
+                      await Navigator.of(context).maybePop(fileName);
                     },
                     buttonsAspectRatio: Dimensions.aspectRatioModalDialogButton)
               ])
@@ -171,15 +174,17 @@ abstract class Dialogs {
                 buttons: [
                   NegativeButton(
                     text: S.current.actionCancel,
-                    onPressed: () =>
-                        Navigator.of(context, rootNavigator: true).pop(false),
+                    onPressed: () async =>
+                        await Navigator.of(context, rootNavigator: true)
+                            .maybePop(false),
                     buttonsAspectRatio: Dimensions.aspectRatioModalDialogButton,
                   ),
                   PositiveButton(
                     text: S.current.actionDelete,
                     isDangerButton: true,
-                    onPressed: () =>
-                        Navigator.of(context, rootNavigator: true).pop(true),
+                    onPressed: () async =>
+                        await Navigator.of(context, rootNavigator: true)
+                            .maybePop(true),
                     buttonsAspectRatio: Dimensions.aspectRatioModalDialogButton,
                   ),
                 ],

lib/app/utils/file_io.dart

@@ -172,9 +172,7 @@ class FileIO with AppLogger {
   }
 
   Future<bool> _maybeRequestPermission(BuildContext context) async {
-    if (!io.Platform.isAndroid &&
-        !io.Platform.isIOS &&
-        !io.Platform.isWindows) {
+    if (!io.Platform.isAndroid) {
       return true;
     }
 

lib/app/utils/local_auth.dart

@@ -1,7 +1,9 @@
 import 'dart:io';
-import 'package:flutter/material.dart';
+
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:local_auth/local_auth.dart';
+
 import '../../generated/l10n.dart';
 
 abstract class LocalAuth {
@@ -55,9 +57,7 @@ abstract class LocalAuth {
 Future<bool> _debugAuthenticate(BuildContext context, String reason) async {
   Widget button(context, text, value) => TextButton(
         child: Text(text),
-        onPressed: () {
-          Navigator.of(context).pop(value);
-        },
+        onPressed: () => Navigator.of(context).pop(value),
       );
 
   bool? authenticated = await showDialog(

lib/app/utils/permissions.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 import '../../generated/l10n.dart';
-import 'utils.dart';
+import 'utils.dart' show Dialogs, Dimensions;
 
 class Permissions {
   static Future<PermissionStatus> requestPermission(
@@ -42,22 +42,25 @@ class Permissions {
           ? <Widget>[
               TextButton(
                 child: Text(S.current.actionCloseCapital),
-                onPressed: () =>
-                    Navigator.of(context, rootNavigator: true).pop(false),
+                onPressed: () async =>
+                    await Navigator.of(context, rootNavigator: true)
+                        .maybePop(false),
               ),
               TextButton(
                   child: Text(S.current.actionGoToSettings.toUpperCase()),
-                  onPressed: () {
-                    openAppSettings();
+                  onPressed: () async {
+                    await openAppSettings();
 
-                    Navigator.of(context, rootNavigator: true).pop(true);
+                    await Navigator.of(context, rootNavigator: true)
+                        .maybePop(true);
                   })
             ]
           : <Widget>[
               TextButton(
                 child: Text(S.current.actionCloseCapital),
-                onPressed: () =>
-                    Navigator.of(context, rootNavigator: true).pop(false),
+                onPressed: () async =>
+                    await Navigator.of(context, rootNavigator: true)
+                        .maybePop(false),
               )
             ];
 

lib/app/utils/utils.dart

@@ -19,6 +19,7 @@ export 'hotspot.dart';
 export 'inline_text_styles.dart';
 export 'local_auth.dart';
 export 'log.dart';
+export 'master_key.dart';
 export 'log_reader.dart';
 export 'move_entry.dart';
 export 'password_hasher.dart';

lib/app/widgets/bars/sort_contents_bar.dart

@@ -2,11 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../../generated/l10n.dart';
-import '../../cubits/cubits.dart';
-import '../../models/models.dart';
-import '../../utils/utils.dart';
-import '../buttons/sort_by_button.dart';
-import '../buttons/sort_direction_button.dart';
+import '../../cubits/cubits.dart'
+    show ReposCubit, SortBy, SortDirection, SortListCubit, SortListState;
+import '../../models/models.dart' show OpenRepoEntry;
+import '../../utils/utils.dart'
+    show AppLogger, Dialogs, Dimensions, Fields, StringExtension;
+import '../widgets.dart' show SortByButton, SortDirectionButton;
 
 class SortContentsBar extends StatefulWidget {
   const SortContentsBar(
@@ -150,7 +151,7 @@ class _SortByList extends StatelessWidget with AppLogger {
                   textOverflow: TextOverflow.ellipsis,
                   textSoftWrap: false,
                   style: settingStyle,
-                  onTap: () {
+                  onTap: () async {
                     _sortCubit.sortBy(sortByItem);
 
                     if (_reposCubit.showList) {
@@ -160,8 +161,8 @@ class _SortByList extends StatelessWidget with AppLogger {
                     }
 
                     if (_reposCubit.currentRepo is OpenRepoEntry) {
-                      Dialogs.executeFutureWithLoadingDialog(
-                        context,
+                      await Dialogs.executeFutureWithLoadingDialog(
+                        null,
                         (_reposCubit.currentRepo as OpenRepoEntry)
                             .cubit
                             .refresh(