Browse Source

Merge pull request #191 from JagandeepBrar/master

Use MaterialPageRoute for all platforms when using TransitionType.native
Luke Pighetti 5 years ago
parent
commit
7fc4839558
1 changed files with 7 additions and 17 deletions
  1. 7 17
      lib/src/fluro_router.dart

+ 7 - 17
lib/src/fluro_router.dart

@@ -164,23 +164,13 @@ class FluroRouter {
       bool isNativeTransition = (transition == TransitionType.native ||
       bool isNativeTransition = (transition == TransitionType.native ||
           transition == TransitionType.nativeModal);
           transition == TransitionType.nativeModal);
       if (isNativeTransition) {
       if (isNativeTransition) {
-        if (Theme.of(buildContext).platform == TargetPlatform.iOS) {
-          return CupertinoPageRoute<dynamic>(
-              settings: routeSettings,
-              fullscreenDialog: transition == TransitionType.nativeModal,
-              maintainState: maintainState,
-              builder: (BuildContext context) {
-                return handler.handlerFunc(context, parameters);
-              });
-        } else {
-          return MaterialPageRoute<dynamic>(
-              settings: routeSettings,
-              fullscreenDialog: transition == TransitionType.nativeModal,
-              maintainState: maintainState,
-              builder: (BuildContext context) {
-                return handler.handlerFunc(context, parameters);
-              });
-        }
+        return MaterialPageRoute<dynamic>(
+            settings: routeSettings,
+            fullscreenDialog: transition == TransitionType.nativeModal,
+            maintainState: maintainState,
+            builder: (BuildContext context) {
+              return handler.handlerFunc(context, parameters);
+            });
       } else if (transition == TransitionType.material ||
       } else if (transition == TransitionType.material ||
           transition == TransitionType.materialFullScreenDialog) {
           transition == TransitionType.materialFullScreenDialog) {
         return MaterialPageRoute<dynamic>(
         return MaterialPageRoute<dynamic>(