From 019441374e978fe6faa4dfc00b94bc13fedf10a4 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Tue, 20 Dec 2022 17:54:46 +0100 Subject: [PATCH] migrate provider_shopper to go_router (#1540) --- provider_shopper/lib/main.dart | 32 +++++++++++++++----- provider_shopper/lib/screens/catalog.dart | 3 +- provider_shopper/lib/screens/login.dart | 3 +- provider_shopper/pubspec.yaml | 1 + provider_shopper/test/login_widget_test.dart | 11 ++----- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/provider_shopper/lib/main.dart b/provider_shopper/lib/main.dart index 2a3e4fa6b..8992e78ac 100644 --- a/provider_shopper/lib/main.dart +++ b/provider_shopper/lib/main.dart @@ -6,6 +6,7 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; import 'package:provider_shopper/common/theme.dart'; import 'package:provider_shopper/models/cart.dart'; @@ -39,6 +40,28 @@ void setupWindow() { } } +GoRouter router() { + return GoRouter( + initialLocation: '/login', + routes: [ + GoRoute( + path: '/login', + builder: (context, state) => const MyLogin(), + ), + GoRoute( + path: '/catalog', + builder: (context, state) => const MyCatalog(), + routes: [ + GoRoute( + path: 'cart', + builder: (context, state) => const MyCart(), + ), + ], + ), + ], + ); +} + class MyApp extends StatelessWidget { const MyApp({super.key}); @@ -62,15 +85,10 @@ class MyApp extends StatelessWidget { }, ), ], - child: MaterialApp( + child: MaterialApp.router( title: 'Provider Demo', theme: appTheme, - initialRoute: '/', - routes: { - '/': (context) => const MyLogin(), - '/catalog': (context) => const MyCatalog(), - '/cart': (context) => const MyCart(), - }, + routerConfig: router(), ), ); } diff --git a/provider_shopper/lib/screens/catalog.dart b/provider_shopper/lib/screens/catalog.dart index 85947f458..e3f4d579d 100644 --- a/provider_shopper/lib/screens/catalog.dart +++ b/provider_shopper/lib/screens/catalog.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; import 'package:provider/provider.dart'; import 'package:provider_shopper/models/cart.dart'; import 'package:provider_shopper/models/catalog.dart'; @@ -80,7 +81,7 @@ class _MyAppBar extends StatelessWidget { actions: [ IconButton( icon: const Icon(Icons.shopping_cart), - onPressed: () => Navigator.pushNamed(context, '/cart'), + onPressed: () => context.go('/catalog/cart'), ), ], ); diff --git a/provider_shopper/lib/screens/login.dart b/provider_shopper/lib/screens/login.dart index 8fa851485..4591f61cd 100644 --- a/provider_shopper/lib/screens/login.dart +++ b/provider_shopper/lib/screens/login.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; class MyLogin extends StatelessWidget { const MyLogin({super.key}); @@ -36,7 +37,7 @@ class MyLogin extends StatelessWidget { ), ElevatedButton( onPressed: () { - Navigator.pushReplacementNamed(context, '/catalog'); + context.pushReplacement('/catalog'); }, style: ElevatedButton.styleFrom( foregroundColor: Colors.yellow, diff --git a/provider_shopper/pubspec.yaml b/provider_shopper/pubspec.yaml index 2274d86f4..dd2fa85ac 100644 --- a/provider_shopper/pubspec.yaml +++ b/provider_shopper/pubspec.yaml @@ -10,6 +10,7 @@ environment: dependencies: flutter: sdk: flutter + go_router: ^6.0.0 provider: ^6.0.2 window_size: git: diff --git a/provider_shopper/test/login_widget_test.dart b/provider_shopper/test/login_widget_test.dart index c06e9d5bc..20e5ae4d3 100644 --- a/provider_shopper/test/login_widget_test.dart +++ b/provider_shopper/test/login_widget_test.dart @@ -5,10 +5,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:provider/provider.dart'; +import 'package:provider_shopper/main.dart'; import 'package:provider_shopper/models/cart.dart'; import 'package:provider_shopper/models/catalog.dart'; -import 'package:provider_shopper/screens/catalog.dart'; -import 'package:provider_shopper/screens/login.dart'; void main() { testWidgets('Login page Widget test', (tester) async { @@ -23,13 +22,7 @@ void main() { }, ), ], - child: MaterialApp( - initialRoute: '/', - routes: { - '/': (context) => const MyLogin(), - '/catalog': (context) => const MyCatalog(), - }, - ), + child: MaterialApp.router(routerConfig: router()), )); // Verifying the behaviour of ENTER button.