WIP navigation fixes

@@ -4,6 +4,7 @@ export 'src/bottomsheet/bottomsheet.dart';
 export 'src/extension_navigation.dart';
 export 'src/extension_navigation.dart';
 export 'src/nav2/get_information_parser.dart';
 export 'src/nav2/get_information_parser.dart';
 export 'src/nav2/get_nav_config.dart';
 export 'src/nav2/get_nav_config.dart';
+export 'src/nav2/get_navigator.dart';
 export 'src/nav2/get_router_delegate.dart';
 export 'src/nav2/get_router_delegate.dart';
 export 'src/nav2/router_outlet.dart';
 export 'src/nav2/router_outlet.dart';
 export 'src/root/get_cupertino_app.dart';
 export 'src/root/get_cupertino_app.dart';

+import 'package:flutter/widgets.dart';
+import '../routes/default_route.dart';
+import '../routes/get_route.dart';
+
+class GetNavigator extends Navigator {
+  GetNavigator.onGenerateRoute({
+    GlobalKey<NavigatorState>? key,
+    bool Function(Route<dynamic>, dynamic)? onPopPage,
+    required List<GetPage> pages,
+    List<NavigatorObserver>? observers,
+    bool reportsRouteUpdateToEngine = false,
+    TransitionDelegate? transitionDelegate,
+    String? initialRoute,
+  }) : super(
+          //keys should be optional
+          key: key,
+          initialRoute: initialRoute,
+          onPopPage: onPopPage ??
+              (route, result) {
+                final didPop = route.didPop(result);
+                if (!didPop) {
+                  return false;
+                }
+                return true;
+              },
+          onGenerateRoute: (settings) {
+            final selectedPageList =
+                pages.where((element) => element.name == settings.name);
+            if (selectedPageList.isNotEmpty) {
+              final selectedPage = selectedPageList.first;
+              return GetPageRoute(
+                page: selectedPage.page,
+                settings: settings,
+              );
+            }
+          },
+          reportsRouteUpdateToEngine: reportsRouteUpdateToEngine,
+          pages: pages,
+          observers: [
+            // GetObserver(),
+            ...?observers,
+          ],
+          transitionDelegate:
+              transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
+        );
+
+  GetNavigator({
+    GlobalKey<NavigatorState>? key,
+    bool Function(Route<dynamic>, dynamic)? onPopPage,
+    required List<GetPage> pages,
+    List<NavigatorObserver>? observers,
+    bool reportsRouteUpdateToEngine = false,
+    TransitionDelegate? transitionDelegate,
+    String? initialRoute,
+  }) : super(
+          //keys should be optional
+          key: key,
+          initialRoute: initialRoute,
+          onPopPage: onPopPage ??
+              (route, result) {
+                final didPop = route.didPop(result);
+                if (!didPop) {
+                  return false;
+                }
+                return true;
+              },
+          reportsRouteUpdateToEngine: reportsRouteUpdateToEngine,
+          pages: pages,
+          observers: [
+            // GetObserver(),
+            ...?observers,
+          ],
+          transitionDelegate:
+              transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
+        );
+}

@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import '../../../get.dart';
 import '../../../get.dart';
 import '../../../get_state_manager/src/simple/list_notifier.dart';
 import '../../../get_state_manager/src/simple/list_notifier.dart';
+import 'get_navigator.dart';
 
 
 /// Enables the user to customize the intended pop behavior
 /// Enables the user to customize the intended pop behavior
 ///
 ///
@@ -57,6 +58,9 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
   final List<NavigatorObserver>? navigatorObservers;
   final List<NavigatorObserver>? navigatorObservers;
   final TransitionDelegate<dynamic>? transitionDelegate;
   final TransitionDelegate<dynamic>? transitionDelegate;
 
 
