Add MaterialPageRoute builder and add more features to Guards

example/lib/app/app_widget.dart

@@ -6,6 +6,7 @@ class AppWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       initialRoute: "/",
+      navigatorKey: Modular.navigatorKey,
       onGenerateRoute: Modular.generateRoute,
     );
   }

example/lib/app/modules/home/guard/guard.dart

@@ -1,8 +1,31 @@
 import 'package:flutter_modular/flutter_modular.dart';
 
+class LoginExecutor extends GuardExecutor {
+
+  final String message;
+  LoginExecutor({this.message});
+
+  @override
+  onGuarded(String path, bool isActive) {
+    if(isActive) {
+      print('logined and pass');
+      return;
+    }
+
+    print('toast: need login => $message');
+
+    // Suppose login.
+    Modular.to.pushNamed('/list/10');
+  }
+}
+
 class MyGuard implements RouteGuard {
   @override
   bool canActivate(String url) {
     return url != '/list/2';
   }
+
+  @override
+  // TODO: implement executors
+  List<GuardExecutor> get executors => [LoginExecutor(message: 'List page')];
 }

example/lib/app/modules/home/home_module.dart

@@ -1,10 +1,22 @@
 import 'package:example/app/modules/home/pages/list/list_widget.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-
+import 'package:flutter/material.dart';
 import 'guard/guard.dart';
 import 'home_bloc.dart';
 import 'home_widget.dart';
 
+class SlowerPageRoute extends MaterialPageRoute {
+  @override
+  // TODO: implement transitionDuration
+  Duration get transitionDuration => Duration(milliseconds: 1200);
+
+  Map eventP;
+  SlowerPageRoute({
+    @required builder,
+    @required settings,
+  }) : super(builder: builder, settings: settings);
+}
+
 class HomeModule extends ChildModule {
   @override
   List<Bind> get binds => [
@@ -19,6 +31,7 @@ class HomeModule extends ChildModule {
         ),
         Router(
           "/list/:id",
+          routeGenerator: (b, s) => SlowerPageRoute(builder: b, settings: s),
           child: (_, args) => ListWidget(
             param: int.parse(args.params['id']),
           ),

lib/src/interfaces/route_guard.dart

@@ -1,4 +1,10 @@
 
+abstract class GuardExecutor {
+  onGuarded(String path, bool isActive);
+}
+
 abstract class RouteGuard {
   bool canActivate(String url);
+
+  List<GuardExecutor> get executors;
 }

lib/src/modular_base.dart

@@ -248,13 +248,17 @@ class Modular {
 
   static RouteGuard _verifyGuard(List<RouteGuard> guards, String path) {
     RouteGuard guard;
-    try {
-      guard = guards.length == 0
-          ? null
-          : guards.firstWhere((guard) => !guard.canActivate(path),
-              orElse: null);
-    } catch (e) {}
+    var realGuards = guards ?? [];
+    guard = realGuards.length == 0
+        ? null
+        : guards.firstWhere((guard) => !guard.canActivate(path),
+        orElse: () => null);
 
+    realGuards.expand((c) => c.executors).forEach((c) => c.onGuarded(path, guard == null));
+
+    if(guard != null) {
+      throw ModularError("Path guarded : $path");
+    }
     return guard;
   }
 
@@ -303,6 +307,7 @@ class Modular {
 
           if (router.transition == TransitionType.defaultTransition) {
             router = router.copyWith(
+              routeGenerator: route.routeGenerator,
               transition: route.transition,
             );
           }
@@ -313,13 +318,7 @@ class Modular {
         if (searchRoute(route, tempRouteName, path)) {
           var guards = _prepareGuardList(_masterRouteGuards, route.guards);
           _masterRouteGuards = null;
-          RouteGuard guard;
-          try {
-            guard = guards.length == 0
-                ? null
-                : guards.firstWhere((guard) => !guard.canActivate(path),
-                    orElse: null);
-          } catch (e) {}
+          RouteGuard guard = _verifyGuard(guards, path);
           if ((tempRouteName == path || tempRouteName == "$path/") &&
               path != '/') {
             guard = _verifyGuard(guards, path);

lib/src/routers/router.dart

@@ -5,6 +5,8 @@ import 'package:flutter_modular/src/interfaces/child_module.dart';
 import 'package:flutter_modular/src/interfaces/route_guard.dart';
 import 'package:flutter_modular/src/transitions/transitions.dart';
 
+typedef RouteBuilder<T> = MaterialPageRoute<T> Function(WidgetBuilder, RouteSettings);
+
 _debugPrintModular(String text) {
   if (Modular.debugMode) {
     debugPrint(text);
@@ -19,6 +21,7 @@ class Router<T> {
   final List<RouteGuard> guards;
   final TransitionType transition;
   final CustomTransition customTransition;
+  final RouteBuilder<T> routeGenerator;
 
   Router(
     this.routerName, {
@@ -27,6 +30,7 @@ class Router<T> {
     this.guards,
     this.params,
     this.transition = TransitionType.defaultTransition,
+    this.routeGenerator,
     this.customTransition,
   }) {
     assert(routerName != null);
@@ -64,13 +68,15 @@ class Router<T> {
       Map<String, String> params,
       List<RouteGuard> guards,
       TransitionType transition,
+      RouteBuilder routeGenerator,
       CustomTransition customTransition}) {
     return Router<T>(
       routerName ?? this.routerName,
       child: child ?? this.child,
       module: module ?? this.module,
       params: params ?? this.params,
       guards: guards ?? this.guards,
+      routeGenerator: routeGenerator ?? this.routeGenerator,
       transition: transition ?? this.transition,
       customTransition: customTransition ?? this.customTransition,
     );
@@ -120,10 +126,14 @@ class Router<T> {
         transitionDuration: this.customTransition.transitionDuration,
       );
     } else if (this.transition == TransitionType.defaultTransition) {
+      var widgetBuilder = (context) => _disposableGenerate(context,
+          args: arguments, injectMap: injectMap, path: settings.name);
+      if(routeGenerator != null) {
+        return routeGenerator(widgetBuilder, settings);
+      }
       return MaterialPageRoute<T>(
         settings: settings,
-        builder: (context) => _disposableGenerate(context,
-            args: arguments, injectMap: injectMap, path: settings.name),
+        builder: widgetBuilder,
       );
     } else {
       var selectTransition = _transitions[this.transition];

test/app/guard/guard.dart

@@ -5,4 +5,7 @@ class MyGuard implements RouteGuard {
   bool canActivate(String url) {
     return false;
   }
+
+  @override
+  List<GuardExecutor> get executors => [];
 }

test/modular_test.dart

@@ -86,17 +86,17 @@ void main() {
     });
 
     test('RouteGuard test', () {
-      expect(Modular.selectRoute("/forbidden"), null);
+      expect(() => Modular.selectRoute("/forbidden"), throwsA(isA<ModularError>()));
     });
     test('RouteGuard other module', () {
-      expect(Modular.selectRoute("/home/forbidden2"), null);
+      expect(() => Modular.selectRoute("/home/forbidden2"), throwsA(isA<ModularError>()));
     });
     test('RouteGuard other module', () {
-      expect(Modular.selectRoute("/home/forbidden2"), null);
+      expect(() => Modular.selectRoute("/home/forbidden2"), throwsA(isA<ModularError>()));
     });
 
     test('RouteGuard other module Two', () {
-      expect(Modular.selectRoute("/homeTwo/forbidden2"), null);
+      expect(() => Modular.selectRoute("/homeTwo/forbidden2"), throwsA(isA<ModularError>()));
     });
 
     test('Get route correct', () {