move router into locator

BullishNode · May 2, 2024 · 1133a2c · 1133a2c
1 parent afe4cdb
commit 1133a2c
Show file tree

Hide file tree

Showing 4 changed files with 208 additions and 201 deletions.
diff --git a/lib/locator.dart b/lib/locator.dart
@@ -51,6 +51,7 @@ import 'package:bb_mobile/swap/bloc/watchtxs_bloc.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get_it/get_it.dart';
+import 'package:go_router/go_router.dart';
 
 const bbVersion = '0.2.0-1';
 
@@ -102,6 +103,7 @@ Future _setupRepositories() async {
 
 Future _setupAppServices() async {
   locator.registerSingleton<NavName>(NavName());
+  locator.registerSingleton<GoRouter>(setupRouter());
   final deepLink = DeepLink();
   locator.registerSingleton<DeepLink>(deepLink);
   locator.registerSingleton<Lighting>(

diff --git a/lib/main.dart b/lib/main.dart
@@ -92,7 +92,7 @@ class BullBitcoinWalletApp extends StatelessWidget {
                     theme: Themes.lightTheme,
                     darkTheme: lightingState.dark(),
                     themeMode: lightingState.mode(),
-                    routerConfig: router,
+                    routerConfig: locator<GoRouter>(),
                     debugShowCheckedModeBanner: false,
                     localizationsDelegates: [
                       localizationDelegate,
@@ -172,8 +172,11 @@ class _AppLifecycleOverlayState extends State<AppLifecycleOverlay>
     super.initState();
     WidgetsBinding.instance.addObserver(this);
 
-    router.routerDelegate.addListener(() {
-      final routePath = router.routerDelegate.currentConfiguration.routes
+    locator<GoRouter>().routerDelegate.addListener(() {
+      final routePath = locator<GoRouter>()
+          .routerDelegate
+          .currentConfiguration
+          .routes
           .map((RouteBase e) => (e as GoRoute).path)
           .join();
       // print(routePath);