From 9b9ad3db174b87a21ec12a0d9ff35d6525a99bfa Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Sat, 12 Mar 2016 17:01:45 -0800 Subject: [PATCH] [rename fixit] RouteBuilder -> BuildContext Fixes #2353 --- dev/manual_tests/card_collection.dart | 4 +-- dev/manual_tests/drag_and_drop.dart | 4 +-- dev/manual_tests/mozart.dart | 2 +- dev/manual_tests/overlay_geometry.dart | 4 +-- dev/manual_tests/pageable_list.dart | 4 +-- dev/manual_tests/raw_keyboard.dart | 4 +-- examples/layers/widgets/gestures.dart | 4 +-- examples/layers/widgets/media_query.dart | 4 +-- examples/layers/widgets/sectors.dart | 4 +-- examples/layers/widgets/styled_text.dart | 4 +-- .../material_gallery/lib/gallery/app.dart | 2 +- examples/stocks/lib/main.dart | 6 ++-- packages/flutter/lib/src/material/app.dart | 8 ++---- packages/flutter/lib/src/widgets/app.dart | 10 ++----- .../widget/bottom_sheet_rebuild_test.dart | 4 +-- .../test/widget/bottom_sheet_test.dart | 10 +++---- .../flutter/test/widget/draggable_test.dart | 28 +++++++++---------- packages/flutter/test/widget/drawer_test.dart | 10 +++---- packages/flutter/test/widget/heroes_test.dart | 10 +++---- .../test/widget/modal_barrier_test.dart | 6 ++-- .../flutter/test/widget/navigator_test.dart | 6 ++-- .../test/widget/page_transitions_test.dart | 2 +- .../flutter/test/widget/snack_bar_test.dart | 12 ++++---- .../test/widget/two_level_list_test.dart | 2 +- packages/flutter_markdown/example/demo.dart | 4 +-- .../templates/create/lib/main.dart.tmpl | 4 +-- 26 files changed, 77 insertions(+), 85 deletions(-) diff --git a/dev/manual_tests/card_collection.dart b/dev/manual_tests/card_collection.dart index dd264e4ead..c384317a83 100644 --- a/dev/manual_tests/card_collection.dart +++ b/dev/manual_tests/card_collection.dart @@ -462,8 +462,8 @@ class CardCollectionState extends State { void main() { runApp(new MaterialApp( title: 'Cards', - routes: { - '/': (RouteArguments args) => new CardCollection(), + routes: { + '/': (BuildContext context) => new CardCollection(), } )); } diff --git a/dev/manual_tests/drag_and_drop.dart b/dev/manual_tests/drag_and_drop.dart index 435ce6bab9..58daccc841 100644 --- a/dev/manual_tests/drag_and_drop.dart +++ b/dev/manual_tests/drag_and_drop.dart @@ -283,8 +283,8 @@ class DragAndDropAppState extends State { void main() { runApp(new MaterialApp( title: 'Drag and Drop Flutter Demo', - routes: { - '/': (RouteArguments args) => new DragAndDropApp() + routes: { + '/': (BuildContext context) => new DragAndDropApp() } )); } diff --git a/dev/manual_tests/mozart.dart b/dev/manual_tests/mozart.dart index 4f6dd575dc..f8664f7eca 100644 --- a/dev/manual_tests/mozart.dart +++ b/dev/manual_tests/mozart.dart @@ -238,6 +238,6 @@ class _WindowManagerState extends State { void main() { runApp(new MaterialApp( title: 'Mozart', - routes: { '/': (_) => new WindowManager() } + routes: { '/': (_) => new WindowManager() } )); } diff --git a/dev/manual_tests/overlay_geometry.dart b/dev/manual_tests/overlay_geometry.dart index aec69e5711..f22472b8c2 100644 --- a/dev/manual_tests/overlay_geometry.dart +++ b/dev/manual_tests/overlay_geometry.dart @@ -179,8 +179,8 @@ void main() { accentColor: Colors.redAccent[200] ), title: 'Cards', - routes: { - '/': (RouteArguments args) => new OverlayGeometryApp() + routes: { + '/': (BuildContext context) => new OverlayGeometryApp() } )); } diff --git a/dev/manual_tests/pageable_list.dart b/dev/manual_tests/pageable_list.dart index 5a71c54d94..9dbf328d8e 100644 --- a/dev/manual_tests/pageable_list.dart +++ b/dev/manual_tests/pageable_list.dart @@ -142,8 +142,8 @@ void main() { primarySwatch: Colors.blue, accentColor: Colors.redAccent[200] ), - routes: { - '/': (RouteArguments args) => new PageableListApp(), + routes: { + '/': (BuildContext context) => new PageableListApp(), } )); } diff --git a/dev/manual_tests/raw_keyboard.dart b/dev/manual_tests/raw_keyboard.dart index 01c2c09bc8..ea82ce16ab 100644 --- a/dev/manual_tests/raw_keyboard.dart +++ b/dev/manual_tests/raw_keyboard.dart @@ -12,8 +12,8 @@ void main() { runApp( new MaterialApp( title: "Hardware Key Demo", - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( toolBar: new ToolBar( center: new Text("Hardware Key Demo") diff --git a/examples/layers/widgets/gestures.dart b/examples/layers/widgets/gestures.dart index de280959d6..afd6301972 100644 --- a/examples/layers/widgets/gestures.dart +++ b/examples/layers/widgets/gestures.dart @@ -214,8 +214,8 @@ class _GestureDemoState extends State { void main() { runApp(new MaterialApp( theme: new ThemeData.dark(), - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( toolBar: new ToolBar( center: new Text('Gestures Demo')), diff --git a/examples/layers/widgets/media_query.dart b/examples/layers/widgets/media_query.dart index b58b8a7777..9b4c9b4f0f 100644 --- a/examples/layers/widgets/media_query.dart +++ b/examples/layers/widgets/media_query.dart @@ -97,8 +97,8 @@ final List _kNames = _initNames(); void main() { runApp(new MaterialApp( title: 'Media Query Example', - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( toolBar: new ToolBar( center: new Text('Media Query Example') diff --git a/examples/layers/widgets/sectors.dart b/examples/layers/widgets/sectors.dart index 98005251ce..e368a4f56e 100644 --- a/examples/layers/widgets/sectors.dart +++ b/examples/layers/widgets/sectors.dart @@ -151,8 +151,8 @@ class SectorAppState extends State { return new MaterialApp( theme: new ThemeData.light(), title: 'Sector Layout', - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( toolBar: new ToolBar( center: new Text('Sector Layout in a Widget Tree') diff --git a/examples/layers/widgets/styled_text.dart b/examples/layers/widgets/styled_text.dart index af6ce892d8..93ac0eb075 100644 --- a/examples/layers/widgets/styled_text.dart +++ b/examples/layers/widgets/styled_text.dart @@ -118,8 +118,8 @@ class _StyledTextDemoState extends State { void main() { runApp(new MaterialApp( theme: new ThemeData.light(), - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( toolBar: new ToolBar( center: new Text('Hal and Dave')), diff --git a/examples/material_gallery/lib/gallery/app.dart b/examples/material_gallery/lib/gallery/app.dart index 39fe069ace..642c0ba981 100644 --- a/examples/material_gallery/lib/gallery/app.dart +++ b/examples/material_gallery/lib/gallery/app.dart @@ -28,7 +28,7 @@ class GalleryAppState extends State { title: 'Flutter Material Gallery', theme: lightTheme ? new ThemeData.light() : new ThemeData.dark(), routes: { - '/': (RouteArguments args) => new GalleryHome() + '/': (BuildContext context) => new GalleryHome() } ); } diff --git a/examples/stocks/lib/main.dart b/examples/stocks/lib/main.dart index d22b124f6d..663f63f27c 100644 --- a/examples/stocks/lib/main.dart +++ b/examples/stocks/lib/main.dart @@ -114,9 +114,9 @@ class StocksAppState extends State { debugShowMaterialGrid: _configuration.debugShowGrid, showPerformanceOverlay: _configuration.showPerformanceOverlay, showSemanticsDebugger: _configuration.showSemanticsDebugger, - routes: { - '/': (RouteArguments args) => new StockHome(_stocks, _symbols, _configuration, configurationUpdater), - '/settings': (RouteArguments args) => new StockSettings(_configuration, configurationUpdater) + routes: { + '/': (BuildContext context) => new StockHome(_stocks, _symbols, _configuration, configurationUpdater), + '/settings': (BuildContext context) => new StockSettings(_configuration, configurationUpdater) }, onGenerateRoute: _getRoute, onLocaleChanged: _onLocaleChanged diff --git a/packages/flutter/lib/src/material/app.dart b/packages/flutter/lib/src/material/app.dart index 1d2a48ca16..c5894e25c7 100644 --- a/packages/flutter/lib/src/material/app.dart +++ b/packages/flutter/lib/src/material/app.dart @@ -28,7 +28,7 @@ class MaterialApp extends WidgetsApp { Key key, String title, ThemeData theme, - Map routes: const {}, + Map routes: const {}, RouteFactory onGenerateRoute, LocaleChangedCallback onLocaleChanged, this.debugShowMaterialGrid: false, @@ -43,12 +43,10 @@ class MaterialApp extends WidgetsApp { color: theme?.primaryColor ?? Colors.blue[500], // blue[500] is the primary color of the default theme routes: routes, onGenerateRoute: (RouteSettings settings) { - RouteBuilder builder = routes[settings.name]; + WidgetBuilder builder = routes[settings.name]; if (builder != null) { return new MaterialPageRoute( - builder: (BuildContext context) { - return builder(new RouteArguments(context: context)); - }, + builder: builder, settings: settings ); } diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/widgets/app.dart index cfc719c79a..d1b91aa2a5 100644 --- a/packages/flutter/lib/src/widgets/app.dart +++ b/packages/flutter/lib/src/widgets/app.dart @@ -28,12 +28,6 @@ AssetBundle _initDefaultBundle() { final AssetBundle _defaultBundle = _initDefaultBundle(); -class RouteArguments { - const RouteArguments({ this.context }); - final BuildContext context; -} -typedef Widget RouteBuilder(RouteArguments args); - typedef Future LocaleChangedCallback(Locale locale); class WidgetsApp extends StatefulWidget { @@ -42,7 +36,7 @@ class WidgetsApp extends StatefulWidget { this.title, this.textStyle, this.color, - this.routes: const {}, + this.routes: const {}, this.onGenerateRoute, this.onLocaleChanged, this.showPerformanceOverlay: false, @@ -72,7 +66,7 @@ class WidgetsApp extends StatefulWidget { /// [Navigator] is given a named route, the name will be looked up /// in this table first. If the name is not available, then /// [onGenerateRoute] will be called instead. - final Map routes; + final Map routes; /// The route generator callback used when the app is navigated to a /// named route but the name is not in the [routes] table. diff --git a/packages/flutter/test/widget/bottom_sheet_rebuild_test.dart b/packages/flutter/test/widget/bottom_sheet_rebuild_test.dart index 21ce1d85cb..568d528cf1 100644 --- a/packages/flutter/test/widget/bottom_sheet_rebuild_test.dart +++ b/packages/flutter/test/widget/bottom_sheet_rebuild_test.dart @@ -14,8 +14,8 @@ void main() { int buildCount = 0; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( key: scaffoldKey, body: new Center(child: new Text('body')) diff --git a/packages/flutter/test/widget/bottom_sheet_test.dart b/packages/flutter/test/widget/bottom_sheet_test.dart index 1f04bf318b..848f0c5613 100644 --- a/packages/flutter/test/widget/bottom_sheet_test.dart +++ b/packages/flutter/test/widget/bottom_sheet_test.dart @@ -14,9 +14,9 @@ void main() { bool showBottomSheetThenCalled = false; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { - context = args.context; + routes: { + '/': (BuildContext ctx) { + context = ctx; return new Container(); } } @@ -66,8 +66,8 @@ void main() { bool showBottomSheetThenCalled = false; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( key: scaffoldKey, body: new Center(child: new Text('body')) diff --git a/packages/flutter/test/widget/draggable_test.dart b/packages/flutter/test/widget/draggable_test.dart index cd417d607f..b297c9a519 100644 --- a/packages/flutter/test/widget/draggable_test.dart +++ b/packages/flutter/test/widget/draggable_test.dart @@ -12,8 +12,8 @@ void main() { List accepted = []; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { return new Column( + routes: { + '/': (BuildContext context) { return new Column( children: [ new Draggable( data: 1, @@ -75,8 +75,8 @@ void main() { Point firstLocation, secondLocation; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { return new Column( + routes: { + '/': (BuildContext context) { return new Column( children: [ new Draggable( data: 1, @@ -173,8 +173,8 @@ void main() { Point firstLocation, secondLocation; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { return new Column( + routes: { + '/': (BuildContext context) { return new Column( children: [ new Draggable( data: 1, @@ -234,8 +234,8 @@ void main() { Point firstLocation, secondLocation; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { return new Column( + routes: { + '/': (BuildContext context) { return new Column( children: [ new LongPressDraggable( data: 1, @@ -285,8 +285,8 @@ void main() { Point firstLocation, secondLocation; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { return new Column( + routes: { + '/': (BuildContext context) { return new Column( children: [ new Draggable( data: 1, @@ -337,8 +337,8 @@ void main() { Point firstLocation, secondLocation, thirdLocation; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Block( children: [ new DragTarget( @@ -448,8 +448,8 @@ void main() { Point firstLocation, secondLocation, thirdLocation; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Block( scrollDirection: Axis.horizontal, children: [ diff --git a/packages/flutter/test/widget/drawer_test.dart b/packages/flutter/test/widget/drawer_test.dart index 91e9a6fa0f..3f8f5ad887 100644 --- a/packages/flutter/test/widget/drawer_test.dart +++ b/packages/flutter/test/widget/drawer_test.dart @@ -15,9 +15,9 @@ void main() { BuildContext context; tester.pumpWidget( new MaterialApp( - routes: { - '/': (RouteArguments args) { - context = args.context; + routes: { + '/': (BuildContext ctx) { + context = ctx; return new Scaffold( key: scaffoldKey, drawer: new Text('drawer'), @@ -48,8 +48,8 @@ void main() { tester.pumpWidget(new Container()); // throw away the old App and its Navigator tester.pumpWidget( new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( key: scaffoldKey, drawer: new Text('drawer'), diff --git a/packages/flutter/test/widget/heroes_test.dart b/packages/flutter/test/widget/heroes_test.dart index 37718933e1..646d8c6ffe 100644 --- a/packages/flutter/test/widget/heroes_test.dart +++ b/packages/flutter/test/widget/heroes_test.dart @@ -12,21 +12,21 @@ Key firstKey = new Key('first'); Key secondKey = new Key('second'); Key thirdKey = new Key('third'); -final Map routes = { - '/': (RouteArguments args) => new Material( +final Map routes = { + '/': (BuildContext context) => new Material( child: new Block(children: [ new Container(height: 100.0, width: 100.0), new Card(child: new Hero(tag: 'a', child: new Container(height: 100.0, width: 100.0, key: firstKey))), new Container(height: 100.0, width: 100.0), - new FlatButton(child: new Text('two'), onPressed: () => Navigator.pushNamed(args.context, '/two')), + new FlatButton(child: new Text('two'), onPressed: () => Navigator.pushNamed(context, '/two')), ]) ), - '/two': (RouteArguments args) => new Material( + '/two': (BuildContext context) => new Material( child: new Block(children: [ new Container(height: 150.0, width: 150.0), new Card(child: new Hero(tag: 'a', child: new Container(height: 150.0, width: 150.0, key: secondKey))), new Container(height: 150.0, width: 150.0), - new FlatButton(child: new Text('three'), onPressed: () => Navigator.push(args.context, new ThreeRoute())), + new FlatButton(child: new Text('three'), onPressed: () => Navigator.push(context, new ThreeRoute())), ]) ), }; diff --git a/packages/flutter/test/widget/modal_barrier_test.dart b/packages/flutter/test/widget/modal_barrier_test.dart index de87cb4999..c7b6d19a69 100644 --- a/packages/flutter/test/widget/modal_barrier_test.dart +++ b/packages/flutter/test/widget/modal_barrier_test.dart @@ -61,9 +61,9 @@ void main() { test('ModalBarrier pops the Navigator when dismissed', () { testWidgets((WidgetTester tester) { - final Map routes = { - '/': (RouteArguments args) => new FirstWidget(), - '/modal': (RouteArguments args) => new SecondWidget(), + final Map routes = { + '/': (BuildContext context) => new FirstWidget(), + '/modal': (BuildContext context) => new SecondWidget(), }; tester.pumpWidget(new MaterialApp(routes: routes)); diff --git a/packages/flutter/test/widget/navigator_test.dart b/packages/flutter/test/widget/navigator_test.dart index 9dce4cb708..221d4d9232 100644 --- a/packages/flutter/test/widget/navigator_test.dart +++ b/packages/flutter/test/widget/navigator_test.dart @@ -66,9 +66,9 @@ class ThirdWidget extends StatelessWidget { void main() { test('Can navigator navigate to and from a stateful widget', () { testWidgets((WidgetTester tester) { - final Map routes = { - '/': (RouteArguments args) => new FirstWidget(), - '/second': (RouteArguments args) => new SecondWidget(), + final Map routes = { + '/': (BuildContext context) => new FirstWidget(), + '/second': (BuildContext context) => new SecondWidget(), }; tester.pumpWidget(new MaterialApp(routes: routes)); diff --git a/packages/flutter/test/widget/page_transitions_test.dart b/packages/flutter/test/widget/page_transitions_test.dart index 8480dff5d8..e3756c0e1c 100644 --- a/packages/flutter/test/widget/page_transitions_test.dart +++ b/packages/flutter/test/widget/page_transitions_test.dart @@ -18,7 +18,7 @@ void main() { testWidgets((WidgetTester tester) { GlobalKey containerKey1 = new GlobalKey(); GlobalKey containerKey2 = new GlobalKey(); - final Map routes = { + final Map routes = { '/': (_) => new Container(key: containerKey1, child: new Text('Home')), '/settings': (_) => new Container(key: containerKey2, child: new Text('Settings')), }; diff --git a/packages/flutter/test/widget/snack_bar_test.dart b/packages/flutter/test/widget/snack_bar_test.dart index eedafef629..11526448d8 100644 --- a/packages/flutter/test/widget/snack_bar_test.dart +++ b/packages/flutter/test/widget/snack_bar_test.dart @@ -12,8 +12,8 @@ void main() { String helloSnackBar = 'Hello SnackBar'; Key tapTarget = new Key('tap-target'); tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( body: new Builder( builder: (BuildContext context) { @@ -63,8 +63,8 @@ void main() { int snackBarCount = 0; Key tapTarget = new Key('tap-target'); tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( body: new Builder( builder: (BuildContext context) { @@ -146,8 +146,8 @@ void main() { int time; ScaffoldFeatureController lastController; tester.pumpWidget(new MaterialApp( - routes: { - '/': (RouteArguments args) { + routes: { + '/': (BuildContext context) { return new Scaffold( body: new Builder( builder: (BuildContext context) { diff --git a/packages/flutter/test/widget/two_level_list_test.dart b/packages/flutter/test/widget/two_level_list_test.dart index 20fed40994..4478290699 100644 --- a/packages/flutter/test/widget/two_level_list_test.dart +++ b/packages/flutter/test/widget/two_level_list_test.dart @@ -13,7 +13,7 @@ void main() { final Key sublistKey = new UniqueKey(); final Key bottomKey = new UniqueKey(); - final Map routes = { + final Map routes = { '/': (_) { return new Material( child: new Viewport( diff --git a/packages/flutter_markdown/example/demo.dart b/packages/flutter_markdown/example/demo.dart index 64eb2ac899..f83b7f1cd8 100644 --- a/packages/flutter_markdown/example/demo.dart +++ b/packages/flutter_markdown/example/demo.dart @@ -29,8 +29,8 @@ Enjoy! void main() { runApp(new MaterialApp( title: "Markdown Demo", - routes: { - '/': (RouteArguments args) => new Scaffold( + routes: { + '/': (BuildContext context) => new Scaffold( toolBar: new ToolBar(center: new Text("Markdown Demo")), body: new Markdown(data: _kMarkdownData) ) diff --git a/packages/flutter_tools/templates/create/lib/main.dart.tmpl b/packages/flutter_tools/templates/create/lib/main.dart.tmpl index c996477e36..a5479f93b2 100644 --- a/packages/flutter_tools/templates/create/lib/main.dart.tmpl +++ b/packages/flutter_tools/templates/create/lib/main.dart.tmpl @@ -12,8 +12,8 @@ void main() { runApp( new MaterialApp( title: 'Flutter Demo', - routes: { - '/': (RouteArguments args) => new FlutterDemo() + routes: { + '/': (BuildContext context) => new FlutterDemo() } ) );