Merge 6fa74ac into b90a8b5

Flutterando · Jan 12, 2021 · e531934 · e531934
2 parents b90a8b5 + 6fa74ac
commit e531934
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/flutter_modular/lib/src/core/interfaces/modular_route.dart b/flutter_modular/lib/src/core/interfaces/modular_route.dart
@@ -8,7 +8,7 @@ import '../models/modular_arguments.dart';
 import 'child_module.dart';
 import 'route_guard.dart';
 
-typedef RouteBuilder<T> = MaterialPageRoute<T> Function(
+typedef RouteBuilder<T> = Route<T> Function(
     WidgetBuilder, RouteSettings);
 typedef ModularChild = Widget Function(
     BuildContext context, ModularArguments? args);

diff --git a/flutter_modular/lib/src/core/models/child_route.dart b/flutter_modular/lib/src/core/models/child_route.dart
@@ -14,6 +14,15 @@ class ChildRoute extends ModularRouteImpl {
     List<RouteGuard>? guards,
     TransitionType transition = TransitionType.defaultTransition,
     CustomTransition? customTransition,
+    RouteBuilder? routeGenerator,
     Duration duration = const Duration(milliseconds: 300),
-  }) : super(routerName, routerOutlet: [], duration: duration, child: child, customTransition: customTransition, children: children, guards: guards, transition: transition);
+  }) : super(routerName,
+            routerOutlet: [],
+            duration: duration,
+            child: child,
+            routeGenerator: routeGenerator,
+            customTransition: customTransition,
+            children: children,
+            guards: guards,
+            transition: transition);
 }
diff --git a/flutter_modular/lib/src/core/models/module_route.dart b/flutter_modular/lib/src/core/models/module_route.dart
@@ -10,8 +10,8 @@ class ModuleRoute extends ModularRouteImpl {
     required ChildModule module,
     List<RouteGuard>? guards,
     TransitionType transition = TransitionType.defaultTransition,
-    CustomTransition? customTransition,
+    CustomTransition? customTransition, RouteBuilder? routeGenerator,
     Duration duration = const Duration(milliseconds: 300),
   })  : assert(!routerName.contains('/:'), 'ModuleRoute should not contain dynamic route'),
-        super(routerName, routerOutlet: [], duration: duration, module: module, customTransition: customTransition, guards: guards, transition: transition);
+        super(routerName, routerOutlet: [], duration: duration,routeGenerator: routeGenerator, module: module, customTransition: customTransition, guards: guards, transition: transition);
 }
diff --git a/flutter_modular/lib/src/core/models/wildcard_route.dart b/flutter_modular/lib/src/core/models/wildcard_route.dart
@@ -13,6 +13,7 @@ class WildcardRoute extends ModularRouteImpl {
     List<RouteGuard>? guards,
     TransitionType transition = TransitionType.defaultTransition,
     CustomTransition? customTransition,
+    RouteBuilder? routeGenerator,
     Duration duration = const Duration(milliseconds: 300),
-  }) : super('**', routerOutlet: [], duration: duration, child: child, customTransition: customTransition, children: children, guards: guards, transition: transition);
+  }) : super('**', routerOutlet: [], duration: duration, child: child,routeGenerator: routeGenerator, customTransition: customTransition, children: children, guards: guards, transition: transition);
 }