Support nested navigator

- #1

Author: mono0926

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.0
+
+- Support nested navigator
+  - Expose `useRootNavigator`
+  - It works fine without specifying `useRootNavigator` in most cases
+  - Check [example/lib/nested_navigator_page.dart](https://github.com/mono0926/adaptive_dialog/blob/master/example/lib/pages/nested_navigator_page.dart)
+
 ## 0.3.1
 
 - Add `showDialog2020`, which wraps `showModal` with `FadeScaleTransitionConfiguration()`.

example/lib/pages/nested_navigator_page.dart

@@ -0,0 +1,81 @@
+import 'package:adaptive_dialog/adaptive_dialog.dart';
+import 'package:example/util/util.dart';
+import 'package:flutter/material.dart';
+
+class NestedNavigatorPage extends StatelessWidget {
+  const NestedNavigatorPage({Key key}) : super(key: key);
+
+  static const routeName = '/nested_navigator';
+
+  @override
+  Widget build(BuildContext context) {
+    final initialRoute = routeName.replaceFirst('/', '');
+    return Navigator(
+      initialRoute: initialRoute,
+      onGenerateRoute: (settings) {
+        assert(settings.name == initialRoute);
+        return MaterialPageRoute<void>(
+          builder: (context) => const _RootPage(),
+        );
+      },
+    );
+  }
+}
+
+class _RootPage extends StatelessWidget {
+  const _RootPage({Key key}) : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: BackButton(
+          onPressed: () => Navigator.of(
+            context,
+            rootNavigator: !ModalRoute.of(context).canPop,
+          ).pop(),
+        ),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        children: <Widget>[
+          RaisedButton(
+            child: const Text('Dialog'),
+            onPressed: () async {
+              final result = await showOkAlertDialog(
+                context: context,
+                title: 'Title',
+                message: 'This is message.',
+              );
+              logger.info(result);
+            },
+          ),
+          RaisedButton(
+            child: const Text('Sheet'),
+            onPressed: () async {
+              final result = await showModalActionSheet<String>(
+                context: context,
+                actions: [
+                  SheetAction(
+                    icon: Icons.info,
+                    label: 'Hello',
+                    key: 'helloKey',
+                  ),
+                ],
+              );
+              logger.info(result);
+            },
+          ),
+          const Divider(),
+          RaisedButton(
+            child: const Text('Next Page'),
+            onPressed: () {
+              Navigator.of(context).push<void>(MaterialPageRoute(
+                builder: (context) => const _RootPage(),
+              ));
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

example/lib/router.dart

@@ -3,13 +3,15 @@ import 'package:flutter/material.dart';
 import 'package:recase/recase.dart';
 
 import 'pages/alert_page.dart';
+import 'pages/nested_navigator_page.dart';
 import 'pages/sheet_page.dart';
 
 class Router {
   final Map<String, WidgetBuilder> pushRoutes = {
     AlertPage.routeName: (context) => const AlertPage(),
     SheetPage.routeName: (context) => const SheetPage(),
     TextInputDialogPage.routeName: (context) => const TextInputDialogPage(),
+    NestedNavigatorPage.routeName: (context) => const NestedNavigatorPage(),
   };
 
   Route onGenerateRoute(RouteSettings settings) {
@@ -42,5 +44,6 @@ class PageInfo {
         AlertPage.routeName,
         SheetPage.routeName,
         TextInputDialogPage.routeName,
+        NestedNavigatorPage.routeName,
       ].map((rn) => PageInfo(routeName: rn)).toList();
 }

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.1"
+    version: "0.4.0"
   animations:
     dependency: transitive
     description:

lib/src/action_callback.dart

@@ -0,0 +1 @@
+typedef ActionCallback<T> = void Function(T key);

lib/src/alert_dialog/alert_dialog_action.dart

@@ -1,9 +1,8 @@
+import 'package:adaptive_dialog/src/action_callback.dart';
 import 'package:adaptive_dialog/src/modal_action_sheet/sheet_action.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-typedef ActionCallback<T> = void Function(T key);
-
 /// Used for specifying showAlertDialog's actions.
 @immutable
 class AlertDialogAction<T> {

lib/src/alert_dialog/show_alert_dialog.dart

@@ -1,5 +1,4 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
-import 'package:animations/animations.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -16,8 +15,12 @@ Future<T> showAlertDialog<T>({
   bool barrierDismissible = true,
   AdaptiveStyle style = AdaptiveStyle.adaptive,
   bool useActionSheetForCupertino = false,
+  bool useRootNavigator = true,
 }) {
-  void pop(T key) => Navigator.of(context).pop(key);
+  void pop(T key) => Navigator.of(
+        context,
+        rootNavigator: useRootNavigator,
+      ).pop(key);
   final theme = Theme.of(context);
   final colorScheme = theme.colorScheme;
   final isCupertinoStyle = style.isCupertinoStyle(theme);
@@ -29,13 +32,15 @@ Future<T> showAlertDialog<T>({
       cancelLabel: actions.findCancelLabel(),
       actions: actions.convertToSheetActions(),
       style: style,
+      useRootNavigator: useRootNavigator,
     );
   }
   final titleText = title == null ? null : Text(title);
   final messageText = message == null ? null : Text(message);
   return style.isCupertinoStyle(theme)
       ? showCupertinoDialog(
           context: context,
+          useRootNavigator: useRootNavigator,
           builder: (context) => CupertinoAlertDialog(
             title: titleText,
             content: messageText,
@@ -46,6 +51,7 @@ Future<T> showAlertDialog<T>({
         )
       : showDialog2020(
           context: context,
+          useRootNavigator: useRootNavigator,
           builder: (context) => AlertDialog(
             title: titleText,
             content: messageText,

lib/src/alert_dialog/show_ok_alert_dialog.dart

@@ -14,6 +14,7 @@ Future<OkCancelResult> showOkAlertDialog({
   bool barrierDismissible = true,
   AdaptiveStyle alertStyle = AdaptiveStyle.adaptive,
   bool useActionSheetForCupertino = false,
+  bool useRootNavigator = true,
 }) async {
   final result = await showAlertDialog<OkCancelResult>(
     context: context,
@@ -22,6 +23,7 @@ Future<OkCancelResult> showOkAlertDialog({
     barrierDismissible: barrierDismissible,
     style: alertStyle,
     useActionSheetForCupertino: useActionSheetForCupertino,
+    useRootNavigator: useRootNavigator,
     actions: [
       AlertDialogAction(
         label: okLabel ?? MaterialLocalizations.of(context).okButtonLabel,

lib/src/alert_dialog/show_ok_cancel_alert_dialog.dart

@@ -21,6 +21,7 @@ Future<OkCancelResult> showOkCancelAlertDialog({
   bool barrierDismissible = true,
   AdaptiveStyle alertStyle = AdaptiveStyle.adaptive,
   bool useActionSheetForCupertino = false,
+  bool useRootNavigator = true,
 }) async {
   final isCupertinoStyle = Theme.of(context).isCupertinoStyle;
   String defaultCancelLabel() {
@@ -35,6 +36,7 @@ Future<OkCancelResult> showOkCancelAlertDialog({
     barrierDismissible: barrierDismissible,
     style: alertStyle,
     useActionSheetForCupertino: useActionSheetForCupertino,
+    useRootNavigator: useRootNavigator,
     actions: [
       AlertDialogAction(
         label: cancelLabel ?? defaultCancelLabel(),

lib/src/modal_action_sheet/cupertino_modal_action_sheet.dart

@@ -1,3 +1,4 @@
+import 'package:adaptive_dialog/src/action_callback.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:adaptive_dialog/src/extensions/extensions.dart';
@@ -6,20 +7,21 @@ import 'sheet_action.dart';
 class CupertinoModalActionSheet<T> extends StatelessWidget {
   const CupertinoModalActionSheet({
     Key key,
+    @required this.onPressed,
     this.title,
     this.message,
     this.actions,
     this.cancelLabel,
   }) : super(key: key);
 
+  final ActionCallback<T> onPressed;
   final String title;
   final String message;
   final List<SheetAction<T>> actions;
   final String cancelLabel;
 
   @override
   Widget build(BuildContext context) {
-    void pop(T key) => Navigator.of(context).pop(key);
     return CupertinoActionSheet(
       title: title == null ? null : Text(title),
       message: message == null ? null : Text(message),
@@ -31,14 +33,14 @@ class CupertinoModalActionSheet<T> extends StatelessWidget {
                   .capitalizedForce,
         ),
         isDefaultAction: !actions.any((a) => a.isDefaultAction),
-        onPressed: () => pop(null),
+        onPressed: () => onPressed(null),
       ),
       actions: actions
           .map((a) => CupertinoActionSheetAction(
                 child: Text(a.label),
                 isDestructiveAction: a.isDestructiveAction,
                 isDefaultAction: a.isDefaultAction,
-                onPressed: () => pop(a.key),
+                onPressed: () => onPressed(a.key),
               ))
           .toList(),
     );