From 9284fb2893cb8c78cad589968a7bc421927cd707 Mon Sep 17 00:00:00 2001
From: Oleksii Khoroshun <alexeyhoroshunvk@gmail.com>
Date: Sun, 5 Sep 2021 13:57:29 +0300
Subject: [PATCH 1/4] New implementation of AutoRoute package

1. Deleted line generateNavigationHelperExtension: true.
2. Renamed MaterialRoute to AutoRoute.
---
 lib/presentation/routes/router.dart | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/presentation/routes/router.dart b/lib/presentation/routes/router.dart
index 5be0f02..90465f8 100644
--- a/lib/presentation/routes/router.dart
+++ b/lib/presentation/routes/router.dart
@@ -4,13 +4,12 @@ import 'package:notes_firebase_ddd_course/presentation/notes/notes_overview/note
 import 'package:notes_firebase_ddd_course/presentation/sign_in/sign_in_page.dart';
 import 'package:notes_firebase_ddd_course/presentation/splash/splash_page.dart';
 
-@MaterialAutoRouter(
-  generateNavigationHelperExtension: true,
+@MaterialAutoRouter( 
   routes: <AutoRoute>[
-    MaterialRoute(page: SplashPage, initial: true),
-    MaterialRoute(page: SignInPage),
-    MaterialRoute(page: NotesOverviewPage),
-    MaterialRoute(page: NoteFormPage, fullscreenDialog: true),
+    AutoRoute(page: SplashPage, initial: true),
+    AutoRoute(page: SignInPage),
+    AutoRoute(page: NotesOverviewPage),
+    AutoRoute(page: NoteFormPage, fullscreenDialog: true),
   ],
 )
 class $Router {}

From dcc28082c8a5a19c5a567c94c07828dd624f6ea8 Mon Sep 17 00:00:00 2001
From: Oleksii Khoroshun <alexeyhoroshunvk@gmail.com>
Date: Sun, 5 Sep 2021 14:04:22 +0300
Subject: [PATCH 2/4] According to new implementation of AutoRoute

ExtendedNavigator replaced with AutoRouterDelegate.
---
 lib/presentation/core/app_widget.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/presentation/core/app_widget.dart b/lib/presentation/core/app_widget.dart
index 9910450..4e4f47f 100644
--- a/lib/presentation/core/app_widget.dart
+++ b/lib/presentation/core/app_widget.dart
@@ -10,6 +10,7 @@ import 'package:notes_firebase_ddd_course/presentation/sign_in/sign_in_page.dart
 class AppWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    final _appRouter = app_router.Router();
     return MultiBlocProvider(
       providers: [
         BlocProvider(
@@ -17,10 +18,11 @@ class AppWidget extends StatelessWidget {
               getIt<AuthBloc>()..add(const AuthEvent.authCheckRequested()),
         )
       ],
-      child: MaterialApp(
+      child: MaterialApp.router(
+        routerDelegate: AutoRouterDelegate(_appRouter),
+        routeInformationParser: _appRouter.defaultRouteParser(),
         title: 'Notes',
-        debugShowCheckedModeBanner: false,
-        builder: ExtendedNavigator.builder(router: app_router.Router()),
+        debugShowCheckedModeBanner: false,        
         theme: ThemeData.light().copyWith(
           primaryColor: Colors.green[800],
           accentColor: Colors.blueAccent,

From 8fb24cc1e96f389f58a3ad08681cdb8f2233f3b2 Mon Sep 17 00:00:00 2001
From: Oleksii Khoroshun <alexeyhoroshunvk@gmail.com>
Date: Sun, 5 Sep 2021 14:10:24 +0300
Subject: [PATCH 3/4] According to new implementation of AutoRoute.

Replaced
ExtendedNavigator.of(context).replace(Routes.notesOverviewPage),
with
  context.router.replace(NotesOverviewPage(),),
and
  ExtendedNavigator.of(context).replace(Routes.signInPage),
 with
  context.router.replace(SignInPageRoute(),),
---
 lib/presentation/splash/splash_page.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/presentation/splash/splash_page.dart b/lib/presentation/splash/splash_page.dart
index c4902a4..80748f4 100644
--- a/lib/presentation/splash/splash_page.dart
+++ b/lib/presentation/splash/splash_page.dart
@@ -12,9 +12,11 @@ class SplashPage extends StatelessWidget {
         state.map(
           initial: (_) {},
           authenticated: (_) =>
-              ExtendedNavigator.of(context).replace(Routes.notesOverviewPage),
+              context.router.replace(NotesOverviewPage(),
+                                    ),
           unauthenticated: (_) =>
-              ExtendedNavigator.of(context).replace(Routes.signInPage),
+               context.router.replace(SignInPageRoute(),
+                                     ),
         );
       },
       child: const Scaffold(

From 1da0e618b4718620da3cd26796634225567828c3 Mon Sep 17 00:00:00 2001
From: Oleksii Khoroshun <alexeyhoroshunvk@gmail.com>
Date: Sun, 5 Sep 2021 14:58:36 +0300
Subject: [PATCH 4/4] Autoroute new version

New version 2.3.0
---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index d1baadf..c1f7ae8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,7 +19,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  auto_route: ^0.6.9
+  auto_route: ^2.3.0
   cloud_firestore: ^0.14.0+2
   dartz: ^0.9.1
   firebase_auth: ^0.18.0+1