fix(#636): update routing

hpi-dhc · Dec 20, 2023 · 54288a8 · 54288a8
1 parent b4c95b5
commit 54288a8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/app/lib/app.dart b/app/lib/app.dart
@@ -12,29 +12,13 @@ class PharMeApp extends StatelessWidget {
       _instance._appRouter.navigatorKey;
 
   final _appRouter = AppRouter();
-  final _isLoggedIn = MetaData.instance.isLoggedIn ?? false;
-  final _onboardingDone = MetaData.instance.onboardingDone ?? false;
-  final _initialDrugSelectionDone =
-    MetaData.instance.initialDrugSelectionDone ?? false;
 
   @override
   Widget build(BuildContext context) {
     return MaterialApp.router(
       debugShowCheckedModeBanner: false,
       routeInformationParser: _appRouter.defaultRouteParser(),
-      routerDelegate: _appRouter.delegate(
-        deepLinkBuilder: (deepLink) {
-          late String path;
-          path = !_isLoggedIn
-            ? 'login'
-            : !_onboardingDone
-              ? 'onboarding'
-              : !_initialDrugSelectionDone
-                ? 'drugselection'
-                : 'main';
-          return DeepLink.path(path);
-        },
-      ),
+      routerDelegate: _appRouter.delegate(deepLinkBuilder: getInitialRoute),
       theme: PharMeTheme.light,
       localizationsDelegates: [
         AppLocalizations.delegate,

diff --git a/app/lib/common/utilities/routing_utils.dart b/app/lib/common/utilities/routing_utils.dart
@@ -1,5 +1,21 @@
 import '../module.dart';
 
+DeepLink getInitialRoute(_) {
+  final isLoggedIn = MetaData.instance.isLoggedIn ?? false;
+  final onboardingDone = MetaData.instance.onboardingDone ?? false;
+  final initialDrugSelectionDone =
+    MetaData.instance.initialDrugSelectionDone ?? false;
+  late String path;
+    path = !isLoggedIn
+      ? '/login'
+      : !onboardingDone
+        ? '/onboarding'
+        : !initialDrugSelectionDone
+          ? '/drugselection'
+          : '/main';
+  return DeepLink.path(path);
+}
+
 // Replace whole stack, see https://stackoverflow.com/a/73784156
 Future<void> overwriteRoutes(
   BuildContext context,

diff --git a/app/lib/report/module.dart b/app/lib/report/module.dart
@@ -5,10 +5,14 @@ import '../drug/module.dart';
 export 'pages/gene.dart';
 export 'pages/report.dart';
 
+@RoutePage()      
+class ReportRootPage extends AutoRouter {}
+
 final reportRoute = AutoRoute(
   path: 'report',
-  page: ReportRoute.page,
+  page: ReportRootRoute.page,
   children: [
+    AutoRoute(path: '', page: ReportRoute.page),
     AutoRoute(page: GeneRoute.page),
     drugRoute(),
   ],

diff --git a/app/lib/search/module.dart b/app/lib/search/module.dart
@@ -4,8 +4,14 @@ import '../drug/module.dart';
 // For generated routes
 export 'pages/search.dart';
 
+@RoutePage()      
+class SearchRootPage extends AutoRouter {}
+
 final searchRoute = AutoRoute(
   path: 'search',
-  page: SearchRoute.page,
-  children: [ drugRoute() ],
+  page: SearchRootRoute.page,
+  children: [
+    AutoRoute(path: '', page: SearchRoute.page),
+    drugRoute()
+  ],
 );