Merge pull request #1641 from Bdaya-Dev/nav2_fixes

minor improvements and bug fixes

 import 'package:get/get.dart';
 import 'package:get/get.dart';
 
 
-class LoginController extends GetxController {
-  //TODO: Implement LoginController
-
-  final count = 0.obs;
-  @override
-  void onInit() {
-    super.onInit();
-  }
-
-  @override
-  void onReady() {
-    super.onReady();
-  }
-
-  @override
-  void onClose() {}
-  void increment() => count.value++;
-}
+class LoginController extends GetxController {}

@@ -33,7 +33,7 @@ class LoginView extends GetView<LoginController> {
                 AuthService.to.login();
                 AuthService.to.login();
                 final thenTo = Get.rootDelegate.currentConfiguration!
                 final thenTo = Get.rootDelegate.currentConfiguration!
                     .currentPage!.parameter?['then'];
                     .currentPage!.parameter?['then'];
-                Get.rootDelegate.toNamed(thenTo ?? Routes.HOME);
+                Get.rootDelegate.offNamed(thenTo ?? Routes.HOME);
               },
               },
             ),
             ),
           ],
           ],

@@ -4,4 +4,15 @@ class ProductDetailsController extends GetxController {
   final String productId;
   final String productId;
 
 
   ProductDetailsController(this.productId);
   ProductDetailsController(this.productId);
+  @override
+  void onInit() {
+    super.onInit();
+    Get.log('ProductDetailsController created with id: $productId');
+  }
+
+  @override
+  void onClose() {
+    Get.log('ProductDetailsController close with id: $productId');
+    super.onClose();
+  }
 }
 }

