diff --git a/packages/flutter/lib/src/cupertino/app.dart b/packages/flutter/lib/src/cupertino/app.dart index b4b71769984..47656d12297 100644 --- a/packages/flutter/lib/src/cupertino/app.dart +++ b/packages/flutter/lib/src/cupertino/app.dart @@ -274,10 +274,8 @@ class _CupertinoAppState extends State { key: GlobalObjectKey(this), navigatorKey: widget.navigatorKey, navigatorObservers: _navigatorObservers, - // TODO(dnfield): when https://github.com/dart-lang/sdk/issues/34572 is resolved - // this can use type arguments again - pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) => - CupertinoPageRoute(settings: settings, builder: builder), + pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) => + CupertinoPageRoute(settings: settings, builder: builder), home: widget.home, routes: widget.routes, initialRoute: widget.initialRoute, diff --git a/packages/flutter/lib/src/material/app.dart b/packages/flutter/lib/src/material/app.dart index 3f32330ae71..156bcab4887 100644 --- a/packages/flutter/lib/src/material/app.dart +++ b/packages/flutter/lib/src/material/app.dart @@ -411,10 +411,8 @@ class _MaterialAppState extends State { key: GlobalObjectKey(this), navigatorKey: widget.navigatorKey, navigatorObservers: _navigatorObservers, - // TODO(dnfield): when https://github.com/dart-lang/sdk/issues/34572 is resolved - // this can use type arguments again - pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) => - MaterialPageRoute(settings: settings, builder: builder), + pageRouteBuilder: (RouteSettings settings, WidgetBuilder builder) => + MaterialPageRoute(settings: settings, builder: builder), home: widget.home, routes: widget.routes, initialRoute: widget.initialRoute, diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart index 90735ca02e3..13e6f43c9b9 100644 --- a/packages/flutter/lib/src/widgets/app.dart +++ b/packages/flutter/lib/src/widgets/app.dart @@ -83,9 +83,7 @@ typedef GenerateAppTitle = String Function(BuildContext context); /// The signature of [WidgetsApp.pageRouteBuilder]. /// /// Creates a [PageRoute] using the given [RouteSettings] and [WidgetBuilder]. -// TODO(dnfield): when https://github.com/dart-lang/sdk/issues/34572 is resolved -// this can use type arguments again -typedef PageRouteFactory = PageRoute Function(RouteSettings settings, WidgetBuilder builder); +typedef PageRouteFactory = PageRoute Function(RouteSettings settings, WidgetBuilder builder); /// A convenience class that wraps a number of widgets that are commonly /// required for an application. @@ -754,7 +752,7 @@ class _WidgetsAppState extends State implements WidgetsBindingObserv assert(widget.pageRouteBuilder != null, 'The default onGenerateRoute handler for WidgetsApp must have a ' 'pageRouteBuilder set if the home or routes properties are set.'); - final Route route = widget.pageRouteBuilder( + final Route route = widget.pageRouteBuilder( settings, pageContentBuilder, );