Merge pull request #151 from Unity-Technologies/zgh/fix/navigation

fix pushReplacementNamed<T,TO>

Author: zhuxingwei

com.unity.uiwidgets/Runtime/widgets/navigator.cs

@@ -1633,7 +1633,7 @@ public Route _routeNamed(string name, object arguments, bool allowNull = false)
             return route;
         }
 
-        public Route<T> _routeNamed<T>(string name, object arguments, bool allowNull = false) {
+        public Route _routeNamed<T>(string name, object arguments, bool allowNull = false) {
             D.assert(!_debugLocked);
             D.assert(name != null);
             if (allowNull && widget.onGenerateRoute == null)
@@ -1657,8 +1657,7 @@ public Route<T> _routeNamed<T>(string name, object arguments, bool allowNull = f
                 arguments: arguments
             );
 
-            var routeee = widget.onGenerateRoute(settings);
-            Route<T> route = routeee as Route<T>;
+            Route route = widget.onGenerateRoute(settings);
             if (route == null && !allowNull) {
                 D.assert(() => {
                     if (widget.onUnknownRoute == null) {
@@ -1673,7 +1672,7 @@ public Route<T> _routeNamed<T>(string name, object arguments, bool allowNull = f
 
                     return true;
                 });
-                route = widget.onUnknownRoute(settings) as Route<T>;
+                route = widget.onUnknownRoute(settings);
                 D.assert(() => {
                     if (route == null) {
                         throw new UIWidgetsError(
@@ -1811,7 +1810,7 @@ void _afterNavigation(Route route) {
 
 
 
-        public Future<T> pushReplacement<T, TO>(Route<T> newRoute, TO result) {
+        public Future<T> pushReplacement<T, TO>(Route newRoute, TO result) {
             D.assert(!_debugLocked);
             D.assert(() => {
                 _debugLocked = true;
@@ -1882,7 +1881,7 @@ public Future pushReplacement(Route newRoute, object result) {
         }
 
 
-        public Future<T> pushAndRemoveUntil<T>(Route<T> newRoute, RoutePredicate predicate) {
+        public Future<T> pushAndRemoveUntil<T>(Route newRoute, RoutePredicate predicate) {
             D.assert(!_debugLocked);
             D.assert(() => {
                 _debugLocked = true;

com.unity.uiwidgets/Runtime/widgets/routes.cs

@@ -640,7 +640,7 @@ protected virtual void setState(VoidCallback fn) {
             }
         }
 
-        public RoutePredicate withName(string name) {
+        public static RoutePredicate withName(string name) {
             return (Route route) => !route.willHandlePopInternally
                                     && route is ModalRoute
                                     && route.settings.name == name;