From 8545921adc68cfe02e0f5ab9d9c494e584df625f Mon Sep 17 00:00:00 2001 From: Daniele Cambi Date: Thu, 13 Apr 2023 17:18:23 +0200 Subject: [PATCH 1/5] adds name to TypedGoRoute Co-authored-by: MicheleBenedetti --- packages/go_router/CHANGELOG.md | 4 ++++ packages/go_router/lib/src/route_data.dart | 7 +++++++ packages/go_router/pubspec.yaml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/go_router/CHANGELOG.md b/packages/go_router/CHANGELOG.md index df331c329970..59eb67384934 100644 --- a/packages/go_router/CHANGELOG.md +++ b/packages/go_router/CHANGELOG.md @@ -1,3 +1,7 @@ +## 6.5.7 + +- Adds name parameter to `TypedGoRoute` + ## 6.5.6 - Fixes an issue where ShellRoute routes were not logged when debugLogDiagnostic was enabled. diff --git a/packages/go_router/lib/src/route_data.dart b/packages/go_router/lib/src/route_data.dart index 3530ca250fc4..0d33e34305cd 100644 --- a/packages/go_router/lib/src/route_data.dart +++ b/packages/go_router/lib/src/route_data.dart @@ -223,6 +223,7 @@ class TypedGoRoute extends TypedRoute { /// Default const constructor const TypedGoRoute({ required this.path, + this.name, this.routes = const >[], }); @@ -233,6 +234,12 @@ class TypedGoRoute extends TypedRoute { /// final String path; + /// The name that corresponds to this route. + /// + /// See [GoRoute.name]. + /// + final String? name; + /// Child route definitions. /// /// See [RouteBase.routes]. diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 5c08a6a13c89..1bd627951aaa 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -1,7 +1,7 @@ name: go_router description: A declarative router for Flutter based on Navigation 2 supporting deep linking, data-driven routes and more -version: 6.5.6 +version: 6.5.7 repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22 From 144d4494cc9d6a5c033a64e3d79c2d85ae3aab01 Mon Sep 17 00:00:00 2001 From: MicheleBenedetti <45004856+Michele-x98@users.noreply.github.com> Date: Thu, 13 Apr 2023 18:22:41 +0200 Subject: [PATCH 2/5] fix: [feature/typedgorouter-name] add name on $route --- packages/go_router/lib/src/route_data.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/go_router/lib/src/route_data.dart b/packages/go_router/lib/src/route_data.dart index 0d33e34305cd..4dcc231a7506 100644 --- a/packages/go_router/lib/src/route_data.dart +++ b/packages/go_router/lib/src/route_data.dart @@ -79,6 +79,7 @@ abstract class GoRouteData extends RouteData { /// Should not be used directly. static GoRoute $route({ required String path, + String? name, required T Function(GoRouterState) factory, GlobalKey? parentNavigatorKey, List routes = const [], @@ -106,6 +107,7 @@ abstract class GoRouteData extends RouteData { return GoRoute( path: path, + name: name, builder: builder, pageBuilder: pageBuilder, redirect: redirect, From d96a318f093364cd02a92181e0aad70664cbdd0c Mon Sep 17 00:00:00 2001 From: Daniele Cambi <43640732+dancamdev@users.noreply.github.com> Date: Fri, 21 Apr 2023 16:56:18 +0200 Subject: [PATCH 3/5] Update route_data.dart --- packages/go_router/lib/src/route_data.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/go_router/lib/src/route_data.dart b/packages/go_router/lib/src/route_data.dart index 4dcc231a7506..ecc4260a3a53 100644 --- a/packages/go_router/lib/src/route_data.dart +++ b/packages/go_router/lib/src/route_data.dart @@ -237,6 +237,8 @@ class TypedGoRoute extends TypedRoute { final String path; /// The name that corresponds to this route. + /// Used by Analytics services such as Firebase Analytics + /// to log the screen views in their system. /// /// See [GoRoute.name]. /// From 678d1c134cfe4b40791dccaba08477bdf32f4a10 Mon Sep 17 00:00:00 2001 From: Daniele Cambi Date: Sat, 22 Apr 2023 10:18:35 +0200 Subject: [PATCH 4/5] format fixes --- packages/go_router/lib/src/route_data.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/lib/src/route_data.dart b/packages/go_router/lib/src/route_data.dart index ecc4260a3a53..fbf396126c32 100644 --- a/packages/go_router/lib/src/route_data.dart +++ b/packages/go_router/lib/src/route_data.dart @@ -237,7 +237,7 @@ class TypedGoRoute extends TypedRoute { final String path; /// The name that corresponds to this route. - /// Used by Analytics services such as Firebase Analytics + /// Used by Analytics services such as Firebase Analytics /// to log the screen views in their system. /// /// See [GoRoute.name]. From fe1bef4667d711586ffdafa01002705b2f2dc614 Mon Sep 17 00:00:00 2001 From: Daniele Cambi Date: Sat, 22 Apr 2023 10:28:06 +0200 Subject: [PATCH 5/5] updates version --- packages/go_router/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/go_router/pubspec.yaml b/packages/go_router/pubspec.yaml index 1bd627951aaa..3d1562db2980 100644 --- a/packages/go_router/pubspec.yaml +++ b/packages/go_router/pubspec.yaml @@ -1,7 +1,7 @@ name: go_router description: A declarative router for Flutter based on Navigation 2 supporting deep linking, data-driven routes and more -version: 6.5.7 +version: 6.5.8 repository: https://github.com/flutter/packages/tree/main/packages/go_router issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router%22