change the overlay to a dummy navigator since it messed w/ navigation otherwise

Signed-off-by: Tejas Mehta <[email protected]>

Author: tmthecoder

lib/routing/portfolio_router_delegate.dart

@@ -31,29 +31,27 @@ class PortfolioRouterDelegate extends RouterDelegate<PortfolioRoutePath>
 
   @override
   Widget build(BuildContext context) {
-    return PortfolioRouteControllerWidget(
-      initialRoute: _currentPage.path,
-      delegate: this,
-      child: Overlay(
-        initialEntries: [
-          OverlayEntry(builder: (context) => Scaffold(
-            key: _scaffoldKey,
-            appBar: _createAppbar(context),
-            drawer: MediaQuery.of(context).size.width <= 500 ? _createDrawer(context) : null,
-            body: Navigator(
-              key: navigatorKey,
-              pages: [
-                _getPathForRoute(_currentPage)
-              ],
-              onPopPage: (route, result) {
-                if (!route.didPop(result)) return false;
-                _currentPage.removeFragment();
-                notifyListeners();
-                return true;
-              },
-            ),
-          ))
-        ],
+    return createDummyNavigator(
+      child: PortfolioRouteControllerWidget(
+        initialRoute: _currentPage.path,
+        delegate: this,
+        child: Scaffold(
+          key: _scaffoldKey,
+          appBar: _createAppbar(context),
+          drawer: MediaQuery.of(context).size.width <= 500 ? _createDrawer(context) : null,
+          body: Navigator(
+            key: navigatorKey,
+            pages: [
+              _getPathForRoute(_currentPage)
+            ],
+            onPopPage: (route, result) {
+              if (!route.didPop(result)) return false;
+              _currentPage.removeFragment();
+              notifyListeners();
+              return true;
+            },
+          ),
+        )
       ),
     );
   }
@@ -122,10 +120,12 @@ class PortfolioRouterDelegate extends RouterDelegate<PortfolioRoutePath>
     return Text(subject, style: isCurrent ? buttonStyle.merge(TextStyle(decoration: TextDecoration.underline)) : buttonStyle,);
   }
 
-  //
-  // void moveAndUpdateRoute(CrossClipRoutePath path) {
-  //   setNewRoutePath(path);
-  // }
+  Widget createDummyNavigator({required Widget child}) => Navigator(
+    pages: [
+      MaterialPage(child: child)
+    ],
+    onPopPage: (_, __) => false,
+  );
 
   void moveAndUpdateRoute(PortfolioRoutePath path, bool drawer) {
     setNewRoutePath(path);