From c38b843460ef88090eceffe5ede898e8a65d1fb0 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 10 Oct 2017 09:05:20 -0700 Subject: [PATCH] Move -referencing asserts to constructor body. (#12478) --- packages/flutter/lib/src/cupertino/route.dart | 5 +++-- packages/flutter/lib/src/material/page.dart | 5 +++-- packages/flutter/lib/src/widgets/pages.dart | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart index 46355adae0..a2a9b3a067 100644 --- a/packages/flutter/lib/src/cupertino/route.dart +++ b/packages/flutter/lib/src/cupertino/route.dart @@ -88,8 +88,9 @@ class CupertinoPageRoute extends PageRoute { assert(settings != null), assert(maintainState != null), assert(fullscreenDialog != null), - assert(opaque), // PageRoute makes it return true. - super(settings: settings, fullscreenDialog: fullscreenDialog); + super(settings: settings, fullscreenDialog: fullscreenDialog) { + assert(opaque); // PageRoute makes it return true. + } /// Builds the primary contents of the route. final WidgetBuilder builder; diff --git a/packages/flutter/lib/src/material/page.dart b/packages/flutter/lib/src/material/page.dart index 967277d2f7..a400175c4d 100644 --- a/packages/flutter/lib/src/material/page.dart +++ b/packages/flutter/lib/src/material/page.dart @@ -70,8 +70,9 @@ class MaterialPageRoute extends PageRoute { this.maintainState: true, bool fullscreenDialog: false, }) : assert(builder != null), - assert(opaque), - super(settings: settings, fullscreenDialog: fullscreenDialog); + super(settings: settings, fullscreenDialog: fullscreenDialog) { + assert(opaque); + } /// Builds the primary contents of the route. final WidgetBuilder builder; diff --git a/packages/flutter/lib/src/widgets/pages.dart b/packages/flutter/lib/src/widgets/pages.dart index 69238379dc..026d6d0351 100644 --- a/packages/flutter/lib/src/widgets/pages.dart +++ b/packages/flutter/lib/src/widgets/pages.dart @@ -81,10 +81,11 @@ class PageRouteBuilder extends PageRoute { this.maintainState: true, }) : assert(pageBuilder != null), assert(transitionsBuilder != null), - assert(opaque != null), assert(barrierDismissible != null), assert(maintainState != null), - super(settings: settings); + super(settings: settings) { + assert(opaque != null); + } /// Used build the route's primary contents. ///