core: replace auto_route with go_router (#406)

* ft: migrate to go_router * fix(tests): go_router tests
CollActionteam · Jun 6, 2023 · 55de4cb · 55de4cb
1 parent bb85d24
commit 55de4cb
Show file tree

Hide file tree

Showing 51 changed files with 464 additions and 402 deletions.
diff --git a/lib/presentation/auth/auth_screen.dart b/lib/presentation/auth/auth_screen.dart
@@ -1,11 +1,11 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:dots_indicator/dots_indicator.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../application/auth/auth_bloc.dart';
 import '../../application/user/profile/profile_bloc.dart';
-import '../routes/app_routes.gr.dart';
+import '../routes/app_routes.dart';
 import '../shared_widgets/custom_app_bars/custom_appbar.dart';
 import '../themes/constants.dart';
 import '../utils/context.ext.dart';
@@ -115,8 +115,7 @@ class AuthPageState extends State<AuthPage> {
     );
   }
 
-  void _authDone(BuildContext context) =>
-      context.router.replaceAll([const VerifiedRoute()]);
+  void _authDone(BuildContext context) => context.go(AppPage.verified.path);
 
   void _toPage(int page) => _pageController.animateToPage(
         page,

diff --git a/lib/presentation/auth/unauthenticated_screen.dart b/lib/presentation/auth/unauthenticated_screen.dart
@@ -1,11 +1,11 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
-import '../routes/app_routes.gr.dart';
-import '../shared_widgets/pill_button.dart';
-import '../themes/constants.dart';
 import '../../domain/core/i_settings_repository.dart';
 import '../../infrastructure/core/injection.dart';
+import '../routes/app_routes.dart';
+import '../shared_widgets/pill_button.dart';
+import '../themes/constants.dart';
 
 class UnauthenticatedPage extends StatelessWidget {
   @override
@@ -51,7 +51,7 @@ class UnauthenticatedPage extends StatelessWidget {
                 text: 'Log In',
                 isEnabled: true,
                 isLoading: false,
-                onTap: () => context.router.push(const AuthRoute()),
+                onTap: () => context.push(AppPage.auth.path),
                 lightBackground: true,
               ),
               const SizedBox(height: 80),
@@ -66,7 +66,7 @@ class UnauthenticatedPage extends StatelessWidget {
     // Push onboarding screen if first time launching application
     final settingsRepository = getIt<ISettingsRepository>();
     if (!(await settingsRepository.getWasUserOnboarded())) {
-      context.router.push(const OnboardingRoute());
+      context.push(AppPage.onBoarding.path);
     }
   }
 }
diff --git a/lib/presentation/auth/widgets/profile_photo.dart b/lib/presentation/auth/widgets/profile_photo.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../application/auth/auth_bloc.dart';
 import '../../../application/user/avatar/avatar_bloc.dart';
@@ -42,9 +42,7 @@ class SelectProfilePhotoState extends State<SelectProfilePhoto> {
             uploading: () {
               /// TODO: Loading indication
             },
-            uploadSuccess: () {
-              context.router.pop();
-            },
+            uploadSuccess: context.pop,
             uploadFailed: () {
               /// TODO: Show error snackbar | Implement failures
             },

diff --git a/lib/presentation/auth/widgets/verified.dart b/lib/presentation/auth/widgets/verified.dart
@@ -1,12 +1,12 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 import 'package:rive/rive.dart';
 import 'package:shimmer/shimmer.dart';
 
 import '../../../application/user/profile/profile_bloc.dart';
 import '../../../infrastructure/core/injection.dart';
-import '../../routes/app_routes.gr.dart';
+import '../../routes/app_routes.dart';
 import '../../shared_widgets/pill_button.dart';
 import '../../shared_widgets/shimmers/title_shimmer_line.dart';
 import '../../themes/constants.dart';
@@ -80,13 +80,11 @@ class VerifiedPage extends StatelessWidget {
                     ),
                     const SizedBox(height: 40),
                     PillButton(
-                      onTap: () =>
-                          context.router.replaceAll([const HomeRoute()]),
+                      onTap: () => context.go(AppPage.home.path),
                       text: 'Go to CrowdActions',
                     ),
                     TextButton(
-                      onPressed: () =>
-                          context.router.replaceAll([const HomeRoute()]),
+                      onPressed: () => context.go(AppPage.home.path),
                       child: const Text(
                         'Show me all CrowdActions',
                         style: TextStyle(

diff --git a/lib/presentation/core/app_widget.dart b/lib/presentation/core/app_widget.dart
@@ -5,7 +5,8 @@ import '../../application/auth/auth_bloc.dart';
 import '../../application/user/profile/profile_bloc.dart';
 import '../../application/user/profile_tab/profile_tab_bloc.dart';
 import '../../infrastructure/core/injection.dart';
-import '../routes/app_routes.gr.dart';
+
+import '../routes/app_routes.dart';
 import '../themes/themes.dart';
 
 class AppWidget extends StatelessWidget {
@@ -35,7 +36,7 @@ class AppWidget extends StatelessWidget {
                   .add(FetchProfileTabInfo());
             },
             unauthenticated: () {
-              _appRouter.replaceAll([const UnauthenticatedRoute()]);
+              _appRouter.router.go(AppPage.unauthenticated.path);
             },
             orElse: () {},
           );
@@ -44,8 +45,7 @@ class AppWidget extends StatelessWidget {
           color: Colors.white,
           title: 'CollAction',
           theme: lightTheme(),
-          routerDelegate: _appRouter.delegate(),
-          routeInformationParser: _appRouter.defaultRouteParser(),
+          routerConfig: _appRouter.router,
         ),
       ),
     );

diff --git a/lib/presentation/crowdaction/crowdaction_comments/crowdaction_comments_page.dart b/lib/presentation/crowdaction/crowdaction_comments/crowdaction_comments_page.dart
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../core/core.dart';
 import '../../../domain/crowdaction/crowdaction_comment.dart';

diff --git a/lib/presentation/crowdaction/crowdaction_comments/parts/comment_appbar_delegate.dart b/lib/presentation/crowdaction/crowdaction_comments/parts/comment_appbar_delegate.dart
@@ -24,7 +24,7 @@ class CommentAppBarDelegate extends SliverPersistentHeaderDelegate {
             child: IconButton(
               icon: const Icon(CollactionIcons.left),
               iconSize: 24,
-              onPressed: () => context.router.pop(),
+              onPressed: context.pop,
               color: Colors.white,
             ),
           )

diff --git a/lib/presentation/crowdaction/crowdaction_comments/widgets/flag_comment.dart b/lib/presentation/crowdaction/crowdaction_comments/widgets/flag_comment.dart
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../shared_widgets/pill_button.dart';
 import '../../../shared_widgets/selectable_chip.dart';
@@ -145,7 +145,7 @@ class FlagDialogState extends State<FlagDialog> {
           width: double.infinity,
           height: 52,
           child: TextButton(
-            onPressed: () => context.router.pop(),
+            onPressed: context.pop,
             child: const Text("Cancel"),
           ),
         ),
@@ -217,9 +217,7 @@ class FlagSuccess extends StatelessWidget {
           ),
           PillButton(
             text: "Got it",
-            onTap: () {
-              context.router.pop();
-            },
+            onTap: context.pop,
             margin: EdgeInsets.zero,
           ),
           const SizedBox(height: 20),

diff --git a/lib/presentation/crowdaction/crowdaction_details/crowdaction_details_screen.dart b/lib/presentation/crowdaction/crowdaction_details/crowdaction_details_screen.dart
@@ -1,14 +1,15 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../../domain/crowdaction/crowdaction.dart';
 import '../../../../infrastructure/core/injection.dart';
 import '../../../application/auth/auth_bloc.dart';
 import '../../../application/crowdaction/crowdaction_details/crowdaction_details_bloc.dart';
 import '../../../application/participation/participation_bloc.dart';
 import '../../../application/user/profile_tab/profile_tab_bloc.dart';
-import '../../routes/app_routes.gr.dart';
+
+import '../../routes/app_routes.dart';
 import '../../shared_widgets/commitments/commitment_card_list.dart';
 import '../../shared_widgets/pill_button.dart';
 import '../../themes/constants.dart';
@@ -348,7 +349,6 @@ class CrowdActionDetailsPageState extends State<CrowdActionDetailsPage> {
   }
 
   void _createAccount(BuildContext context) {
-    context.router.pop();
-    context.router.push(const AuthRoute());
+    context.go(AppPage.auth.path);
   }
 }
diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/confirm_participation.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/confirm_participation.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../../../domain/crowdaction/crowdaction.dart';
 import '../../../../application/participation/participation_bloc.dart';
@@ -91,9 +91,7 @@ class ParticipationSuccess extends StatelessWidget {
           ),
           PillButton(
             text: "Got it",
-            onTap: () {
-              context.router.pop();
-            },
+            onTap: context.pop,
             margin: EdgeInsets.zero,
           ),
           const SizedBox(height: 20),
@@ -223,7 +221,7 @@ class ParticipationDialog extends StatelessWidget {
             width: double.infinity,
             height: 52,
             child: TextButton(
-              onPressed: () => context.router.pop(),
+              onPressed: context.pop,
               child: const Text("Cancel"),
             ),
           ),

diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_details_banner.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_details_banner.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:shimmer/shimmer.dart';
 
 import '../../../../core/core.dart';
@@ -39,7 +39,7 @@ class CrowdActionDetailsBanner extends StatelessWidget {
               elevation: 4,
               child: InkWell(
                 borderRadius: BorderRadius.circular(20),
-                onTap: () => context.router.pop(),
+                onTap: context.pop,
                 child: const Icon(
                   CollactionIcons.left,
                   color: kPrimaryColor400,

diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/withdraw_participation.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/withdraw_participation.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../../../domain/crowdaction/crowdaction.dart';
 import '../../../../application/participation/participation_bloc.dart';
@@ -164,7 +164,7 @@ class WithdrawParticipation extends StatelessWidget {
                         width: double.infinity,
                         height: 52,
                         child: TextButton(
-                          onPressed: () => context.router.pop(),
+                          onPressed: context.pop,
                           child: const Text("Cancel"),
                         ),
                       ),

diff --git a/lib/presentation/crowdaction/crowdaction_participants/crowdaction_participants_screen.dart b/lib/presentation/crowdaction/crowdaction_participants/crowdaction_participants_screen.dart
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 
 import '../../../application/crowdaction/crowdaction_participants/crowdaction_participants_bloc.dart';
@@ -85,7 +85,7 @@ class _CrowdActionParticipantsPageState
                 Icons.chevron_left,
                 color: kPrimaryColor200,
               ),
-              onPressed: () => context.router.pop(),
+              onPressed: context.pop,
             ),
             title: const Text(
               "Participants",

diff --git a/lib/presentation/demo/components_demo/components_demo_screen.dart b/lib/presentation/demo/components_demo/components_demo_screen.dart
@@ -1,5 +1,5 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../../domain/crowdaction/crowdaction.dart';
 import '../../shared_widgets/accent_chip.dart';
@@ -326,9 +326,7 @@ class ComponentsDemoPageState extends State<ComponentsDemoPage> {
                   width: double.infinity,
                   height: 52,
                   child: TextButton(
-                    onPressed: () {
-                      context.router.pop();
-                    },
+                    onPressed: context.pop,
                     child: const Text("Cancel"),
                   ),
                 ),

diff --git a/lib/presentation/demo/demo_screen.dart b/lib/presentation/demo/demo_screen.dart
@@ -1,14 +1,15 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 import '../../domain/core/i_settings_repository.dart';
 import '../../infrastructure/core/injection.dart';
-import '../routes/app_routes.gr.dart';
+import '../routes/app_routes.dart';
 import '../shared_widgets/rectangle_button.dart';
 import 'components_demo/current_user_status_text.dart';
 
 class DemoPage extends StatelessWidget {
   DemoPage({super.key});
+
   final settingsRepository = getIt<ISettingsRepository>();
   final _pageScrollController = ScrollController();
 
@@ -30,23 +31,22 @@ class DemoPage extends StatelessWidget {
                 const SizedBox(height: 30.0),
                 RectangleButton(
                   text: "Reusable Components",
-                  onTap: () => context.router.push(const ComponentsDemoRoute()),
+                  onTap: () => context.push(AppPage.componentsDemo.path),
                 ),
                 const SizedBox(height: 10.0),
                 RectangleButton(
                   text: "Crowdaction Comments",
-                  onTap: () =>
-                      context.router.push(const CrowdActionCommentsRoute()),
+                  onTap: () => context.push(AppPage.commentsDemo.path),
                 ),
                 const SizedBox(height: 10.0),
                 RectangleButton(
                   text: "Contact Form",
-                  onTap: () => context.router.push(const ContactFormRoute()),
+                  onTap: () => context.push(AppPage.contactForm.path),
                 ),
                 const SizedBox(height: 10.0),
                 RectangleButton(
                   text: "Onboarding",
-                  onTap: () => context.router.push(const OnboardingRoute()),
+                  onTap: () => context.push(AppPage.onBoarding.path),
                 ),
                 const SizedBox(
                   height: 15.0,
@@ -57,7 +57,7 @@ class DemoPage extends StatelessWidget {
                 ),
                 RectangleButton(
                   text: "Register",
-                  onTap: () => context.router.push(const AuthRoute()),
+                  onTap: () => context.push(AppPage.auth.path),
                 ),
               ],
             ),