+  final Iterable<GetPage> Function(GetNavConfig currentNavStack)?
+      pickPagesForRootNavigator;
+
   GlobalKey<NavigatorState> get navigatorKey => Get.key;
   GlobalKey<NavigatorState> get navigatorKey => Get.key;
 
 
   GetDelegate({
   GetDelegate({
@@ -66,6 +70,7 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
     this.backButtonPopMode = PopMode.History,
     this.backButtonPopMode = PopMode.History,
     this.preventDuplicateHandlingMode =
     this.preventDuplicateHandlingMode =
         PreventDuplicateHandlingMode.ReorderRoutes,
         PreventDuplicateHandlingMode.ReorderRoutes,
+    this.pickPagesForRootNavigator,
   }) : notFoundRoute = notFoundRoute ??
   }) : notFoundRoute = notFoundRoute ??
             GetPage(
             GetPage(
               name: '/404',
               name: '/404',
@@ -120,10 +125,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
     return currentConfiguration?.currentPage?.parameters ?? {};
     return currentConfiguration?.currentPage?.parameters ?? {};
   }
   }
 
 
-  // void _unsafeHistoryClear() {
-  //   history.clear();
-  // }
-
   /// Adds a new history entry and waits for the result
   /// Adds a new history entry and waits for the result
   Future<void> pushHistory(
   Future<void> pushHistory(
     GetNavConfig config, {
     GetNavConfig config, {
@@ -163,11 +164,6 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
     await _unsafeHistoryAdd(config);
     await _unsafeHistoryAdd(config);
   }
   }
 
 
-  // GetPageRoute getPageRoute(RouteSettings? settings) {
-  //   return PageRedirect(settings ?? RouteSettings(name: '/404'), _notFound())
-  //       .page();
-  // }
-
   Future<GetNavConfig?> _popHistory() async {
   Future<GetNavConfig?> _popHistory() async {
     if (!_canPopHistory()) return null;
     if (!_canPopHistory()) return null;
     return await _doPopHistory();
     return await _doPopHistory();
@@ -263,36 +259,35 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
 
 
   /// gets the visual pages from the current history entry
   /// gets the visual pages from the current history entry
   ///
   ///
-  /// visual pages must have [participatesInRootNavigator] set to true
-  List<GetPage> getVisualPages() {
-    final currentHistory = currentConfiguration;
-    if (currentHistory == null) return <GetPage>[];
-
+  /// visual pages must have [GetPage.participatesInRootNavigator] set to true
+  Iterable<GetPage> getVisualPages(GetNavConfig currentHistory) {
     final res = currentHistory.currentTreeBranch
     final res = currentHistory.currentTreeBranch
         .where((r) => r.participatesInRootNavigator != null);
         .where((r) => r.participatesInRootNavigator != null);
     if (res.length == 0) {
     if (res.length == 0) {
       //default behavoir, all routes participate in root navigator
       //default behavoir, all routes participate in root navigator
-      return history.map((e) => e.currentPage!).toList();
+      return history.map((e) => e.currentPage!);
     } else {
     } else {
       //user specified at least one participatesInRootNavigator
       //user specified at least one participatesInRootNavigator
       return res
       return res
-          .where((element) => element.participatesInRootNavigator == true)
-          .toList();
+          .where((element) => element.participatesInRootNavigator == true);
     }
     }
   }
   }
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
-    final pages = getVisualPages();
+    final currentHistory = currentConfiguration;
+    final pages = currentHistory == null
+        ? <GetPage>[]
+        : pickPagesForRootNavigator?.call(currentHistory) ??
+            getVisualPages(currentHistory);
     if (pages.length == 0) return SizedBox.shrink();
     if (pages.length == 0) return SizedBox.shrink();
-    final extraObservers = navigatorObservers;
     return GetNavigator(
     return GetNavigator(
       key: navigatorKey,
       key: navigatorKey,
       onPopPage: _onPopVisualRoute,
       onPopPage: _onPopVisualRoute,
-      pages: pages,
+      pages: pages.toList(),
       observers: [
       observers: [
         GetObserver(),
         GetObserver(),
-        if (extraObservers != null) ...extraObservers,
+        ...?navigatorObservers,
       ],
       ],
       transitionDelegate:
       transitionDelegate:
           transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
           transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
@@ -333,35 +328,24 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
         ),
         ),
       );
       );
     } else {
     } else {
-      ///TODO: IMPLEMENT ROUTE NOT FOUND
-
-      return Future.value();
-    }
-  }
-
-  Future<void>? offAndToNamed(
-    String page, {
-    dynamic arguments,
-    int? id,
-    dynamic result,
-    Map<String, String>? parameters,
-    PopMode popMode = PopMode.History,
-  }) async {
-    if (parameters != null) {
-      final uri = Uri(path: page, queryParameters: parameters);
-      page = uri.toString();
+      await pushHistory(
+        GetNavConfig(
+          currentTreeBranch: [notFoundRoute],
+          location: notFoundRoute.name,
+          state: null, //TODO: persist state?
+        ),
+      );
     }
     }
