Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Upgrade GoRouter to the latest version (7.x -> 12.x) #4851

Merged
merged 2 commits into from
Nov 24, 2023
Merged

chore: Upgrade GoRouter to the latest version (7.x -> 12.x) #4851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56bb94a
Upgrade GoRouter to the latest version (7.x -> 12.x)
g123k Nov 24, 2023
e28a16a
Let's reformat
g123k Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions packages/smooth_app/lib/pages/navigator/app_navigator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ class _SmoothGoRouter {
final Widget widget = ProductPage(
product,
withHeroAnimation:
state.queryParameters['heroAnimation'] != 'false',
heroTag: state.queryParameters['heroTag'],
state.uri.queryParameters['heroAnimation'] != 'false',
heroTag: state.uri.queryParameters['heroTag'],
);

if (ExternalCarouselManager.find(context) == null) {
Expand Down Expand Up @@ -162,7 +162,7 @@ class _SmoothGoRouter {
final String barcode = state.pathParameters['productId']!;
return ProductLoaderPage(
barcode: barcode,
mode: state.queryParameters['edit'] == 'true'
mode: state.uri.queryParameters['edit'] == 'true'
? ProductLoaderMode.editProduct
: ProductLoaderMode.viewProduct,
);
Expand Down Expand Up @@ -201,7 +201,7 @@ class _SmoothGoRouter {
GoRoute(
path: _InternalAppRoutes.EXTERNAL_PAGE,
builder: (BuildContext context, GoRouterState state) {
return ExternalPage(path: state.queryParameters['path']!);
return ExternalPage(path: state.uri.queryParameters['path']!);
},
),
],
Expand All @@ -211,7 +211,7 @@ class _SmoothGoRouter {
final String path = state.matchedLocation;

// Ignore deep links if the onboarding is not yet completed
if (state.location != _InternalAppRoutes.HOME_PAGE &&
if (state.uri.toString() != _InternalAppRoutes.HOME_PAGE &&
!_isOnboardingComplete(context)) {
return _InternalAppRoutes.HOME_PAGE;
} else if (_isAnInternalRoute(path)) {
Expand Down Expand Up @@ -240,9 +240,10 @@ class _SmoothGoRouter {
}
} else if (path == _ExternalRoutes.PRODUCT_EDITION) {
// Support cgi/product.pl?type=edit&code=XXXX
final String? barcode = state.queryParameters['code'];
final String? barcode = state.uri.queryParameters['code'];

if (barcode != null && state.queryParameters['type'] == 'edit') {
if (barcode != null &&
state.uri.queryParameters['type'] == 'edit') {
return AppRoutes.PRODUCT_LOADER(barcode, edit: true);
} else {
externalLink = true;
Expand All @@ -260,11 +261,11 @@ class _SmoothGoRouter {
if (externalLink) {
return _openExternalLink(path);
} else {
return state.location;
return state.uri.toString();
}
},
errorBuilder: (_, GoRouterState state) => ErrorPage(
url: state.location,
url: state.uri.toString(),
),
);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/smooth_app/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,10 +759,10 @@ packages:
dependency: "direct main"
description:
name: go_router
sha256: b185cf91b5a6861f4c2a92ddaa65f8919909416ee033e00751f7c67ebee1588d
sha256: c247a4f76071c3b97bb5ae8912968870d5565644801c5e09f3bc961b4d874895
url: "https://pub.dev"
source: hosted
version: "7.0.2"
version: "12.1.1"
graphs:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
sdk: flutter

async: 2.11.0
go_router: 7.0.2
go_router: 12.1.1
barcode_widget: 2.0.4
carousel_slider: 4.2.1
cupertino_icons: 1.0.6
Expand Down