Move approuter to separate provider. (Fix hotreload problem)

ferraridamiano · Feb 4, 2024 · 4d27a3e · 4d27a3e
1 parent 0637f3c
commit 4d27a3e
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 108 deletions.
diff --git a/lib/app_router.dart b/lib/app_router.dart
@@ -0,0 +1,106 @@
+import 'package:converterpro/models/order.dart';
+import 'package:converterpro/models/properties_list.dart';
+import 'package:converterpro/models/settings.dart';
+import 'package:converterpro/pages/conversion_page.dart';
+import 'package:converterpro/pages/error_page.dart';
+import 'package:converterpro/pages/reorder_properties_page.dart';
+import 'package:converterpro/pages/reorder_units_page.dart';
+import 'package:converterpro/pages/settings_page.dart';
+import 'package:converterpro/pages/splash_screen.dart';
+import 'package:converterpro/utils/app_scaffold.dart';
+import 'package:converterpro/utils/utils.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+
+final isEverythingLoadedProvider = Provider<bool>((ref) =>
+    ref.watch(SignificantFigures.provider).hasValue &&
+    ref.watch(RemoveTrailingZeros.provider).hasValue &&
+    ref.watch(IsDarkAmoled.provider).hasValue &&
+    ref.watch(CurrentThemeMode.provider).hasValue &&
+    ref.watch(CurrentLocale.provider).hasValue &&
+    ref.watch(PropertiesOrderNotifier.provider).hasValue &&
+    ref.watch(UnitsOrderNotifier.provider).hasValue &&
+    ref.watch(propertiesListProvider).hasValue);
+
+final routerProvider = Provider<GoRouter>(
+  (ref) => GoRouter(
+    routes: [
+      GoRoute(
+        path: '/',
+        builder: (context, _) => const SplashScreen(),
+      ),
+      ShellRoute(
+        builder: (context, state, child) {
+          return AppScaffold(
+            child: child,
+          );
+        },
+        routes: [
+          GoRoute(
+            path: '/conversions/:property',
+            pageBuilder: (context, state) {
+              final String property = state.pathParameters['property']!;
+              final int? pageNumber = pageNumberMap[property];
+              if (pageNumber == null) {
+                throw Exception('property not found: $property');
+              } else {
+                return NoTransitionPage(child: ConversionPage(pageNumber));
+              }
+            },
+          ),
+          GoRoute(
+            path: '/settings',
+            name: 'settings',
+            pageBuilder: (context, state) =>
+                const NoTransitionPage(child: SettingsPage()),
+            routes: [
+              GoRoute(
+                path: 'reorder-properties',
+                name: 'reorder-properties',
+                pageBuilder: (context, state) =>
+                    const NoTransitionPage(child: ReorderPropertiesPage()),
+              ),
+              GoRoute(
+                path: 'reorder-units',
+                name: 'reorder-units',
+                pageBuilder: (context, state) =>
+                    const NoTransitionPage(child: ChoosePropertyPage()),
+                routes: [
+                  GoRoute(
+                    path: ':property',
+                    pageBuilder: (context, state) {
+                      final String property = state.pathParameters['property']!;
+                      final int? pageNumber = pageNumberMap[property];
+                      if (pageNumber == null) {
+                        throw Exception('property not found: $property');
+                      } else {
+                        return NoTransitionPage(
+                          child: ChoosePropertyPage(
+                            selectedProperty: pageNumber,
+                            isPropertySelected: true,
+                          ),
+                        );
+                      }
+                    },
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ),
+    ],
+    redirect: (context, state) {
+      // Bypass splashscreen if variables are already loaded
+      if (state.uri.toString() == '/') {
+        if (ref.read(isEverythingLoadedProvider)) {
+          final List<int> conversionsOrderDrawer =
+              ref.read(PropertiesOrderNotifier.provider).value!;
+          return '/conversions/${reversePageNumberListMap[conversionsOrderDrawer.indexWhere((val) => val == 0)]}';
+        }
+      }
+      return null;
+    },
+    errorBuilder: (context, state) => const ErrorPage(),
+  ),
+);
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,31 +1,11 @@
+import 'package:converterpro/app_router.dart';
 import 'package:universal_io/io.dart';
-import 'package:converterpro/models/order.dart';
-import 'package:converterpro/models/properties_list.dart';
 import 'package:converterpro/models/settings.dart';
-import 'package:converterpro/pages/error_page.dart';
-import 'package:converterpro/pages/reorder_units_page.dart';
-import 'package:converterpro/pages/conversion_page.dart';
-import 'package:converterpro/pages/reorder_properties_page.dart';
-import 'package:converterpro/pages/settings_page.dart';
-import 'package:converterpro/pages/splash_screen.dart';
-import 'package:converterpro/utils/app_scaffold.dart';
-import 'package:converterpro/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:translations/app_localizations.dart';
-import 'package:go_router/go_router.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 
-final isEverythingLoadedProvider = Provider<bool>((ref) =>
-    ref.watch(SignificantFigures.provider).hasValue &&
-    ref.watch(RemoveTrailingZeros.provider).hasValue &&
-    ref.watch(IsDarkAmoled.provider).hasValue &&
-    ref.watch(CurrentThemeMode.provider).hasValue &&
-    ref.watch(CurrentLocale.provider).hasValue &&
-    ref.watch(PropertiesOrderNotifier.provider).hasValue &&
-    ref.watch(UnitsOrderNotifier.provider).hasValue &&
-    ref.watch(propertiesListProvider).hasValue);
-
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   runApp(const ProviderScope(child: MyApp()));
@@ -36,88 +16,6 @@ class MyApp extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final router = GoRouter(
-      routes: [
-        GoRoute(
-          path: '/',
-          builder: (context, _) => const SplashScreen(),
-        ),
-        ShellRoute(
-          builder: (context, state, child) {
-            return AppScaffold(
-              child: child,
-            );
-          },
-          routes: [
-            GoRoute(
-              path: '/conversions/:property',
-              pageBuilder: (context, state) {
-                final String property = state.pathParameters['property']!;
-                final int? pageNumber = pageNumberMap[property];
-                if (pageNumber == null) {
-                  throw Exception('property not found: $property');
-                } else {
-                  return NoTransitionPage(child: ConversionPage(pageNumber));
-                }
-              },
-            ),
-            GoRoute(
-              path: '/settings',
-              name: 'settings',
-              pageBuilder: (context, state) =>
-                  const NoTransitionPage(child: SettingsPage()),
-              routes: [
-                GoRoute(
-                  path: 'reorder-properties',
-                  name: 'reorder-properties',
-                  pageBuilder: (context, state) =>
-                      const NoTransitionPage(child: ReorderPropertiesPage()),
-                ),
-                GoRoute(
-                  path: 'reorder-units',
-                  name: 'reorder-units',
-                  pageBuilder: (context, state) =>
-                      const NoTransitionPage(child: ChoosePropertyPage()),
-                  routes: [
-                    GoRoute(
-                      path: ':property',
-                      pageBuilder: (context, state) {
-                        final String property =
-                            state.pathParameters['property']!;
-                        final int? pageNumber = pageNumberMap[property];
-                        if (pageNumber == null) {
-                          throw Exception('property not found: $property');
-                        } else {
-                          return NoTransitionPage(
-                            child: ChoosePropertyPage(
-                              selectedProperty: pageNumber,
-                              isPropertySelected: true,
-                            ),
-                          );
-                        }
-                      },
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ],
-        ),
-      ],
-      redirect: (context, state) {
-        // Bypass splashscreen if variables are already loaded
-        if (state.uri.toString() == '/') {
-          if (ref.read(isEverythingLoadedProvider)) {
-            final List<int> conversionsOrderDrawer =
-                ref.read(PropertiesOrderNotifier.provider).value!;
-            return '/conversions/${reversePageNumberListMap[conversionsOrderDrawer.indexWhere((val) => val == 0)]}';
-          }
-        }
-        return null;
-      },
-      errorBuilder: (context, state) => const ErrorPage(),
-    );
-
     const Color fallbackColorSchemeSeed = Colors.blue;
 
     return DynamicColorBuilder(
@@ -162,10 +60,12 @@ class MyApp extends ConsumerWidget {
           appLocale = const Locale('en');
         }
 
+        final appRouter = ref.read(routerProvider);
+
         return MaterialApp.router(
-          routeInformationProvider: router.routeInformationProvider,
-          routeInformationParser: router.routeInformationParser,
-          routerDelegate: router.routerDelegate,
+          routeInformationProvider: appRouter.routeInformationProvider,
+          routeInformationParser: appRouter.routeInformationParser,
+          routerDelegate: appRouter.routerDelegate,
           debugShowCheckedModeBanner: false,
           title: 'Converter NOW',
           themeMode: ref.watch(CurrentThemeMode.provider).valueOrNull ??

diff --git a/lib/pages/reorder_units_page.dart b/lib/pages/reorder_units_page.dart
@@ -1,4 +1,4 @@
-import 'package:converterpro/main.dart';
+import 'package:converterpro/app_router.dart';
 import 'package:converterpro/models/conversions.dart';
 import 'package:converterpro/models/order.dart';
 import 'package:converterpro/utils/reorder_page.dart';

diff --git a/lib/pages/splash_screen.dart b/lib/pages/splash_screen.dart
@@ -1,4 +1,4 @@
-import 'package:converterpro/main.dart';
+import 'package:converterpro/app_router.dart';
 import 'package:converterpro/models/order.dart';
 import 'package:converterpro/utils/property_unit_list.dart';
 import 'package:converterpro/utils/utils.dart';