-
-    await popRoute(result: result);
-    return toNamed(page, arguments: arguments, parameters: parameters);
   }
   }
 
 
+  //pops the previous route (if there is one) and goes to new route
   Future<void> offNamed(
   Future<void> offNamed(
     String page, {
     String page, {
     dynamic arguments,
     dynamic arguments,
     Map<String, String>? parameters,
     Map<String, String>? parameters,
+    PopMode popMode = PopMode.History,
   }) async {
   }) async {
-    history.removeLast();
+    await popRoute(popMode: popMode);
     return toNamed(page, arguments: arguments, parameters: parameters);
     return toNamed(page, arguments: arguments, parameters: parameters);
   }
   }
 
 
@@ -435,76 +419,3 @@ class GetDelegate extends RouterDelegate<GetNavConfig>
     return true;
     return true;
   }
   }
 }
 }
-
-class GetNavigator extends Navigator {
-  GetNavigator.onGenerateRoute({
-    GlobalKey<NavigatorState>? key,
-    bool Function(Route<dynamic>, dynamic)? onPopPage,
-    required List<GetPage> pages,
-    List<NavigatorObserver>? observers,
-    bool reportsRouteUpdateToEngine = false,
-    TransitionDelegate? transitionDelegate,
-    String? initialRoute,
-  }) : super(
-          //keys should be optional
-          key: key,
-          initialRoute: initialRoute,
-          onPopPage: onPopPage ??
-              (route, result) {
-                final didPop = route.didPop(result);
-                if (!didPop) {
-                  return false;
-                }
-                return true;
-              },
-          onGenerateRoute: (settings) {
-            final selectedPageList =
-                pages.where((element) => element.name == settings.name);
-            if (selectedPageList.isNotEmpty) {
-              final selectedPage = selectedPageList.first;
-              return GetPageRoute(
-                page: selectedPage.page,
-                settings: settings,
-              );
-            }
-          },
-          reportsRouteUpdateToEngine: reportsRouteUpdateToEngine,
-          pages: pages,
-          observers: [
-            // GetObserver(),
-            ...?observers,
-          ],
-          transitionDelegate:
-              transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
-        );
-
-  GetNavigator({
-    GlobalKey<NavigatorState>? key,
-    bool Function(Route<dynamic>, dynamic)? onPopPage,
-    required List<GetPage> pages,
-    List<NavigatorObserver>? observers,
-    bool reportsRouteUpdateToEngine = false,
-    TransitionDelegate? transitionDelegate,
-    String? initialRoute,
-  }) : super(
-          //keys should be optional
-          key: key,
-          initialRoute: initialRoute,
-          onPopPage: onPopPage ??
-              (route, result) {
-                final didPop = route.didPop(result);
-                if (!didPop) {
-                  return false;
-                }
-                return true;
-              },
-          reportsRouteUpdateToEngine: reportsRouteUpdateToEngine,
-          pages: pages,
-          observers: [
-            // GetObserver(),
-            ...?observers,
-          ],
-          transitionDelegate:
-              transitionDelegate ?? const DefaultTransitionDelegate<dynamic>(),
-        );
-}

 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 
 
 import '../../../get.dart';
 import '../../../get.dart';
+import 'get_navigator.dart';
 import 'get_router_delegate.dart';
 import 'get_router_delegate.dart';
 
 
 class RouterOutlet<TDelegate extends RouterDelegate<T>, T extends Object>
 class RouterOutlet<TDelegate extends RouterDelegate<T>, T extends Object>