pop progress dialog with navigatorKey (apache#25255)

darkhan.nausharipov · darkhan.nausharipov · commit 7626f8fef3ea · 2023-02-13T22:40:25.000+06:00
diff --git a/learning/tour-of-beam/frontend/lib/components/profile/user_menu.dart b/learning/tour-of-beam/frontend/lib/components/profile/user_menu.dart
@@ -89,18 +89,13 @@ class _Info extends StatelessWidget {
   }
 }
 
-class _Buttons extends StatefulWidget {
+class _Buttons extends StatelessWidget {
   final VoidCallback closeOverlayCallback;
 
   const _Buttons({
     required this.closeOverlayCallback,
   });
 
-  @override
-  State<_Buttons> createState() => _ButtonsState();
-}
-
-class _ButtonsState extends State<_Buttons> {
   @override
   Widget build(BuildContext context) {
     final authNotifier = GetIt.instance.get<AuthNotifier>();
@@ -123,25 +118,26 @@ class _ButtonsState extends State<_Buttons> {
         _IconLabel(
           onTap: () async {
             await authNotifier.logOut();
-            widget.closeOverlayCallback();
+            closeOverlayCallback();
           },
           iconPath: Assets.svg.profileLogout,
           label: 'ui.signOut'.tr(),
         ),
         const BeamDivider(),
         _IconLabel(
           onTap: () async {
-            widget.closeOverlayCallback();
+            closeOverlayCallback();
             final confirmed = await ConfirmDialog.show(
               context: context,
               confirmButtonText: 'ui.deleteMyAccount'.tr(),
               subtitle: 'dialogs.deleteAccountWarning'.tr(),
               title: 'ui.deleteTobAccount'.tr(),
             );
-            if (confirmed && mounted) {
-              await BeamOverlays.showProgressOverlay(
-                this.context,
-                authNotifier.deleteAccount(),
+            if (confirmed) {
+              ProgressDialog.show(
+                future: authNotifier.deleteAccount(),
+                navigatorKey:
+                    GetIt.instance.get<BeamRouterDelegate>().navigatorKey!,
               );
             }
           },
diff --git a/learning/tour-of-beam/frontend/lib/locator.dart b/learning/tour-of-beam/frontend/lib/locator.dart
@@ -18,6 +18,7 @@
 
 import 'package:app_state/app_state.dart';
 import 'package:get_it/get_it.dart';
+import 'package:playground_components/playground_components.dart';
 
 import 'auth/notifier.dart';
 import 'cache/content_tree.dart';
@@ -52,12 +53,12 @@ void _initializeCaches() {
 }
 
 void _initializeState() {
-  GetIt.instance.registerSingleton(AppNotifier());
-  GetIt.instance.registerSingleton(
-    PageStack(
-      bottomPage: WelcomePage(),
-      createPage: PageFactory.createPage,
-      routeInformationParser: TobRouteInformationParser(),
-    ),
+  final pageStack = PageStack(
+    bottomPage: WelcomePage(),
+    createPage: PageFactory.createPage,
+    routeInformationParser: TobRouteInformationParser(),
   );
+  GetIt.instance.registerSingleton(AppNotifier());
+  GetIt.instance.registerSingleton(pageStack);
+  GetIt.instance.registerSingleton(BeamRouterDelegate(pageStack));
 }
diff --git a/learning/tour-of-beam/frontend/lib/main.dart b/learning/tour-of-beam/frontend/lib/main.dart
@@ -42,7 +42,7 @@ void main() async {
   const englishLocale = Locale('en');
 
   final pageStack = GetIt.instance.get<PageStack>();
-  final routerDelegate = BeamRouterDelegate(pageStack);
+  final routerDelegate = GetIt.instance.get<BeamRouterDelegate>();
   final routeInformationParser = TobRouteInformationParser();
   final backButtonDispatcher = PageStackBackButtonDispatcher(pageStack);
 
diff --git a/learning/tour-of-beam/frontend/lib/pages/tour/state.dart b/learning/tour-of-beam/frontend/lib/pages/tour/state.dart
@@ -214,11 +214,11 @@ class TourNotifier extends ChangeNotifier with PageStateMixin<void> {
   }
 
   @override
-  void dispose() {
+  Future<void> dispose() async {
     _unitContentCache.removeListener(_onUnitChanged);
     contentTreeController.removeListener(_onUnitChanged);
     _appNotifier.removeListener(_onAppNotifierChanged);
     _authNotifier.removeListener(_onUnitProgressChanged);
-    super.dispose();
+    await super.dispose();
   }
 }
diff --git a/playground/frontend/playground_components/lib/playground_components.dart b/playground/frontend/playground_components/lib/playground_components.dart
@@ -61,6 +61,7 @@ export 'src/widgets/bubble.dart';
 export 'src/widgets/clickable.dart';
 export 'src/widgets/complexity.dart';
 export 'src/widgets/dialogs/confirm.dart';
+export 'src/widgets/dialogs/progress.dart';
 export 'src/widgets/divider.dart';
 export 'src/widgets/header_icon_button.dart';
 export 'src/widgets/loading_error.dart';
@@ -72,7 +73,6 @@ export 'src/widgets/output/output_tab.dart';
 export 'src/widgets/output/output_tabs.dart';
 export 'src/widgets/overlay/body.dart';
 export 'src/widgets/overlay/opener.dart';
-export 'src/widgets/overlay/overlays.dart';
 export 'src/widgets/overlay/widget.dart';
 export 'src/widgets/reset_button.dart';
 export 'src/widgets/run_or_cancel_button.dart';
diff --git a/playground/frontend/playground_components/lib/src/widgets/dialogs/progress.dart b/playground/frontend/playground_components/lib/src/widgets/dialogs/progress.dart
@@ -16,32 +16,42 @@
  * limitations under the License.
  */
 
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 
-import '../../../playground_components.dart';
+class ProgressDialog extends StatelessWidget {
+  const ProgressDialog();
+
+  static void show({
+    required Future future,
+    required GlobalKey<NavigatorState> navigatorKey,
+  }) {
+    var shown = true;
+    unawaited(
+      showDialog(
+        context: navigatorKey.currentContext!,
+        builder: (_) => const ProgressDialog(),
+      ).whenComplete(() {
+        shown = false;
+      }),
+    );
+    unawaited(
+      future.whenComplete(() {
+        if (shown) {
+          navigatorKey.currentState!.pop();
+        }
+      }),
+    );
+  }
 
-/// Groups common overlays.
-class BeamOverlays {
-  /// Shows an overlay with [CircularProgressIndicator]
-  /// until [future] completes.
-  static Future<void> showProgressOverlay(
-    BuildContext context,
-    Future future,
-  ) async {
-    final closeNotifier = PublicNotifier();
-    showOverlay(
-      context: context,
-      closeNotifier: closeNotifier,
-      barrierDismissible: false,
-      positioned: Positioned.fill(
-        child: Container(
-          alignment: Alignment.center,
-          color: Theme.of(context).dialogBackgroundColor.withOpacity(0.2),
-          child: const CircularProgressIndicator(),
-        ),
+  @override
+  Widget build(BuildContext context) {
+    return const Dialog(
+      backgroundColor: Colors.transparent,
+      child: Center(
+        child: CircularProgressIndicator(),
       ),
     );
-    await future;
-    closeNotifier.notifyPublic();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -214,11 +214,11 @@ class TourNotifier extends ChangeNotifier with PageStateMixin<void> {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`@override`
`217`		`- void dispose() {`
	`217`	`+ Future<void> dispose() async {`
`218`	`218`	`_unitContentCache.removeListener(_onUnitChanged);`
`219`	`219`	`contentTreeController.removeListener(_onUnitChanged);`
`220`	`220`	`_appNotifier.removeListener(_onAppNotifierChanged);`
`221`	`221`	`_authNotifier.removeListener(_onUnitProgressChanged);`
`222`		`- super.dispose();`
	`222`	`+ await super.dispose();`
`223`	`223`	`}`
`224`	`224`	`}`