@@ -10,9 +10,23 @@ class ProfileView extends GetView<ProfileController> {
     return Scaffold(
     return Scaffold(
       backgroundColor: Colors.amber,
       backgroundColor: Colors.amber,
       body: Center(
       body: Center(
-        child: Text(
-          'ProfileView is working',
-          style: TextStyle(fontSize: 20),
+        child: Column(
+          children: [
+            Text(
+              'ProfileView is working',
+              style: TextStyle(fontSize: 20),
+            ),
+            MaterialButton(
+              child: Text('Show a test dialog'),
+              onPressed: () {
+                //shows a dialog
+                Get.defaultDialog(
+                  title: 'Test Dialog !!',
+                  barrierDismissible: true,
+                );
+              },
+            )
+          ],
         ),
         ),
       ),
       ),
     );
     );

@@ -18,7 +18,7 @@ class RootView extends GetView<RootController> {
             centerTitle: true,
             centerTitle: true,
           ),
           ),
           body: GetRouterOutlet(
           body: GetRouterOutlet(
-            name: '/',
+            name: 'rootView',
             emptyPage: (delegate) =>
             emptyPage: (delegate) =>
                 Get.routeTree.matchRoute(Routes.HOME).route!,
                 Get.routeTree.matchRoute(Routes.HOME).route!,
             pickPages: (currentNavStack) {
             pickPages: (currentNavStack) {

@@ -31,18 +31,21 @@ class AppPages {
       page: () => RootView(),
       page: () => RootView(),
       binding: RootBinding(),
       binding: RootBinding(),
       participatesInRootNavigator: true,
       participatesInRootNavigator: true,
+      preventDuplicates: true,
       children: [
       children: [
         GetPage(
         GetPage(
           middlewares: [
           middlewares: [
             //only enter this route when not authed
             //only enter this route when not authed
             EnsureNotAuthedMiddleware(),
             EnsureNotAuthedMiddleware(),
           ],
           ],
+          participatesInRootNavigator: false,
           name: _Paths.LOGIN,
           name: _Paths.LOGIN,
           page: () => LoginView(),
           page: () => LoginView(),
           binding: LoginBinding(),
           binding: LoginBinding(),
         ),
         ),
         GetPage(
         GetPage(
-          participatesInRootNavigator: true,
+          participatesInRootNavigator: false,
+          preventDuplicates: true,
           name: _Paths.HOME,
           name: _Paths.HOME,
           page: () => HomeView(),
           page: () => HomeView(),
           bindings: [
           bindings: [

@@ -16,14 +16,14 @@ void main() {
         },
         },
       ),
       ),
       getPages: AppPages.routes,
       getPages: AppPages.routes,
-      routeInformationParser: GetInformationParser(
-          // initialRoute: Routes.HOME,
-          ),
-      routerDelegate: GetDelegate(
-        backButtonPopMode: PopMode.History,
-        preventDuplicateHandlingMode:
-            PreventDuplicateHandlingMode.ReorderRoutes,
-      ),
+      // routeInformationParser: GetInformationParser(
+      //     // initialRoute: Routes.HOME,
+      //     ),
+      // routerDelegate: GetDelegate(
+      //   backButtonPopMode: PopMode.History,
+      //   preventDuplicateHandlingMode:
+      //       PreventDuplicateHandlingMode.ReorderRoutes,
+      // ),
     ),
     ),
   );
   );
 }
 }

@@ -8,6 +8,7 @@ import 'smart_management.dart';
 abstract class GetInterface {
 abstract class GetInterface {
   SmartManagement smartManagement = SmartManagement.full;
   SmartManagement smartManagement = SmartManagement.full;
   RouterDelegate? routerDelegate;
   RouterDelegate? routerDelegate;
+  RouteInformationParser? routeInformationParser;
   String? reference;
   String? reference;
   bool isLogEnable = true;
   bool isLogEnable = true;
   LogWriterCallback log = defaultLogWriterCallback;
   LogWriterCallback log = defaultLogWriterCallback;

@@ -1016,7 +1016,12 @@ you can only use widgets and widget functions here''';
   }
   }
 
 
   GlobalKey<NavigatorState>? nestedKey(dynamic key) {
   GlobalKey<NavigatorState>? nestedKey(dynamic key) {
-    keys.putIfAbsent(key, () => GlobalKey<NavigatorState>());
+    keys.putIfAbsent(
+      key,
+      () => GlobalKey<NavigatorState>(
+        debugLabel: 'Getx nested key: ${key.toString()}',
+      ),
+    );
     return keys[key];
     return keys[key];
   }
   }
 
 
@@ -1207,9 +1212,7 @@ extension NavTwoExt on GetInterface {
 
 
   /// Casts the stored router delegate to a desired type
   /// Casts the stored router delegate to a desired type
   TDelegate? delegate<TDelegate extends RouterDelegate<TPage>, TPage>() =>
   TDelegate? delegate<TDelegate extends RouterDelegate<TPage>, TPage>() =>
-      _routerDelegate as TDelegate?;
-
-  static GetDelegate? _routerDelegate;
+      routerDelegate as TDelegate?;
 
 
   // // ignore: use_setters_to_change_properties
   // // ignore: use_setters_to_change_properties
   // void setDefaultDelegate(RouterDelegate? delegate) {
   // void setDefaultDelegate(RouterDelegate? delegate) {
@@ -1218,31 +1221,39 @@ extension NavTwoExt on GetInterface {
 
 
   // GetDelegate? getDelegate() => delegate<GetDelegate, GetNavConfig>();
   // GetDelegate? getDelegate() => delegate<GetDelegate, GetNavConfig>();
 
 
-  static GetInformationParser? _informationParser;
-
   GetInformationParser createInformationParser({String initialRoute = '/'}) {
   GetInformationParser createInformationParser({String initialRoute = '/'}) {
-    return _informationParser ??=
-        GetInformationParser(initialRoute: initialRoute);
+    if (routeInformationParser == null) {
+      return routeInformationParser = GetInformationParser(
+        initialRoute: initialRoute,
+      );
+    } else {
+      return routerDelegate as GetInformationParser;
+    }
   }
   }
 
 
   // static GetDelegate? _delegate;
   // static GetDelegate? _delegate;
 
 
   GetDelegate get rootDelegate => createDelegate();
   GetDelegate get rootDelegate => createDelegate();
 
 
-  GetDelegate createDelegate(
-      {GetPage<dynamic>? notFoundRoute,
-      List<NavigatorObserver>? navigatorObservers,
-      TransitionDelegate<dynamic>? transitionDelegate,
-      PopMode backButtonPopMode = PopMode.History,
-      PreventDuplicateHandlingMode preventDuplicateHandlingMode =
-          PreventDuplicateHandlingMode.ReorderRoutes}) {
-    return _routerDelegate ??= GetDelegate(
-      notFoundRoute: notFoundRoute,
-      navigatorObservers: navigatorObservers,
-      transitionDelegate: transitionDelegate,
-      backButtonPopMode: backButtonPopMode,
-      preventDuplicateHandlingMode: preventDuplicateHandlingMode,
-    );
+  GetDelegate createDelegate({
+    GetPage<dynamic>? notFoundRoute,
+    List<NavigatorObserver>? navigatorObservers,
+    TransitionDelegate<dynamic>? transitionDelegate,
+    PopMode backButtonPopMode = PopMode.History,
+    PreventDuplicateHandlingMode preventDuplicateHandlingMode =
+        PreventDuplicateHandlingMode.ReorderRoutes,
+  }) {
+    if (routerDelegate == null) {
+      return routerDelegate = GetDelegate(
+        notFoundRoute: notFoundRoute,
+        navigatorObservers: navigatorObservers,
+        transitionDelegate: transitionDelegate,
+        backButtonPopMode: backButtonPopMode,
+        preventDuplicateHandlingMode: preventDuplicateHandlingMode,
+      );
+    } else {
+      return routerDelegate as GetDelegate;
+    }
   }
   }
 }
 }
 
 

@@ -7,7 +7,9 @@ class GetInformationParser extends RouteInformationParser<GetNavConfig> {
 
 
   GetInformationParser({
   GetInformationParser({
     this.initialRoute = '/',
     this.initialRoute = '/',
-  });
+  }) {
+    Get.log('GetInformationParser is created !');
+  }
   @override
   @override
   SynchronousFuture<GetNavConfig> parseRouteInformation(
   SynchronousFuture<GetNavConfig> parseRouteInformation(
     RouteInformation routeInformation,
     RouteInformation routeInformation,

@@ -46,7 +46,7 @@ enum PreventDuplicateHandlingMode {
   ReorderRoutes
   ReorderRoutes
 }
 }
 
 
-class GetDelegate<T> extends RouterDelegate<GetNavConfig>
+class GetDelegate extends RouterDelegate<GetNavConfig>
     with ListenableMixin, ListNotifierMixin {
     with ListenableMixin, ListNotifierMixin {
   final List<GetNavConfig> history = <GetNavConfig>[];
   final List<GetNavConfig> history = <GetNavConfig>[];
   final PopMode backButtonPopMode;
   final PopMode backButtonPopMode;
@@ -68,7 +68,9 @@ class GetDelegate<T> extends RouterDelegate<GetNavConfig>
     this.backButtonPopMode = PopMode.History,
     this.backButtonPopMode = PopMode.History,
     this.preventDuplicateHandlingMode =
     this.preventDuplicateHandlingMode =
         PreventDuplicateHandlingMode.ReorderRoutes,
         PreventDuplicateHandlingMode.ReorderRoutes,
-  });
+  }) {
+    Get.log('GetDelegate is created !');
+  }
 
 
   GetNavConfig? runMiddleware(GetNavConfig config) {
   GetNavConfig? runMiddleware(GetNavConfig config) {
     final middlewares = config.currentTreeBranch.last.middlewares ?? [];
     final middlewares = config.currentTreeBranch.last.middlewares ?? [];
@@ -93,7 +95,7 @@ class GetDelegate<T> extends RouterDelegate<GetNavConfig>
   }
   }
 
 
   GetNavConfig? _unsafeHistoryRemoveAt(int index) {
   GetNavConfig? _unsafeHistoryRemoveAt(int index) {
-    if (index == history.length - 1) {
+    if (index == history.length - 1 && history.length > 1) {
       //removing WILL update the current route
       //removing WILL update the current route
       final toCheck = history[history.length - 2];
       final toCheck = history[history.length - 2];
       final resMiddleware = runMiddleware(toCheck);
       final resMiddleware = runMiddleware(toCheck);
@@ -290,8 +292,9 @@ class GetDelegate<T> extends RouterDelegate<GetNavConfig>
 
 
   @override
   @override
   Future<void> setInitialRoutePath(GetNavConfig configuration) async {
   Future<void> setInitialRoutePath(GetNavConfig configuration) async {
-    _unsafeHistoryClear();
-    _resultCompleter.clear();
+    //no need to clear history with Reorder route strategy
+    // _unsafeHistoryClear();
+    // _resultCompleter.clear();
     await pushHistory(configuration);
     await pushHistory(configuration);
   }
   }
 
 
@@ -318,6 +321,11 @@ class GetDelegate<T> extends RouterDelegate<GetNavConfig>
     );
     );
   }
   }
 
 
+  Future<T?> offNamed<T>(String fullRoute) async {
+    await popHistory();
+    return await toNamed(fullRoute);
+  }
+
   /// Removes routes according to [PopMode]
   /// Removes routes according to [PopMode]
   /// until it reaches the specifc [fullRoute],
   /// until it reaches the specifc [fullRoute],
   /// DOES NOT remove the [fullRoute]
   /// DOES NOT remove the [fullRoute]

@@ -25,17 +25,17 @@ class RouterOutlet<TDelegate extends RouterDelegate<T>, T extends Object>
     required Widget Function(
     required Widget Function(
       BuildContext context,
       BuildContext context,
       TDelegate,
       TDelegate,
-      GetPage? page,
+      List<GetPage>? page,
     )
     )
         pageBuilder,
         pageBuilder,
   }) : this.builder(
   }) : this.builder(
           builder: (context, rDelegate, currentConfig) {
           builder: (context, rDelegate, currentConfig) {
-            final picked =
-                currentConfig == null ? <GetPage>[] : pickPages(currentConfig);
-            if (picked.length == 0) {
-              return pageBuilder(context, rDelegate, null);
+            var picked =
+                currentConfig == null ? null : pickPages(currentConfig);
+            if (picked?.length == 0) {
+              picked = null;
             }
             }
-            return pageBuilder(context, rDelegate, picked.last);
+            return pageBuilder(context, rDelegate, picked);
           },
           },
           delegate: delegate,
           delegate: delegate,
         );
         );
@@ -101,15 +101,25 @@ class GetRouterOutlet extends RouterOutlet<GetDelegate, GetNavConfig> {
                 (emptyPage == null && emptyWidget != null),
                 (emptyPage == null && emptyWidget != null),
             'Either use emptyPage or emptyWidget'),
             'Either use emptyPage or emptyWidget'),
         super(
         super(
-          pageBuilder: (context, rDelegate, page) {
-            var pageRes = page ?? emptyPage?.call(rDelegate);
-            if (pageRes != null) {
+          pageBuilder: (context, rDelegate, pages) {
+            final pageRes =
+                (pages ?? <GetPage<dynamic>?>[emptyPage?.call(rDelegate)])
+                    .whereType<GetPage<dynamic>>()
+                    .toList();
+
+            final badPages = pageRes.where(
+                (element) => element.participatesInRootNavigator == true);
+            if (badPages.length > 0) {
+              throw """Pages in a router outlet shouldn't participate in the root navigator
+              $badPages""";
+            }
+            if (pageRes.length > 0) {
               return GetNavigator(
               return GetNavigator(
                 onPopPage: onPopPage ??
                 onPopPage: onPopPage ??
                     (a, c) {
                     (a, c) {
                       return true;
                       return true;
                     },
                     },
-                pages: [pageRes],
+                pages: pageRes,
                 name: name,
                 name: name,
               );
               );
             }
             }

@@ -163,11 +163,13 @@ class GetCupertinoApp extends StatelessWidget {
     this.defaultGlobalState,
     this.defaultGlobalState,
     this.getPages,
     this.getPages,
     this.unknownRoute,
     this.unknownRoute,
-  })  : routerDelegate = routerDelegate ?? Get.createDelegate(),
-        routeInformationParser = routeInformationParser ??
-            Get.createInformationParser(
-              initialRoute: getPages?.first.name ?? '/',
-            ),
+  })  : routerDelegate = routerDelegate ??= Get.createDelegate(
+          notFoundRoute: unknownRoute,
+        ),
+        routeInformationParser =
+            routeInformationParser ??= Get.createInformationParser(
+          initialRoute: getPages?.first.name ?? '/',
+        ),
         navigatorObservers = null,
         navigatorObservers = null,
         navigatorKey = null,
         navigatorKey = null,
         onGenerateRoute = null,
         onGenerateRoute = null,
@@ -176,7 +178,10 @@ class GetCupertinoApp extends StatelessWidget {
         onUnknownRoute = null,
         onUnknownRoute = null,
         routes = null,
         routes = null,
         initialRoute = null,
         initialRoute = null,
-        super(key: key);
+        super(key: key) {
+    Get.routerDelegate = routerDelegate;
+    Get.routeInformationParser = routeInformationParser;
+  }
 
 
   Route<dynamic> generator(RouteSettings settings) {
   Route<dynamic> generator(RouteSettings settings) {
     return PageRedirect(settings: settings, unknownRoute: unknownRoute).page();
     return PageRedirect(settings: settings, unknownRoute: unknownRoute).page();

@@ -173,11 +173,13 @@ class GetMaterialApp extends StatelessWidget {
     this.defaultGlobalState,
     this.defaultGlobalState,
     this.getPages,
     this.getPages,
     this.unknownRoute,
     this.unknownRoute,
-  })  : routerDelegate = routerDelegate ?? Get.createDelegate(),
-        routeInformationParser = routeInformationParser ??
-            Get.createInformationParser(
-              initialRoute: getPages?.first.name ?? '/',
-            ),
+  })  : routerDelegate = routerDelegate ??= Get.createDelegate(
+          notFoundRoute: unknownRoute,
+        ),
+        routeInformationParser =
+            routeInformationParser ??= Get.createInformationParser(
+          initialRoute: getPages?.first.name ?? '/',
+        ),
         navigatorObservers = null,
         navigatorObservers = null,
         navigatorKey = null,
         navigatorKey = null,
         onGenerateRoute = null,
         onGenerateRoute = null,
@@ -186,7 +188,10 @@ class GetMaterialApp extends StatelessWidget {
         onUnknownRoute = null,
         onUnknownRoute = null,
         routes = null,
         routes = null,
         initialRoute = null,
         initialRoute = null,
-        super(key: key);
+        super(key: key) {
+    Get.routerDelegate = routerDelegate;
+    Get.routeInformationParser = routeInformationParser;
+  }
 
 
   Route<dynamic> generator(RouteSettings settings) {
   Route<dynamic> generator(RouteSettings settings) {
     return PageRedirect(settings: settings, unknownRoute: unknownRoute).page();
     return PageRedirect(settings: settings, unknownRoute: unknownRoute).page();

@@ -128,24 +128,9 @@ class ParseRouteTree {
   /// Change the Path for a [GetPage]
   /// Change the Path for a [GetPage]
   GetPage _addChild(
   GetPage _addChild(
           GetPage origin, String parentPath, List<GetMiddleware> middlewares) =>
           GetPage origin, String parentPath, List<GetMiddleware> middlewares) =>
-      GetPage(
-        name: (parentPath + origin.name).replaceAll(r'//', '/'),
-        page: origin.page,
-        title: origin.title,
-        alignment: origin.alignment,
-        transition: origin.transition,
-        binding: origin.binding,
-        bindings: origin.bindings,
-        curve: origin.curve,
-        customTransition: origin.customTransition,
-        fullscreenDialog: origin.fullscreenDialog,
-        maintainState: origin.maintainState,
-        opaque: origin.opaque,
-        parameter: origin.parameter,
-        popGesture: origin.popGesture,
-        preventDuplicates: origin.preventDuplicates,
-        transitionDuration: origin.transitionDuration,
+      origin.copy(
         middlewares: middlewares,
         middlewares: middlewares,
+        name: (parentPath + origin.name).replaceAll(r'//', '/'),
       );
       );
 
 
   GetPage? _findRoute(String name) {
   GetPage? _findRoute(String name) {

@@ -29,7 +29,7 @@ class GetMaterialController extends GetxController {
 
 
   CustomTransition? customTransition;
   CustomTransition? customTransition;
 
 
-  GlobalKey<NavigatorState> key = GlobalKey<NavigatorState>();
+  var key = GlobalKey<NavigatorState>(debugLabel: 'Key Created by default');
 
 
   Map<dynamic, GlobalKey<NavigatorState>> keys = {};
   Map<dynamic, GlobalKey<NavigatorState>> keys = {};