3.1.1 Add FFGoRouterRouteSettings and GoRouterPageBuilder to support go_router.

Author: zmtzawqlp

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.1
+
+* Add `FFGoRouterRouteSettings` and `GoRouterPageBuilder` to support `go_router`.
+
 ## 3.2.0
 
 * Introduce `FFErrorWidgetBuilder` to build an error page correspondingly.

lib/src/helper.dart

@@ -28,7 +28,7 @@ T? asT<T extends Object?>(dynamic value, [T? defaultValue]) {
       if ('' is T) {
         return valueS as T;
       } else if (0 is T) {
-        return int.parse(valueS) as T;
+        return (int.tryParse(valueS) ?? double.tryParse(valueS)?.toInt()) as T;
       } else if (0.0 is T) {
         return double.parse(valueS) as T;
       } else if (false is T) {

lib/src/page.dart

@@ -367,3 +367,64 @@ typedef FFErrorWidgetBuilder = Widget Function(
   Object error,
   StackTrace stackTrace,
 );
+
+/// GoRouter
+///
+class FFGoRouterRouteSettings extends RouteSettings {
+  const FFGoRouterRouteSettings({
+    required String name,
+    required this.builder,
+    Object? arguments,
+    this.showStatusBar,
+    this.routeName,
+    this.pageRouteType,
+    this.description,
+    this.exts,
+    this.codes,
+  }) : super(
+          name: name,
+          arguments: arguments,
+        );
+
+  factory FFGoRouterRouteSettings.notFound(Widget notFoundWidget) {
+    return FFGoRouterRouteSettings(
+      name: FFRoute.notFoundName,
+      routeName: FFRoute.notFoundRouteName,
+      builder: (_) => notFoundWidget,
+    );
+  }
+
+  /// to support something can't write in annotation
+  /// it will be hadnled as a code when generate route
+  final Map<String, dynamic>? codes;
+
+  /// The builder return the page
+  final GoRouterPageBuilder builder;
+
+  /// The Widget base on this route
+  //final Widget? widget;
+
+  /// Whether show status bar.
+  final bool? showStatusBar;
+
+  /// The route name to track page
+  final String? routeName;
+
+  /// The type of page route
+  final PageRouteType? pageRouteType;
+
+  /// The description of route
+  final String? description;
+
+  /// The extend arguments
+  final Map<String, dynamic>? exts;
+
+  /// Whether the setting is targeting the not found route.
+  bool get isNotFound =>
+      name == FFRoute.notFoundName && routeName == FFRoute.notFoundRouteName;
+}
+
+/// The builder return the page
+typedef GoRouterPageBuilder = Widget Function(
+  Map<String, dynamic> safeArguments,
+);

pubspec.yaml

@@ -1,21 +1,20 @@
 name: ff_annotation_route_library
 description: The library for ff_annotation_route,support both null-safety and non-null-safety.
-version: 3.2.0
+version: 3.2.1
 homepage: https://github.com/fluttercandies/ff_annotation_route_library
 
 environment:
-  sdk: '>=2.12.0 <4.0.0'
+  sdk: ">=2.12.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
   collection: ^1.15.0
-  ff_annotation_route_core: ^2.1.0
+  ff_annotation_route_core: ^2.1.1
 
 dev_dependencies:
   flutter_lints: any
-
 # dependency_overrides:
 #   ff_annotation_route_core:
 #     path: ../ff_annotation_route_core