firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a named argument for Widget children

Browse Source 
Previously we used a positional argument for widgets that had multiple
children. Now we use a named argument that defaults to an empty list.

Fixes #241
This commit is contained in:
Adam Barth 2016-01-11 13:08:47 -08:00
parent 26db7a2d95
commit 056766414c
69 changed files with 1444 additions and 1143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/address_book/lib/main.dart
View File

@ -17,7 +17,8 @@ class Field extends StatelessComponent {
final String placeholder; final String placeholder;
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Row(<Widget>[ return new Row(
children: <Widget>[
new Padding( new Padding(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Icon(icon: icon) child: new Icon(icon: icon)

4
examples/fitness/lib/feed.dart
View File

@ -35,7 +35,7 @@ class DialogMenuItem extends StatelessComponent {
onTap: onPressed, onTap: onPressed,
child: new Padding( child: new Padding(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Row(children) child: new Row(children: children)
) )
) )
); );
@ -163,7 +163,7 @@ class FeedFragmentState extends State<FeedFragment> {
return new Container(); return new Container();
if (config.userData.items.length == 0) { if (config.userData.items.length == 0) {
return new Row( return new Row(
<Widget>[new Text("No data yet.\nAdd some!", style: style)], children: <Widget>[new Text("No data yet.\nAdd some!", style: style)],
justifyContent: FlexJustifyContent.center justifyContent: FlexJustifyContent.center
); );
} }

2
examples/fitness/lib/meal.dart
View File

@ -35,7 +35,7 @@ class MealRow extends FitnessItemRow {
) )
]; ];
return new Row( return new Row(
children, children: children,
alignItems: FlexAlignItems.baseline, alignItems: FlexAlignItems.baseline,
textBaseline: DefaultTextStyle.of(context).textBaseline textBaseline: DefaultTextStyle.of(context).textBaseline
); );

16
examples/fitness/lib/measurement.dart
View File

@ -47,7 +47,7 @@ class MeasurementRow extends FitnessItemRow {
) )
]; ];
return new Row( return new Row(
children, children: children,
alignItems: FlexAlignItems.baseline, alignItems: FlexAlignItems.baseline,
textBaseline: DefaultTextStyle.of(context).textBaseline textBaseline: DefaultTextStyle.of(context).textBaseline
); );
@ -124,15 +124,19 @@ class MeasurementFragmentState extends State<MeasurementFragment> {
// TODO(jackson): Revisit the layout of this pane to be more maintainable // TODO(jackson): Revisit the layout of this pane to be more maintainable
return new Container( return new Container(
padding: const EdgeDims.all(20.0), padding: const EdgeDims.all(20.0),
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new GestureDetector( new GestureDetector(
onTap: _handleDatePressed, onTap: _handleDatePressed,
child: new Container( child: new Container(
height: 50.0, height: 50.0,
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Text('Measurement Date'), new Text('Measurement Date'),
new Text(measurement.displayDate, style: Theme.of(context).text.caption), new Text(measurement.displayDate, style: Theme.of(context).text.caption),
], alignItems: FlexAlignItems.start) ],
alignItems: FlexAlignItems.start
)
) )
), ),
new Input( new Input(
@ -141,7 +145,9 @@ class MeasurementFragmentState extends State<MeasurementFragment> {
keyboardType: KeyboardType.NUMBER, keyboardType: KeyboardType.NUMBER,
onChanged: _handleWeightChanged onChanged: _handleWeightChanged
), ),
], alignItems: FlexAlignItems.stretch) ],
alignItems: FlexAlignItems.stretch
)
); );
} }

9
examples/fitness/lib/settings.dart
View File

@ -89,14 +89,17 @@ class SettingsFragmentState extends State<SettingsFragment> {
return new Block(<Widget>[ return new Block(<Widget>[
new DrawerItem( new DrawerItem(
onPressed: () { _handleBackupChanged(!(config.userData.backupMode == BackupMode.enabled)); }, onPressed: () { _handleBackupChanged(!(config.userData.backupMode == BackupMode.enabled)); },
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Back up data to the cloud')), new Flexible(child: new Text('Back up data to the cloud')),
new Switch(value: config.userData.backupMode == BackupMode.enabled, onChanged: _handleBackupChanged), new Switch(value: config.userData.backupMode == BackupMode.enabled, onChanged: _handleBackupChanged),
]) ]
)
), ),
new DrawerItem( new DrawerItem(
onPressed: () => _handleGoalWeightPressed(), onPressed: () => _handleGoalWeightPressed(),
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Text('Goal Weight'), new Text('Goal Weight'),
new Text(goalWeightText, style: Theme.of(context).text.caption), new Text(goalWeightText, style: Theme.of(context).text.caption),
], ],

7
examples/material_gallery/lib/demo/date_picker_demo.dart
View File

@ -31,13 +31,16 @@ class _DatePickerDemoState extends State<DatePickerDemo> {
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Column([ return new Column(
children: <Widget>[
new Text(new DateFormat.yMMMd().format(_selectedDate)), new Text(new DateFormat.yMMMd().format(_selectedDate)),
new RaisedButton( new RaisedButton(
onPressed: _handleSelectDate, onPressed: _handleSelectDate,
child: new Text('SELECT DATE') child: new Text('SELECT DATE')
), ),
], justifyContent: FlexJustifyContent.center); ],
justifyContent: FlexJustifyContent.center
);
} }
} }

14
examples/material_gallery/lib/demo/page_selector_demo.dart
View File

@ -65,22 +65,25 @@ class TabViewDemo extends StatelessComponent {
values: _iconNames, values: _iconNames,
child: new Builder( child: new Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return new Column([ return new Column(
children: <Widget>[
new Container( new Container(
margin: const EdgeDims.only(top: 16.0), margin: const EdgeDims.only(top: 16.0),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new IconButton( new IconButton(
icon: "navigation/arrow_back", icon: "navigation/arrow_back",
onPressed: () { _handleArrowButtonPress(context, -1); } onPressed: () { _handleArrowButtonPress(context, -1); }
), ),
new Row( new Row(
_iconNames.map((String name) => _buildTabIndicator(context, name)).toList(), children: _iconNames.map((String name) => _buildTabIndicator(context, name)).toList(),
justifyContent: FlexJustifyContent.collapse justifyContent: FlexJustifyContent.collapse
), ),
new IconButton( new IconButton(
icon: "navigation/arrow_forward", icon: "navigation/arrow_forward",
onPressed: () { _handleArrowButtonPress(context, 1); } onPressed: () { _handleArrowButtonPress(context, 1); }
)], )
],
justifyContent: FlexJustifyContent.spaceBetween justifyContent: FlexJustifyContent.spaceBetween
) )
), ),
@ -89,7 +92,8 @@ class TabViewDemo extends StatelessComponent {
children: _iconNames.map(_buildTabView).toList() children: _iconNames.map(_buildTabView).toList()
) )
) )
]); ]
);
} }
) )
); );

35
examples/material_gallery/lib/demo/selection_controls_demo.dart
View File

@ -34,28 +34,43 @@ class _SelectionControlsDemoState extends State<SelectionControlsDemo> {
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Column(<Widget>[ return new Column(
new Row(<Widget>[ children: <Widget>[
new Row(
children: <Widget>[
new Checkbox(value: _checkboxValue, onChanged: _setCheckboxValue), new Checkbox(value: _checkboxValue, onChanged: _setCheckboxValue),
new Checkbox(value: false), // Disabled new Checkbox(value: false), // Disabled
new Checkbox(value: true), // Disabled new Checkbox(value: true), // Disabled
], justifyContent: FlexJustifyContent.spaceAround), ],
new Row(<int>[0, 1, 2].map((int i) { justifyContent: FlexJustifyContent.spaceAround
),
new Row(
children: <int>[0, 1, 2].map((int i) {
return new Radio<int>( return new Radio<int>(
value: i, value: i,
groupValue: _radioValue, groupValue: _radioValue,
onChanged: _setRadioValue onChanged: _setRadioValue
); );
}).toList(), justifyContent: FlexJustifyContent.spaceAround), }).toList(),
new Row(<int>[0, 1].map((int i) { justifyContent: FlexJustifyContent.spaceAround
),
new Row(
children: <int>[0, 1].map((int i) {
return new Radio<int>(value: i, groupValue: 0); // Disabled return new Radio<int>(value: i, groupValue: 0); // Disabled
}).toList(), justifyContent: FlexJustifyContent.spaceAround), }).toList(),
new Row(<Widget>[ justifyContent: FlexJustifyContent.spaceAround
),
new Row(
children: <Widget>[
new Switch(value: _switchValue, onChanged: _setSwitchValue), new Switch(value: _switchValue, onChanged: _setSwitchValue),
new Switch(value: false), // Disabled new Switch(value: false), // Disabled
new Switch(value: true), // Disabled new Switch(value: true), // Disabled
], justifyContent: FlexJustifyContent.spaceAround), ],
], justifyContent: FlexJustifyContent.spaceAround); justifyContent: FlexJustifyContent.spaceAround
),
],
justifyContent: FlexJustifyContent.spaceAround
);
} }
} }

14
examples/material_gallery/lib/demo/slider_demo.dart
View File

@ -18,7 +18,8 @@ class _SliderDemoState extends State<SliderDemo> {
new Container( new Container(
height: 100.0, height: 100.0,
child: new Center( child: new Center(
child: new Row([ child: new Row(
children: <Widget>[
new Slider( new Slider(
value: _value, value: _value,
min: 0.0, min: 0.0,
@ -33,20 +34,25 @@ class _SliderDemoState extends State<SliderDemo> {
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Text(_value.round().toString().padLeft(3, '0')) child: new Text(_value.round().toString().padLeft(3, '0'))
), ),
], justifyContent: FlexJustifyContent.collapse) ],
justifyContent: FlexJustifyContent.collapse
)
) )
), ),
new Container( new Container(
height: 100.0, height: 100.0,
child: new Center( child: new Center(
child: new Row([ child: new Row(
children: <Widget>[
// Disabled, but tracking the slider above. // Disabled, but tracking the slider above.
new Slider(value: _value / 100.0), new Slider(value: _value / 100.0),
new Container( new Container(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Text((_value / 100.0).toStringAsFixed(2)) child: new Text((_value / 100.0).toStringAsFixed(2))
), ),
], justifyContent: FlexJustifyContent.collapse) ],
justifyContent: FlexJustifyContent.collapse
)
) )
) )

7
examples/material_gallery/lib/demo/time_picker_demo.dart
View File

@ -28,13 +28,16 @@ class _TimePickerDemoState extends State<TimePickerDemo> {
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Column([ return new Column(
children: <Widget>[
new Text('$_selectedTime'), new Text('$_selectedTime'),
new RaisedButton( new RaisedButton(
onPressed: _handleSelectTime, onPressed: _handleSelectTime,
child: new Text('SELECT TIME') child: new Text('SELECT TIME')
), ),
], justifyContent: FlexJustifyContent.center); ],
justifyContent: FlexJustifyContent.center
);
} }
} }

6
examples/material_gallery/lib/gallery_page.dart
View File

@ -33,7 +33,8 @@ class _GalleryPageState extends State<GalleryPage> {
// TODO(eseidel): We should make this into a shared DrawerFooter. // TODO(eseidel): We should make this into a shared DrawerFooter.
items.add(new DrawerDivider()); items.add(new DrawerDivider());
items.add(new DrawerItem(child: new Flex([ items.add(new DrawerItem(child: new Flex(
children: <Widget>[
new Text("Made with Flutter "), new Text("Made with Flutter "),
new Container( new Container(
margin: const EdgeDims.symmetric(horizontal: 5.0), margin: const EdgeDims.symmetric(horizontal: 5.0),
@ -43,7 +44,8 @@ class _GalleryPageState extends State<GalleryPage> {
fit: ImageFit.contain fit: ImageFit.contain
) )
) )
]))); ]
)));
return new Drawer(child: new Block(items)); return new Drawer(child: new Block(items));
} }

4
examples/mine_digger/lib/main.dart
View File

@ -139,7 +139,7 @@ class MineDiggerState extends State<MineDigger> {
} }
flexRows.add( flexRows.add(
new Row( new Row(
row, children: row,
justifyContent: FlexJustifyContent.center, justifyContent: FlexJustifyContent.center,
key: new ValueKey<int>(iy) key: new ValueKey<int>(iy)
) )
@ -157,7 +157,7 @@ class MineDiggerState extends State<MineDigger> {
padding: new EdgeDims.all(10.0), padding: new EdgeDims.all(10.0),
margin: new EdgeDims.all(10.0), margin: new EdgeDims.all(10.0),
decoration: new BoxDecoration(backgroundColor: const Color(0xFF6B6B6B)), decoration: new BoxDecoration(backgroundColor: const Color(0xFF6B6B6B)),
child: new Column(flexRows) child: new Column(children: flexRows)
); );
} }

18
examples/stocks/lib/stock_home.dart
View File

@ -114,18 +114,22 @@ class StockHomeState extends State<StockHome> {
new DrawerItem( new DrawerItem(
icon: 'action/thumb_up', icon: 'action/thumb_up',
onPressed: () => _handleStockModeChange(StockMode.optimistic), onPressed: () => _handleStockModeChange(StockMode.optimistic),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Optimistic')), new Flexible(child: new Text('Optimistic')),
new Radio<StockMode>(value: StockMode.optimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange) new Radio<StockMode>(value: StockMode.optimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange)
]) ]
)
), ),
new DrawerItem( new DrawerItem(
icon: 'action/thumb_down', icon: 'action/thumb_down',
onPressed: () => _handleStockModeChange(StockMode.pessimistic), onPressed: () => _handleStockModeChange(StockMode.pessimistic),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Pessimistic')), new Flexible(child: new Text('Pessimistic')),
new Radio<StockMode>(value: StockMode.pessimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange) new Radio<StockMode>(value: StockMode.pessimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange)
]) ]
)
), ),
new DrawerDivider(), new DrawerDivider(),
new DrawerItem( new DrawerItem(
@ -241,12 +245,14 @@ class StockHomeState extends State<StockHome> {
// TODO(ianh): Fill this out. // TODO(ianh): Fill this out.
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return new Column([ return new Column(
children: <Widget>[
new Input( new Input(
key: companyNameKey, key: companyNameKey,
placeholder: 'Company Name' placeholder: 'Company Name'
), ),
]); ]
);
} }
); );
} }

9
examples/stocks/lib/stock_menu.dart
View File

@ -19,7 +19,8 @@ Future showStockMenu({BuildContext context, bool autorefresh, ValueChanged<bool>
items: <PopupMenuItem>[ items: <PopupMenuItem>[
new PopupMenuItem( new PopupMenuItem(
value: _MenuItems.autorefresh, value: _MenuItems.autorefresh,
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Autorefresh')), new Flexible(child: new Text('Autorefresh')),
new StatefulBuilder( new StatefulBuilder(
builder: (BuildContext context, StateSetter setState) { builder: (BuildContext context, StateSetter setState) {
@ -75,7 +76,8 @@ Future showStockMenu({BuildContext context, bool autorefresh, ValueChanged<bool>
content: new Text('This feature has not yet been implemented.'), content: new Text('This feature has not yet been implemented.'),
actions: <Widget>[ actions: <Widget>[
new FlatButton( new FlatButton(
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Icon( new Icon(
icon: 'device/dvr', icon: 'device/dvr',
size: IconSize.s18 size: IconSize.s18
@ -84,7 +86,8 @@ Future showStockMenu({BuildContext context, bool autorefresh, ValueChanged<bool>
width: 8.0 width: 8.0
), ),
new Text('DUMP APP TO CONSOLE'), new Text('DUMP APP TO CONSOLE'),
]), ]
),
onPressed: () { debugDumpApp(); } onPressed: () { debugDumpApp(); }
), ),
new FlatButton( new FlatButton(

6
examples/stocks/lib/stock_row.dart
View File

@ -67,7 +67,8 @@ class StockRow extends StatelessComponent {
bottom: new BorderSide(color: Theme.of(context).dividerColor) bottom: new BorderSide(color: Theme.of(context).dividerColor)
) )
), ),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Container( new Container(
margin: const EdgeDims.only(right: 5.0), margin: const EdgeDims.only(right: 5.0),
child: new Hero( child: new Hero(
@ -77,7 +78,8 @@ class StockRow extends StatelessComponent {
) )
), ),
new Flexible( new Flexible(
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible( new Flexible(
flex: 2, flex: 2,
child: new Text( child: new Text(

30
examples/stocks/lib/stock_settings.dart
View File

@ -82,35 +82,41 @@ class StockSettingsState extends State<StockSettings> {
new DrawerItem( new DrawerItem(
icon: 'action/thumb_up', icon: 'action/thumb_up',
onPressed: () => _confirmOptimismChange(), onPressed: () => _confirmOptimismChange(),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Everything is awesome')), new Flexible(child: new Text('Everything is awesome')),
new Checkbox( new Checkbox(
value: config.configuration.stockMode == StockMode.optimistic, value: config.configuration.stockMode == StockMode.optimistic,
onChanged: (bool value) => _confirmOptimismChange() onChanged: (bool value) => _confirmOptimismChange()
), ),
]) ]
)
), ),
new DrawerItem( new DrawerItem(
icon: 'action/backup', icon: 'action/backup',
onPressed: () { _handleBackupChanged(!(config.configuration.backupMode == BackupMode.enabled)); }, onPressed: () { _handleBackupChanged(!(config.configuration.backupMode == BackupMode.enabled)); },
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Back up stock list to the cloud')), new Flexible(child: new Text('Back up stock list to the cloud')),
new Switch( new Switch(
value: config.configuration.backupMode == BackupMode.enabled, value: config.configuration.backupMode == BackupMode.enabled,
onChanged: _handleBackupChanged onChanged: _handleBackupChanged
), ),
]) ]
)
), ),
new DrawerItem( new DrawerItem(
icon: 'action/picture_in_picture', icon: 'action/picture_in_picture',
onPressed: () { _handleShowPerformanceOverlayChanged(!config.configuration.showPerformanceOverlay); }, onPressed: () { _handleShowPerformanceOverlayChanged(!config.configuration.showPerformanceOverlay); },
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Show rendering performance overlay')), new Flexible(child: new Text('Show rendering performance overlay')),
new Switch( new Switch(
value: config.configuration.showPerformanceOverlay, value: config.configuration.showPerformanceOverlay,
onChanged: _handleShowPerformanceOverlayChanged onChanged: _handleShowPerformanceOverlayChanged
), ),
]) ]
)
), ),
]; ];
assert(() { assert(() {
@ -119,24 +125,28 @@ class StockSettingsState extends State<StockSettings> {
new DrawerItem( new DrawerItem(
icon: 'editor/border_clear', icon: 'editor/border_clear',
onPressed: () { _handleShowGridChanged(!config.configuration.debugShowGrid); }, onPressed: () { _handleShowGridChanged(!config.configuration.debugShowGrid); },
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Show material grid (for debugging)')), new Flexible(child: new Text('Show material grid (for debugging)')),
new Switch( new Switch(
value: config.configuration.debugShowGrid, value: config.configuration.debugShowGrid,
onChanged: _handleShowGridChanged onChanged: _handleShowGridChanged
), ),
]) ]
)
), ),
new DrawerItem( new DrawerItem(
icon: 'editor/border_all', icon: 'editor/border_all',
onPressed: () { _handleShowSizesChanged(!config.configuration.debugShowSizes); }, onPressed: () { _handleShowSizesChanged(!config.configuration.debugShowSizes); },
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Show construction lines (for debugging)')), new Flexible(child: new Text('Show construction lines (for debugging)')),
new Switch( new Switch(
value: config.configuration.debugShowSizes, value: config.configuration.debugShowSizes,
onChanged: _handleShowSizesChanged onChanged: _handleShowSizesChanged
), ),
]) ]
)
) )
]); ]);
return true; return true;

6
examples/stocks/lib/stock_symbol_viewer.dart
View File

@ -18,8 +18,10 @@ class StockSymbolView extends StatelessComponent {
TextStyle headings = Theme.of(context).text.body2; TextStyle headings = Theme.of(context).text.body2;
return new Container( return new Container(
padding: new EdgeDims.all(20.0), padding: new EdgeDims.all(20.0),
child: new Column(<Widget>[ child: new Column(
new Row(<Widget>[ children: <Widget>[
new Row(
children: <Widget>[
new Text( new Text(
'${stock.symbol}', '${stock.symbol}',
style: Theme.of(context).text.display2 style: Theme.of(context).text.display2

48
examples/widgets/card_collection.dart
View File

@ -209,13 +209,15 @@ class CardCollectionState extends State<CardCollection> {
Widget buildDrawerCheckbox(String label, bool value, void callback(), { bool enabled: true }) { Widget buildDrawerCheckbox(String label, bool value, void callback(), { bool enabled: true }) {
return new DrawerItem( return new DrawerItem(
onPressed: enabled ? callback : null, onPressed: enabled ? callback : null,
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text(label)), new Flexible(child: new Text(label)),
new Checkbox( new Checkbox(
value: value, value: value,
onChanged: enabled ? (_) { callback(); } : null onChanged: enabled ? (_) { callback(); } : null
) )
]) ]
)
); );
} }
@ -223,14 +225,16 @@ class CardCollectionState extends State<CardCollection> {
return new DrawerItem( return new DrawerItem(
icon: icon, icon: icon,
onPressed: enabled ? () { onChanged(itemValue); } : null, onPressed: enabled ? () { onChanged(itemValue); } : null,
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text(label)), new Flexible(child: new Text(label)),
new Radio<Map<int, Color>>( new Radio<Map<int, Color>>(
value: itemValue, value: itemValue,
groupValue: currentValue, groupValue: currentValue,
onChanged: enabled ? onChanged : null onChanged: enabled ? onChanged : null
) )
]) ]
)
); );
} }
@ -238,14 +242,16 @@ class CardCollectionState extends State<CardCollection> {
return new DrawerItem( return new DrawerItem(
icon: icon, icon: icon,
onPressed: enabled ? () { onChanged(itemValue); } : null, onPressed: enabled ? () { onChanged(itemValue); } : null,
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text(label)), new Flexible(child: new Text(label)),
new Radio<DismissDirection>( new Radio<DismissDirection>(
value: itemValue, value: itemValue,
groupValue: currentValue, groupValue: currentValue,
onChanged: enabled ? onChanged : null onChanged: enabled ? onChanged : null
) )
]) ]
)
); );
} }
@ -253,14 +259,16 @@ class CardCollectionState extends State<CardCollection> {
return new DrawerItem( return new DrawerItem(
icon: icon, icon: icon,
onPressed: enabled ? () { onChanged(itemValue); } : null, onPressed: enabled ? () { onChanged(itemValue); } : null,
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text(label)), new Flexible(child: new Text(label)),
new Radio<TextStyle>( new Radio<TextStyle>(
value: itemValue, value: itemValue,
groupValue: currentValue, groupValue: currentValue,
onChanged: enabled ? onChanged : null onChanged: enabled ? onChanged : null
) )
]) ]
)
); );
} }
@ -307,7 +315,8 @@ class CardCollectionState extends State<CardCollection> {
style: DefaultTextStyle.of(context).merge(cardLabelStyle).merge(_textStyle).copyWith( style: DefaultTextStyle.of(context).merge(cardLabelStyle).merge(_textStyle).copyWith(
fontSize: _varyFontSizes ? _cardModels.length.toDouble() : null fontSize: _varyFontSizes ? _cardModels.length.toDouble() : null
), ),
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Text(cardModel.label) new Text(cardModel.label)
], ],
alignItems: FlexAlignItems.stretch, alignItems: FlexAlignItems.stretch,
@ -357,11 +366,13 @@ class CardCollectionState extends State<CardCollection> {
child: new Container( child: new Container(
height: cardModel.height, height: cardModel.height,
decoration: new BoxDecoration(backgroundColor: Theme.of(context).primaryColor), decoration: new BoxDecoration(backgroundColor: Theme.of(context).primaryColor),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
leftArrowIcon, leftArrowIcon,
new Flexible(child: new Text(backgroundMessage, style: backgroundTextStyle)), new Flexible(child: new Text(backgroundMessage, style: backgroundTextStyle)),
rightArrowIcon rightArrowIcon
]) ]
)
) )
) )
) )
@ -370,7 +381,7 @@ class CardCollectionState extends State<CardCollection> {
return new IconTheme( return new IconTheme(
key: cardModel.key, key: cardModel.key,
data: const IconThemeData(color: IconThemeColor.white), data: const IconThemeData(color: IconThemeColor.white),
child: new Stack(<Widget>[background, card]) child: new Stack(children: <Widget>[background, card])
); );
} }
@ -409,11 +420,14 @@ class CardCollectionState extends State<CardCollection> {
); );
} }
if (_sunshine) if (_sunshine) {
cardCollection = new Stack(<Widget>[ cardCollection = new Stack(
new Column(<Widget>[new NetworkImage(src: _sunshineURL)]), children: <Widget>[
new Column(children: <Widget>[new NetworkImage(src: _sunshineURL)]),
new ShaderMask(child: cardCollection, shaderCallback: _createShader) new ShaderMask(child: cardCollection, shaderCallback: _createShader)
]); ]
);
}
Widget body = new SizeObserver( Widget body = new SizeObserver(
onSizeChanged: _updateCardCollectionSize, onSizeChanged: _updateCardCollectionSize,
@ -434,7 +448,7 @@ class CardCollectionState extends State<CardCollection> {
) )
) )
); );
body = new Stack(<Widget>[body, indicator]); body = new Stack(children: <Widget>[body, indicator]);
} }
return new Theme( return new Theme(

9
examples/widgets/container.dart
View File

@ -6,7 +6,8 @@ import 'package:flutter/material.dart';
class ContainerApp extends StatelessComponent { class ContainerApp extends StatelessComponent {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return new Column(<Widget>[ return new Column(
children: <Widget>[
new Container( new Container(
padding: new EdgeDims.all(10.0), padding: new EdgeDims.all(10.0),
margin: new EdgeDims.all(10.0), margin: new EdgeDims.all(10.0),
@ -20,7 +21,8 @@ class ContainerApp extends StatelessComponent {
new Container( new Container(
decoration: new BoxDecoration(backgroundColor: const Color(0xFFFFFF00)), decoration: new BoxDecoration(backgroundColor: const Color(0xFFFFFF00)),
padding: new EdgeDims.symmetric(horizontal: 50.0, vertical: 75.0), padding: new EdgeDims.symmetric(horizontal: 50.0, vertical: 75.0),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new RaisedButton( new RaisedButton(
child: new Text('PRESS ME'), child: new Text('PRESS ME'),
onPressed: () => print("Hello World") onPressed: () => print("Hello World")
@ -28,7 +30,8 @@ class ContainerApp extends StatelessComponent {
new RaisedButton( new RaisedButton(
child: new Text('DISABLED') child: new Text('DISABLED')
) )
]) ]
)
), ),
new Flexible( new Flexible(
child: new Container( child: new Container(

17
examples/widgets/drag_and_drop.dart
View File

@ -135,8 +135,10 @@ class DragAndDropApp extends StatelessComponent {
toolBar: new ToolBar( toolBar: new ToolBar(
center: new Text('Drag and Drop Flutter Demo') center: new Text('Drag and Drop Flutter Demo')
), ),
body: new Column(<Widget>[ body: new Column(
new Flexible(child: new Row(<Widget>[ children: <Widget>[
new Flexible(child: new Row(
children: <Widget>[
new ExampleDragSource( new ExampleDragSource(
color: const Color(0xFFFFF000), color: const Color(0xFFFFF000),
under: true, under: true,
@ -159,13 +161,18 @@ class DragAndDropApp extends StatelessComponent {
alignItems: FlexAlignItems.center, alignItems: FlexAlignItems.center,
justifyContent: FlexJustifyContent.spaceAround justifyContent: FlexJustifyContent.spaceAround
)), )),
new Flexible(child: new Row(<Widget>[ new Flexible(
child: new Row(
children: <Widget>[
new Flexible(child: new ExampleDragTarget()), new Flexible(child: new ExampleDragTarget()),
new Flexible(child: new ExampleDragTarget()), new Flexible(child: new ExampleDragTarget()),
new Flexible(child: new ExampleDragTarget()), new Flexible(child: new ExampleDragTarget()),
new Flexible(child: new ExampleDragTarget()), new Flexible(child: new ExampleDragTarget()),
])), ]
]) )
),
]
)
); );
} }
} }

33
examples/widgets/gestures.dart
View File

@ -138,7 +138,8 @@ class ScaleAppState extends State<ScaleApp> {
child: new Scaffold( child: new Scaffold(
toolBar: new ToolBar( toolBar: new ToolBar(
center: new Text('Gestures Demo')), center: new Text('Gestures Demo')),
body: new Stack([ body: new Stack(
children: <Widget>[
new GestureDetector( new GestureDetector(
onScaleStart: _scaleEnabled ? _handleScaleStart : null, onScaleStart: _scaleEnabled ? _handleScaleStart : null,
onScaleUpdate: _scaleEnabled ? _handleScaleUpdate : null, onScaleUpdate: _scaleEnabled ? _handleScaleUpdate : null,
@ -164,42 +165,52 @@ class ScaleAppState extends State<ScaleApp> {
child: new Card( child: new Card(
child: new Container( child: new Container(
padding: new EdgeDims.all(4.0), padding: new EdgeDims.all(4.0),
child: new Column([ child: new Column(
new Row([ children: <Widget>[
new Row(
children: <Widget>[
new Checkbox( new Checkbox(
value: _scaleEnabled, value: _scaleEnabled,
onChanged: (bool value) { setState(() { _scaleEnabled = value; }); } onChanged: (bool value) { setState(() { _scaleEnabled = value; }); }
), ),
new Text('Scale'), new Text('Scale'),
]), ]
new Row([ ),
new Row(
children: <Widget>[
new Checkbox( new Checkbox(
value: _tapEnabled, value: _tapEnabled,
onChanged: (bool value) { setState(() { _tapEnabled = value; }); } onChanged: (bool value) { setState(() { _tapEnabled = value; }); }
), ),
new Text('Tap'), new Text('Tap'),
]), ]
new Row([ ),
new Row(
children: <Widget>[
new Checkbox( new Checkbox(
value: _doubleTapEnabled, value: _doubleTapEnabled,
onChanged: (bool value) { setState(() { _doubleTapEnabled = value; }); } onChanged: (bool value) { setState(() { _doubleTapEnabled = value; }); }
), ),
new Text('Double Tap'), new Text('Double Tap'),
]), ]
new Row([ ),
new Row(
children: <Widget>[
new Checkbox( new Checkbox(
value: _longPressEnabled, value: _longPressEnabled,
onChanged: (bool value) { setState(() { _longPressEnabled = value; }); } onChanged: (bool value) { setState(() { _longPressEnabled = value; }); }
), ),
new Text('Long Press'), new Text('Long Press'),
]), ]
),
], ],
alignItems: FlexAlignItems.start alignItems: FlexAlignItems.start
) )
) )
) )
), ),
]) ]
)
) )
); );
} }

19
examples/widgets/hero_under.dart
View File

@ -59,7 +59,8 @@ class HeroDemo extends StatelessComponent {
child: new GestureDetector( child: new GestureDetector(
onTap: () => Navigator.push(context, new CrabRoute()), onTap: () => Navigator.push(context, new CrabRoute()),
child: new Card( child: new Card(
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new HeroImage( new HeroImage(
size: const Size(100.0, 100.0) size: const Size(100.0, 100.0)
), ),
@ -72,7 +73,8 @@ class HeroDemo extends StatelessComponent {
) )
) )
) )
]) ]
)
) )
) )
) )
@ -94,7 +96,8 @@ class CrabPage extends StatelessComponent {
color: const Color(0x00000000), color: const Color(0x00000000),
child: new Block( child: new Block(
<Widget>[ <Widget>[
new Stack(<Widget>[ new Stack(
children: <Widget>[
new HeroImage( new HeroImage(
size: new Size(ui.window.size.width, ui.window.size.width) size: new Size(ui.window.size.width, ui.window.size.width)
), ),
@ -114,14 +117,18 @@ class CrabPage extends StatelessComponent {
left: 10.0, left: 10.0,
child: new Text("Low Crab Diet", style: titleStyle) child: new Text("Low Crab Diet", style: titleStyle)
) )
]), ]
),
new Material( new Material(
child: new Container( child: new Container(
padding: const EdgeDims.all(10.0), padding: const EdgeDims.all(10.0),
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Text(kText, style: Theme.of(context).text.body1), new Text(kText, style: Theme.of(context).text.body1),
new Container(height: 800.0), new Container(height: 800.0),
], alignItems: FlexAlignItems.start) ],
alignItems: FlexAlignItems.start
)
) )
) )
] ]

2
examples/widgets/indexed_stack.dart
View File

@ -30,7 +30,7 @@ class IndexedStackDemoState extends State<IndexedStackDemo> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<PopupMenuItem> items = _buildMenu(); List<PopupMenuItem> items = _buildMenu();
IndexedStack indexedStack = new IndexedStack(items, index: _itemIndex, alignment: const FractionalOffset(0.5, 0.0)); IndexedStack indexedStack = new IndexedStack(children: items, index: _itemIndex, alignment: const FractionalOffset(0.5, 0.0));
return new Scaffold( return new Scaffold(
toolBar: new ToolBar(center: new Text('IndexedStackDemo Demo')), toolBar: new ToolBar(center: new Text('IndexedStackDemo Demo')),

6
examples/widgets/media_query.dart
View File

@ -17,7 +17,7 @@ class AdaptiveItem {
Widget toListItem() { Widget toListItem() {
return new Row( return new Row(
<Widget>[ children: <Widget>[
new Container( new Container(
width: 32.0, width: 32.0,
height: 32.0, height: 32.0,
@ -34,7 +34,7 @@ class AdaptiveItem {
Widget toCard() { Widget toCard() {
return new Card( return new Card(
child: new Column( child: new Column(
<Widget>[ children: <Widget>[
new Flexible( new Flexible(
child: new Container( child: new Container(
decoration: new BoxDecoration( decoration: new BoxDecoration(
@ -45,7 +45,7 @@ class AdaptiveItem {
new Container( new Container(
margin: const EdgeDims.only(left: 8.0), margin: const EdgeDims.only(left: 8.0),
child: new Row( child: new Row(
<Widget>[ children: <Widget>[
new Flexible( new Flexible(
child: new Text(name) child: new Text(name)
), ),

2
examples/widgets/overlay_geometry.dart
View File

@ -169,7 +169,7 @@ class OverlayGeometryAppState extends State<OverlayGeometryApp> {
]; ];
for (MarkerType type in markers.keys) for (MarkerType type in markers.keys)
layers.add(new Marker(type: type, position: markers[type])); layers.add(new Marker(type: type, position: markers[type]));
return new Stack(layers); return new Stack(children: layers);
} }
} }

6
examples/widgets/pageable_list.dart
View File

@ -95,10 +95,12 @@ class PageableListAppState extends State<PageableListApp> {
), ),
new DrawerItem( new DrawerItem(
onPressed: toggleItemsWrap, onPressed: toggleItemsWrap,
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Flexible(child: new Text('Scrolling wraps around')), new Flexible(child: new Text('Scrolling wraps around')),
new Checkbox(value: itemsWrap) new Checkbox(value: itemsWrap)
]) ]
)
) )
]) ])
); );

2
examples/widgets/piano.dart
View File

@ -88,7 +88,7 @@ class PianoApp extends StatelessComponent {
) )
)); ));
} }
return new Column(children); return new Column(children: children);
} }
} }

2
examples/widgets/progress_indicator.dart
View File

@ -70,7 +70,7 @@ class ProgressIndicatorAppState extends State<ProgressIndicatorApp> {
new Text("${(valueAnimation.value * 100.0).toStringAsFixed(1)}%" + (valueAnimation.isAnimating ? '' : ' (paused)')) new Text("${(valueAnimation.value * 100.0).toStringAsFixed(1)}%" + (valueAnimation.isAnimating ? '' : ' (paused)'))
]; ];
return new Column( return new Column(
indicators children: indicators
.map((Widget c) => new Container(child: c, margin: const EdgeDims.symmetric(vertical: 15.0, horizontal: 20.0))) .map((Widget c) => new Container(child: c, margin: const EdgeDims.symmetric(vertical: 15.0, horizontal: 20.0)))
.toList(), .toList(),
justifyContent: FlexJustifyContent.center justifyContent: FlexJustifyContent.center

7
examples/widgets/raw_keyboard.dart
View File

@ -53,7 +53,8 @@ class HardwareKeyDemoState extends State<HardwareKeyDemo> implements mojo.RawKey
child: new Text("Press a key", style: Typography.black.display1) child: new Text("Press a key", style: Typography.black.display1)
); );
} }
return new Column([ return new Column(
children: <Widget>[
new Text( new Text(
'${_event.type}', '${_event.type}',
style: Typography.black.body2 style: Typography.black.body2
@ -62,7 +63,9 @@ class HardwareKeyDemoState extends State<HardwareKeyDemo> implements mojo.RawKey
'${_event.keyData.keyCode}', '${_event.keyData.keyCode}',
style: Typography.black.display4 style: Typography.black.display4
) )
], justifyContent: FlexJustifyContent.center); ],
justifyContent: FlexJustifyContent.center
);
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {

18
examples/widgets/sector.dart
View File

@ -68,33 +68,39 @@ class SectorAppState extends State<SectorApp> {
} }
Widget buildBody() { Widget buildBody() {
return new Column(<Widget>[ return new Column(
children: <Widget>[
new Container( new Container(
padding: new EdgeDims.symmetric(horizontal: 8.0, vertical: 25.0), padding: new EdgeDims.symmetric(horizontal: 8.0, vertical: 25.0),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new RaisedButton( new RaisedButton(
child: new IntrinsicWidth( child: new IntrinsicWidth(
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Container( new Container(
padding: new EdgeDims.all(4.0), padding: new EdgeDims.all(4.0),
margin: new EdgeDims.only(right: 10.0), margin: new EdgeDims.only(right: 10.0),
child: new WidgetToRenderBoxAdapter(sectorAddIcon) child: new WidgetToRenderBoxAdapter(sectorAddIcon)
), ),
new Text('ADD SECTOR'), new Text('ADD SECTOR'),
]) ]
)
), ),
onPressed: _enabledAdd ? addSector : null onPressed: _enabledAdd ? addSector : null
), ),
new RaisedButton( new RaisedButton(
child: new IntrinsicWidth( child: new IntrinsicWidth(
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new Container( new Container(
padding: new EdgeDims.all(4.0), padding: new EdgeDims.all(4.0),
margin: new EdgeDims.only(right: 10.0), margin: new EdgeDims.only(right: 10.0),
child: new WidgetToRenderBoxAdapter(sectorRemoveIcon) child: new WidgetToRenderBoxAdapter(sectorRemoveIcon)
), ),
new Text('REMOVE SECTOR'), new Text('REMOVE SECTOR'),
]) ]
)
), ),
onPressed: _enabledRemove ? removeSector : null onPressed: _enabledRemove ? removeSector : null
) )

9
examples/widgets/spinning_mixed.dart
View File

@ -37,15 +37,18 @@ void attachWidgetTreeToRenderTree(RenderProxyBox container) {
container: container, container: container,
child: new Container( child: new Container(
height: 300.0, height: 300.0,
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Rectangle(const Color(0xFF00FFFF)), new Rectangle(const Color(0xFF00FFFF)),
new Container( new Container(
padding: new EdgeDims.all(10.0), padding: new EdgeDims.all(10.0),
margin: new EdgeDims.all(10.0), margin: new EdgeDims.all(10.0),
decoration: new BoxDecoration(backgroundColor: const Color(0xFFCCCCCC)), decoration: new BoxDecoration(backgroundColor: const Color(0xFFCCCCCC)),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new RaisedButton( new RaisedButton(
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new NetworkImage(src: "http://flutter.io/favicon.ico"), new NetworkImage(src: "http://flutter.io/favicon.ico"),
new Text('PRESS ME'), new Text('PRESS ME'),
] ]

3
examples/widgets/styled_text.dart
View File

@ -89,7 +89,8 @@ HAL: This mission is too important for me to allow you to jeopardize it.''';
Widget body = new Container( Widget body = new Container(
padding: new EdgeDims.symmetric(horizontal: 8.0), padding: new EdgeDims.symmetric(horizontal: 8.0),
child: new Column(children, child: new Column(
children: children,
justifyContent: FlexJustifyContent.center, justifyContent: FlexJustifyContent.center,
alignItems: FlexAlignItems.start alignItems: FlexAlignItems.start
) )

5
packages/flutter/lib/src/material/chip.dart
View File

@ -79,7 +79,10 @@ class Chip extends StatelessComponent {
backgroundColor: Colors.grey[300], backgroundColor: Colors.grey[300],
borderRadius: 16.0 borderRadius: 16.0
), ),
child: new Row(children, justifyContent: FlexJustifyContent.collapse) child: new Row(
children: children,
justifyContent: FlexJustifyContent.collapse
)
); );
} }
} }

19
packages/flutter/lib/src/material/date_picker.dart
View File

@ -89,13 +89,16 @@ class _DatePickerState extends State<DatePicker> {
); );
break; break;
} }
return new Column(<Widget>[ return new Column(
children: <Widget>[
header, header,
new Container( new Container(
height: _calendarHeight, height: _calendarHeight,
child: picker child: picker
) )
], alignItems: FlexAlignItems.stretch); ],
alignItems: FlexAlignItems.stretch
);
} }
} }
@ -138,7 +141,8 @@ class _DatePickerHeader extends StatelessComponent {
return new Container( return new Container(
padding: new EdgeDims.all(10.0), padding: new EdgeDims.all(10.0),
decoration: new BoxDecoration(backgroundColor: theme.primaryColor), decoration: new BoxDecoration(backgroundColor: theme.primaryColor),
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new GestureDetector( new GestureDetector(
onTap: () => _handleChangeMode(_DatePickerMode.day), onTap: () => _handleChangeMode(_DatePickerMode.day),
child: new Text(new DateFormat("MMM").format(selectedDate).toUpperCase(), style: monthStyle) child: new Text(new DateFormat("MMM").format(selectedDate).toUpperCase(), style: monthStyle)
@ -151,7 +155,8 @@ class _DatePickerHeader extends StatelessComponent {
onTap: () => _handleChangeMode(_DatePickerMode.year), onTap: () => _handleChangeMode(_DatePickerMode.year),
child: new Text(new DateFormat("yyyy").format(selectedDate), style: yearStyle) child: new Text(new DateFormat("yyyy").format(selectedDate), style: yearStyle)
) )
]) ]
)
); );
} }
} }
@ -190,7 +195,7 @@ class DayPicker extends StatelessComponent {
List<Widget> rows = <Widget>[ List<Widget> rows = <Widget>[
new Text(new DateFormat("MMMM y").format(displayedMonth), style: monthStyle), new Text(new DateFormat("MMMM y").format(displayedMonth), style: monthStyle),
new Flex( new Flex(
headers, children: headers,
justifyContent: FlexJustifyContent.spaceAround justifyContent: FlexJustifyContent.spaceAround
) )
]; ];
@ -255,11 +260,11 @@ class DayPicker extends StatelessComponent {
for (int w = 0; w < weeksShown; w++) { for (int w = 0; w < weeksShown; w++) {
int startIndex = w * days.length; int startIndex = w * days.length;
rows.add(new Row( rows.add(new Row(
labels.sublist(startIndex, startIndex + days.length) children: labels.sublist(startIndex, startIndex + days.length)
)); ));
} }
return new Column(rows); return new Column(children: rows);
} }
} }

3
packages/flutter/lib/src/material/dialog.dart
View File

@ -89,7 +89,8 @@ class Dialog extends StatelessComponent {
dialogBody.add(new ButtonTheme( dialogBody.add(new ButtonTheme(
color: ButtonColor.accent, color: ButtonColor.accent,
child: new Container( child: new Container(
child: new Row(actions, child: new Row(
children: actions,
justifyContent: FlexJustifyContent.end justifyContent: FlexJustifyContent.end
) )
) )

6
packages/flutter/lib/src/material/drawer.dart
View File

@ -173,7 +173,8 @@ class DrawerControllerState extends State<DrawerController> {
onHorizontalDragUpdate: _move, onHorizontalDragUpdate: _move,
onHorizontalDragEnd: _settle, onHorizontalDragEnd: _settle,
child: new RepaintBoundary( child: new RepaintBoundary(
child: new Stack(<Widget>[ child: new Stack(
children: <Widget>[
new GestureDetector( new GestureDetector(
onTap: close, onTap: close,
child: new DecoratedBox( child: new DecoratedBox(
@ -202,7 +203,8 @@ class DrawerControllerState extends State<DrawerController> {
) )
) )
) )
]) ]
)
) )
); );
} }

6
packages/flutter/lib/src/material/drawer_header.dart
View File

@ -31,7 +31,8 @@ class DrawerHeader extends StatelessComponent {
), ),
padding: const EdgeDims.only(bottom: 7.0), padding: const EdgeDims.only(bottom: 7.0),
margin: const EdgeDims.only(bottom: 8.0), margin: const EdgeDims.only(bottom: 8.0),
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Flexible(child: new Container()), new Flexible(child: new Container()),
new Container( new Container(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
@ -39,7 +40,8 @@ class DrawerHeader extends StatelessComponent {
style: Theme.of(context).text.body2, style: Theme.of(context).text.body2,
child: child child: child
) )
)] )
]
) )
); );
} }

8
packages/flutter/lib/src/material/drawer_item.dart
View File

@ -46,9 +46,9 @@ class DrawerItem extends StatelessComponent {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ThemeData themeData = Theme.of(context); ThemeData themeData = Theme.of(context);
List<Widget> flexChildren = new List<Widget>(); List<Widget> children = <Widget>[];
if (icon != null) { if (icon != null) {
flexChildren.add( children.add(
new Padding( new Padding(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Icon( child: new Icon(
@ -58,7 +58,7 @@ class DrawerItem extends StatelessComponent {
) )
); );
} }
flexChildren.add( children.add(
new Flexible( new Flexible(
child: new Padding( child: new Padding(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
@ -74,7 +74,7 @@ class DrawerItem extends StatelessComponent {
height: 48.0, height: 48.0,
child: new InkWell( child: new InkWell(
onTap: onPressed, onTap: onPressed,
child: new Row(flexChildren) child: new Row(children: children)
) )
); );
} }

5
packages/flutter/lib/src/material/dropdown.dart
View File

@ -289,9 +289,10 @@ class _DropDownButtonState<T> extends State<DropDownButton<T>> {
onTap: _handleTap, onTap: _handleTap,
child: new Container( child: new Container(
decoration: new BoxDecoration(border: _kDropDownUnderline), decoration: new BoxDecoration(border: _kDropDownUnderline),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new IndexedStack( new IndexedStack(
config.items, children: config.items,
key: indexedStackKey, key: indexedStackKey,
index: _selectedIndex, index: _selectedIndex,
alignment: const FractionalOffset(0.5, 0.0) alignment: const FractionalOffset(0.5, 0.0)

2
packages/flutter/lib/src/material/input.dart
View File

@ -134,7 +134,7 @@ class InputState extends ScrollableState<Input> {
child: new SizeObserver( child: new SizeObserver(
onSizeChanged: _handleContainerSizeChanged, onSizeChanged: _handleContainerSizeChanged,
child: new Container( child: new Container(
child: new Stack(textChildren), child: new Stack(children: textChildren),
margin: config.isDense ? margin: config.isDense ?
const EdgeDims.symmetric(vertical: 4.0) : const EdgeDims.symmetric(vertical: 4.0) :
const EdgeDims.symmetric(vertical: 8.0), const EdgeDims.symmetric(vertical: 8.0),

2
packages/flutter/lib/src/material/list_item.dart
View File

@ -51,7 +51,7 @@ class ListItem extends StatelessComponent {
onLongPress: onLongPress, onLongPress: onLongPress,
child: new Padding( child: new Padding(
padding: const EdgeDims.symmetric(horizontal: 16.0), padding: const EdgeDims.symmetric(horizontal: 16.0),
child: new Row(children) child: new Row(children: children)
) )
); );
} }

6
packages/flutter/lib/src/material/material_app.dart
View File

@ -175,10 +175,12 @@ class _MaterialAppState extends State<MaterialApp> implements BindingObserver {
return true; return true;
}); });
if (config.showPerformanceOverlay) { if (config.showPerformanceOverlay) {
result = new Stack([ result = new Stack(
children: <Widget>[
result, result,
new Positioned(bottom: 0.0, left: 0.0, right: 0.0, child: new PerformanceOverlay.allEnabled()), new Positioned(bottom: 0.0, left: 0.0, right: 0.0, child: new PerformanceOverlay.allEnabled()),
]); ]
);
} }
return result; return result;
} }

4
packages/flutter/lib/src/material/scaffold.dart
View File

@ -314,7 +314,7 @@ class ScaffoldState extends State<Scaffold> {
if (_currentBottomSheet != null) if (_currentBottomSheet != null)
bottomSheets.add(_currentBottomSheet._widget); bottomSheets.add(_currentBottomSheet._widget);
Widget stack = new Stack( Widget stack = new Stack(
bottomSheets, children: bottomSheets,
alignment: const FractionalOffset(0.5, 1.0) // bottom-aligned, centered alignment: const FractionalOffset(0.5, 1.0) // bottom-aligned, centered
); );
_addIfNonNull(children, stack, _Child.bottomSheet); _addIfNonNull(children, stack, _Child.bottomSheet);
@ -335,7 +335,7 @@ class ScaffoldState extends State<Scaffold> {
)); ));
} }
return new CustomMultiChildLayout(children, delegate: new _ScaffoldLayout()); return new CustomMultiChildLayout(children: children, delegate: new _ScaffoldLayout());
} }
} }

2
packages/flutter/lib/src/material/snack_bar.dart
View File

@ -103,7 +103,7 @@ class SnackBar extends StatelessComponent {
performance: performance, performance: performance,
opacity: new AnimatedValue<double>(0.0, end: 1.0, curve: _snackBarFadeCurve), opacity: new AnimatedValue<double>(0.0, end: 1.0, curve: _snackBarFadeCurve),
child: new Row( child: new Row(
children, children: children,
alignItems: FlexAlignItems.center alignItems: FlexAlignItems.center
) )
) )

2
packages/flutter/lib/src/material/tabs.dart
View File

@ -331,7 +331,7 @@ class _Tab extends StatelessComponent {
labelContent = _buildLabelIcon(); labelContent = _buildLabelIcon();
} else { } else {
labelContent = new Column( labelContent = new Column(
<Widget>[ children: <Widget>[
new Container( new Container(
child: _buildLabelIcon(), child: _buildLabelIcon(),
margin: const EdgeDims.only(bottom: 10.0) margin: const EdgeDims.only(bottom: 10.0)

21
packages/flutter/lib/src/material/time_picker.dart
View File

@ -123,7 +123,8 @@ class _TimePickerState extends State<TimePicker> {
onModeChanged: _handleModeChanged, onModeChanged: _handleModeChanged,
onChanged: config.onChanged onChanged: config.onChanged
); );
return new Column(<Widget>[ return new Column(
children: <Widget>[
header, header,
new AspectRatio( new AspectRatio(
aspectRatio: 1.0, aspectRatio: 1.0,
@ -136,7 +137,9 @@ class _TimePickerState extends State<TimePicker> {
) )
) )
) )
], alignItems: FlexAlignItems.stretch); ],
alignItems: FlexAlignItems.stretch
);
} }
} }
@ -199,7 +202,8 @@ class _TimePickerHeader extends StatelessComponent {
return new Container( return new Container(
padding: kDialogHeadingPadding, padding: kDialogHeadingPadding,
decoration: new BoxDecoration(backgroundColor: theme.primaryColor), decoration: new BoxDecoration(backgroundColor: theme.primaryColor),
child: new Row(<Widget>[ child: new Row(
children: <Widget>[
new GestureDetector( new GestureDetector(
onTap: () => _handleChangeMode(_TimePickerMode.hour), onTap: () => _handleChangeMode(_TimePickerMode.hour),
child: new Text(selectedTime.hourOfPeriodLabel, style: hourStyle) child: new Text(selectedTime.hourOfPeriodLabel, style: hourStyle)
@ -214,16 +218,21 @@ class _TimePickerHeader extends StatelessComponent {
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
child: new Container( child: new Container(
padding: const EdgeDims.only(left: 16.0, right: 24.0), padding: const EdgeDims.only(left: 16.0, right: 24.0),
child: new Column([ child: new Column(
children: <Widget>[
new Text('AM', style: amStyle), new Text('AM', style: amStyle),
new Container( new Container(
padding: const EdgeDims.only(top: 4.0), padding: const EdgeDims.only(top: 4.0),
child: new Text('PM', style: pmStyle) child: new Text('PM', style: pmStyle)
), ),
], justifyContent: FlexJustifyContent.end) ],
justifyContent: FlexJustifyContent.end
) )
) )
], justifyContent: FlexJustifyContent.end) )
],
justifyContent: FlexJustifyContent.end
)
); );
} }
} }

4
packages/flutter/lib/src/material/tool_bar.dart
View File

@ -95,7 +95,7 @@ class ToolBar extends StatelessComponent {
height: kToolBarHeight, height: kToolBarHeight,
child: new DefaultTextStyle( child: new DefaultTextStyle(
style: sideStyle, style: sideStyle,
child: new Row(firstRow) child: new Row(children: firstRow)
) )
) )
]; ];
@ -123,7 +123,7 @@ class ToolBar extends StatelessComponent {
child: new Container( child: new Container(
padding: combinedPadding, padding: combinedPadding,
child: new Column( child: new Column(
rows, children: rows,
justifyContent: FlexJustifyContent.collapse justifyContent: FlexJustifyContent.collapse
) )
) )

53
packages/flutter/lib/src/widgets/basic.dart
View File

@ -464,6 +464,8 @@ class LayoutId extends ParentDataWidget<CustomMultiChildLayout> {
} }
} }
const List<Widget> _emptyWidgetList = const <Widget>[];
/// Defers the layout of multiple children to a delegate. /// Defers the layout of multiple children to a delegate.
/// ///
/// The delegate can determine the layout constraints for each child and can /// The delegate can determine the layout constraints for each child and can
@ -471,8 +473,9 @@ class LayoutId extends ParentDataWidget<CustomMultiChildLayout> {
/// size of the parent, but the size of the parent cannot depend on the sizes of /// size of the parent, but the size of the parent cannot depend on the sizes of
/// the children. /// the children.
class CustomMultiChildLayout extends MultiChildRenderObjectWidget { class CustomMultiChildLayout extends MultiChildRenderObjectWidget {
CustomMultiChildLayout(List<Widget> children, { CustomMultiChildLayout({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.delegate this.delegate
}) : super(key: key, children: children) { }) : super(key: key, children: children) {
assert(delegate != null); assert(delegate != null);
@ -927,8 +930,9 @@ class Container extends StatelessComponent {
/// ///
/// For details about the block layout algorithm, see [RenderBlockBase]. /// For details about the block layout algorithm, see [RenderBlockBase].
class BlockBody extends MultiChildRenderObjectWidget { class BlockBody extends MultiChildRenderObjectWidget {
BlockBody(List<Widget> children, { BlockBody({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.direction: Axis.vertical this.direction: Axis.vertical
}) : super(key: key, children: children) { }) : super(key: key, children: children) {
assert(direction != null); assert(direction != null);
@ -946,7 +950,7 @@ class BlockBody extends MultiChildRenderObjectWidget {
abstract class StackRenderObjectWidgetBase extends MultiChildRenderObjectWidget { abstract class StackRenderObjectWidgetBase extends MultiChildRenderObjectWidget {
StackRenderObjectWidgetBase({ StackRenderObjectWidgetBase({
List<Widget> children, List<Widget> children: _emptyWidgetList,
Key key Key key
}) : super(key: key, children: children); }) : super(key: key, children: children);
} }
@ -956,8 +960,9 @@ abstract class StackRenderObjectWidgetBase extends MultiChildRenderObjectWidget
/// For details about the stack layout algorithm, see [RenderStack]. To control /// For details about the stack layout algorithm, see [RenderStack]. To control
/// the position of child widgets, see the [Positioned] widget. /// the position of child widgets, see the [Positioned] widget.
class Stack extends StackRenderObjectWidgetBase { class Stack extends StackRenderObjectWidgetBase {
Stack(List<Widget> children, { Stack({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.alignment: const FractionalOffset(0.0, 0.0) this.alignment: const FractionalOffset(0.0, 0.0)
}) : super(key: key, children: children); }) : super(key: key, children: children);
@ -973,8 +978,9 @@ class Stack extends StackRenderObjectWidgetBase {
/// A [Stack] that shows a single child at once. /// A [Stack] that shows a single child at once.
class IndexedStack extends StackRenderObjectWidgetBase { class IndexedStack extends StackRenderObjectWidgetBase {
IndexedStack(List<Widget> children, { IndexedStack({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.alignment: const FractionalOffset(0.0, 0.0), this.alignment: const FractionalOffset(0.0, 0.0),
this.index: 0 this.index: 0
}) : super(key: key, children: children) { }) : super(key: key, children: children) {
@ -1113,7 +1119,7 @@ class Positioned extends ParentDataWidget<StackRenderObjectWidgetBase> {
abstract class GridRenderObjectWidgetBase extends MultiChildRenderObjectWidget { abstract class GridRenderObjectWidgetBase extends MultiChildRenderObjectWidget {
GridRenderObjectWidgetBase({ GridRenderObjectWidgetBase({
List<Widget> children, List<Widget> children: _emptyWidgetList,
Key key Key key
}) : super(key: key, children: children) { }) : super(key: key, children: children) {
_delegate = createDelegate(); _delegate = createDelegate();
@ -1135,7 +1141,7 @@ abstract class GridRenderObjectWidgetBase extends MultiChildRenderObjectWidget {
/// ///
/// For details about the grid layout algorithm, see [RenderGrid]. /// For details about the grid layout algorithm, see [RenderGrid].
class CustomGrid extends GridRenderObjectWidgetBase { class CustomGrid extends GridRenderObjectWidgetBase {
CustomGrid(List<Widget> children, { Key key, this.delegate }) CustomGrid({ Key key, List<Widget> children: _emptyWidgetList, this.delegate })
: super(key: key, children: children) { : super(key: key, children: children) {
assert(delegate != null); assert(delegate != null);
} }
@ -1150,8 +1156,9 @@ class CustomGrid extends GridRenderObjectWidgetBase {
/// ///
/// For details about the grid layout algorithm, see [MaxTileWidthGridDelegate]. /// For details about the grid layout algorithm, see [MaxTileWidthGridDelegate].
class FixedColumnCountGrid extends GridRenderObjectWidgetBase { class FixedColumnCountGrid extends GridRenderObjectWidgetBase {
FixedColumnCountGrid(List<Widget> children, { FixedColumnCountGrid({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.columnCount, this.columnCount,
this.tileAspectRatio: 1.0, this.tileAspectRatio: 1.0,
this.padding: EdgeDims.zero this.padding: EdgeDims.zero
@ -1181,8 +1188,9 @@ class FixedColumnCountGrid extends GridRenderObjectWidgetBase {
/// ///
/// For details about the grid layout algorithm, see [MaxTileWidthGridDelegate]. /// For details about the grid layout algorithm, see [MaxTileWidthGridDelegate].
class MaxTileWidthGrid extends GridRenderObjectWidgetBase { class MaxTileWidthGrid extends GridRenderObjectWidgetBase {
MaxTileWidthGrid(List<Widget> children, { MaxTileWidthGrid({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.maxTileWidth, this.maxTileWidth,
this.tileAspectRatio: 1.0, this.tileAspectRatio: 1.0,
this.padding: EdgeDims.zero this.padding: EdgeDims.zero
@ -1238,8 +1246,9 @@ class GridPlacementData<DataType, WidgetType extends RenderObjectWidget> extends
/// For details about the flex layout algorithm, see [RenderFlex]. To control /// For details about the flex layout algorithm, see [RenderFlex]. To control
/// the flex of child widgets, see the [Flexible] widget. /// the flex of child widgets, see the [Flexible] widget.
class Flex extends MultiChildRenderObjectWidget { class Flex extends MultiChildRenderObjectWidget {
Flex(List<Widget> children, { Flex({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
this.direction: FlexDirection.horizontal, this.direction: FlexDirection.horizontal,
this.justifyContent: FlexJustifyContent.start, this.justifyContent: FlexJustifyContent.start,
this.alignItems: FlexAlignItems.center, this.alignItems: FlexAlignItems.center,
@ -1270,12 +1279,20 @@ class Flex extends MultiChildRenderObjectWidget {
/// For details about the flex layout algorithm, see [RenderFlex]. To control /// For details about the flex layout algorithm, see [RenderFlex]. To control
/// the flex of child widgets, see the [Flexible] widget. /// the flex of child widgets, see the [Flexible] widget.
class Row extends Flex { class Row extends Flex {
Row(List<Widget> children, { Row({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
justifyContent: FlexJustifyContent.start, justifyContent: FlexJustifyContent.start,
alignItems: FlexAlignItems.center, alignItems: FlexAlignItems.center,
textBaseline textBaseline
}) : super(children, key: key, direction: FlexDirection.horizontal, justifyContent: justifyContent, alignItems: alignItems, textBaseline: textBaseline); }) : super(
children: children,
key: key,
direction: FlexDirection.horizontal,
justifyContent: justifyContent,
alignItems: alignItems,
textBaseline: textBaseline
);
} }
/// Lays out child elements in a column. /// Lays out child elements in a column.
@ -1283,12 +1300,20 @@ class Row extends Flex {
/// For details about the flex layout algorithm, see [RenderFlex]. To control /// For details about the flex layout algorithm, see [RenderFlex]. To control
/// the flex of child widgets, see the [Flexible] widget. /// the flex of child widgets, see the [Flexible] widget.
class Column extends Flex { class Column extends Flex {
Column(List<Widget> children, { Column({
Key key, Key key,
List<Widget> children: _emptyWidgetList,
justifyContent: FlexJustifyContent.start, justifyContent: FlexJustifyContent.start,
alignItems: FlexAlignItems.center, alignItems: FlexAlignItems.center,
textBaseline textBaseline
}) : super(children, key: key, direction: FlexDirection.vertical, justifyContent: justifyContent, alignItems: alignItems, textBaseline: textBaseline); }) : super(
children: children,
key: key,
direction: FlexDirection.vertical,
justifyContent: justifyContent,
alignItems: alignItems,
textBaseline: textBaseline
);
} }
/// Controls how a child of a [Flex], [Row], or [Column] flexes. /// Controls how a child of a [Flex], [Row], or [Column] flexes.

6
packages/flutter/lib/src/widgets/enter_exit_transition.dart
View File

@ -171,7 +171,8 @@ class _EnterExitTransitionState extends State<EnterExitTransition> {
size: _entries.last.childSize, size: _entries.last.childSize,
duration: config.duration, duration: config.duration,
curve: config.curve, curve: config.curve,
child: new Stack(_entries.map((_Entry entry) { child: new Stack(
children: _entries.map((_Entry entry) {
return new SizeObserver( return new SizeObserver(
key: new ObjectKey(entry), key: new ObjectKey(entry),
onSizeChanged: (Size newSize) { onSizeChanged: (Size newSize) {
@ -181,7 +182,8 @@ class _EnterExitTransitionState extends State<EnterExitTransition> {
}, },
child: entry.currentTransition child: entry.currentTransition
); );
}).toList()) }).toList()
)
); );
} }
} }

1
packages/flutter/lib/src/widgets/framework.dart
View File

@ -282,6 +282,7 @@ abstract class OneChildRenderObjectWidget extends RenderObjectWidget {
abstract class MultiChildRenderObjectWidget extends RenderObjectWidget { abstract class MultiChildRenderObjectWidget extends RenderObjectWidget {
MultiChildRenderObjectWidget({ Key key, this.children }) MultiChildRenderObjectWidget({ Key key, this.children })
: super(key: key) { : super(key: key) {
assert(children != null);
assert(!children.any((Widget child) => child == null)); assert(!children.any((Widget child) => child == null));
} }

2
packages/flutter/lib/src/widgets/overlay.dart
View File

@ -152,7 +152,7 @@ class OverlayState extends State<Overlay> {
break; break;
} }
return new Stack(backwardsChildren.reversed.toList(growable: false)); return new Stack(children: backwardsChildren.reversed.toList(growable: false));
} }
void debugFillDescription(List<String> description) { void debugFillDescription(List<String> description) {

2
packages/flutter/lib/src/widgets/scrollable.dart
View File

@ -425,7 +425,7 @@ class Block extends StatelessComponent {
final ScrollListener onScroll; final ScrollListener onScroll;
Widget build(BuildContext context) { Widget build(BuildContext context) {
Widget contents = new BlockBody(children, direction: scrollDirection); Widget contents = new BlockBody(children: children, direction: scrollDirection);
if (padding != null) if (padding != null)
contents = new Padding(padding: padding, child: contents); contents = new Padding(padding: padding, child: contents);
return new ScrollableViewport( return new ScrollableViewport(

14
packages/flutter/test/widget/animated_positioned_test.dart
View File

@ -16,7 +16,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 50.0, left: 50.0,
@ -39,7 +39,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 37.0, left: 37.0,
@ -77,7 +77,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 0.0, left: 0.0,
@ -100,7 +100,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 100.0, left: 100.0,
@ -123,7 +123,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 150.0, left: 150.0,
@ -160,7 +160,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 0.0, left: 0.0,
@ -183,7 +183,7 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Stack( new Stack(
<Widget>[ children: <Widget>[
new AnimatedPositioned( new AnimatedPositioned(
child: new Container(key: key), child: new Container(key: key),
left: 0.0, left: 0.0,

6
packages/flutter/test/widget/coordinates_test.dart
View File

@ -14,7 +14,8 @@ void main() {
Key keyB = new GlobalKey(); Key keyB = new GlobalKey();
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 100.0, top: 100.0,
left: 100.0, left: 100.0,
@ -33,7 +34,8 @@ void main() {
height: 10.0 height: 10.0
) )
), ),
]) ]
)
); );
expect((tester.findElementByKey(keyA).renderObject as RenderBox).localToGlobal(const Point(0.0, 0.0)), expect((tester.findElementByKey(keyA).renderObject as RenderBox).localToGlobal(const Point(0.0, 0.0)),

17
packages/flutter/test/widget/custom_multi_child_layout_test.dart
View File

@ -41,7 +41,8 @@ class TestMultiChildLayoutDelegate extends MultiChildLayoutDelegate {
Widget buildFrame(MultiChildLayoutDelegate delegate) { Widget buildFrame(MultiChildLayoutDelegate delegate) {
return new Center( return new Center(
child: new CustomMultiChildLayout([ child: new CustomMultiChildLayout(
children: <Widget>[
new LayoutId(id: 0, child: new Container(width: 150.0, height: 100.0)), new LayoutId(id: 0, child: new Container(width: 150.0, height: 100.0)),
new LayoutId(id: 1, child: new Container(width: 100.0, height: 200.0)), new LayoutId(id: 1, child: new Container(width: 100.0, height: 200.0)),
], ],
@ -105,16 +106,22 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
TestMultiChildLayoutDelegate delegate = new TestMultiChildLayoutDelegate(); TestMultiChildLayoutDelegate delegate = new TestMultiChildLayoutDelegate();
tester.pumpWidget(new Center( tester.pumpWidget(new Center(
child: new CustomMultiChildLayout([ child: new CustomMultiChildLayout(
children: <Widget>[
new LayoutId( new LayoutId(
id: 0, id: 0,
child: new CustomMultiChildLayout([ child: new CustomMultiChildLayout(
children: <Widget>[
new LayoutId(id: 0, child: new Container(width: 150.0, height: 100.0)), new LayoutId(id: 0, child: new Container(width: 150.0, height: 100.0)),
new LayoutId(id: 1, child: new Container(width: 100.0, height: 200.0)), new LayoutId(id: 1, child: new Container(width: 100.0, height: 200.0)),
], delegate: delegate) ],
delegate: delegate
)
), ),
new LayoutId(id: 1, child: new Container(width: 100.0, height: 200.0)), new LayoutId(id: 1, child: new Container(width: 100.0, height: 200.0)),
], delegate: delegate) ],
delegate: delegate
)
)); ));
}); });

6
packages/flutter/test/widget/dismissable_test.dart
View File

@ -274,10 +274,12 @@ void main() {
child: new Container( child: new Container(
width: 100.0, width: 100.0,
height: 1000.0, height: 1000.0,
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new Test1215DismissableComponent('1'), new Test1215DismissableComponent('1'),
new Test1215DismissableComponent('2') new Test1215DismissableComponent('2')
]) ]
)
) )
)); ));
expect(tester.findText('1'), isNotNull); expect(tester.findText('1'), isNotNull);

3
packages/flutter/test/widget/draggable_test.dart
View File

@ -15,7 +15,8 @@ void main() {
tester.pumpWidget(new MaterialApp( tester.pumpWidget(new MaterialApp(
routes: <String, RouteBuilder>{ routes: <String, RouteBuilder>{
'/': (RouteArguments args) { return new Column(<Widget>[ '/': (RouteArguments args) { return new Column(
children: <Widget>[
new Draggable( new Draggable(
data: 1, data: 1,
child: new Text('Source'), child: new Text('Source'),

6
packages/flutter/test/widget/duplicate_key_test.dart
View File

@ -37,10 +37,12 @@ class KeyedWrapper extends StatelessComponent {
} }
Widget builder() { Widget builder() {
return new Column(<Widget>[ return new Column(
children: <Widget>[
new KeyedWrapper(items[1].key1, items[1].key2), new KeyedWrapper(items[1].key1, items[1].key2),
new KeyedWrapper(items[0].key1, items[0].key2) new KeyedWrapper(items[0].key1, items[0].key2)
]); ]
);
} }
void main() { void main() {

38
packages/flutter/test/widget/flex_test.dart
View File

@ -16,11 +16,13 @@ void main() {
decoration: const BoxDecoration( decoration: const BoxDecoration(
backgroundColor: const Color(0xFF00FF00) backgroundColor: const Color(0xFF00FF00)
), ),
child: new Stack(<Widget>[ child: new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 10.0, top: 10.0,
left: 10.0, left: 10.0,
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
new GestureDetector( new GestureDetector(
onTap: () { onTap: () {
didReceiveTap = true; didReceiveTap = true;
@ -36,9 +38,11 @@ void main() {
) )
) )
) )
]) ]
)
)
]
) )
])
) )
); );
@ -53,7 +57,8 @@ void main() {
// Row without justifyContent: FlexJustifyContent.collapse // Row without justifyContent: FlexJustifyContent.collapse
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget(new Center( tester.pumpWidget(new Center(
child: new Row([ child: new Row(
children: <Widget>[
new Container(width: 10.0, height: 100.0), new Container(width: 10.0, height: 100.0),
new Container(width: 30.0, height: 100.0) new Container(width: 30.0, height: 100.0)
], ],
@ -66,7 +71,8 @@ void main() {
// Row with justifyContent: FlexJustifyContent.collapse // Row with justifyContent: FlexJustifyContent.collapse
tester.pumpWidget(new Center( tester.pumpWidget(new Center(
child: new Row([ child: new Row(
children: <Widget>[
new Container(width: 10.0, height: 100.0), new Container(width: 10.0, height: 100.0),
new Container(width: 30.0, height: 100.0) new Container(width: 30.0, height: 100.0)
], ],
@ -82,7 +88,8 @@ void main() {
// Column without justifyContent: FlexJustifyContent.collapse // Column without justifyContent: FlexJustifyContent.collapse
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget(new Center( tester.pumpWidget(new Center(
child: new Column([ child: new Column(
children: <Widget>[
new Container(width: 100.0, height: 100.0), new Container(width: 100.0, height: 100.0),
new Container(width: 100.0, height: 150.0) new Container(width: 100.0, height: 150.0)
], ],
@ -95,7 +102,8 @@ void main() {
// Column with justifyContent: FlexJustifyContent.collapse // Column with justifyContent: FlexJustifyContent.collapse
tester.pumpWidget(new Center( tester.pumpWidget(new Center(
child: new Column([ child: new Column(
children: <Widget>[
new Container(width: 100.0, height: 100.0), new Container(width: 100.0, height: 100.0),
new Container(width: 100.0, height: 150.0) new Container(width: 100.0, height: 150.0)
], ],
@ -117,12 +125,15 @@ void main() {
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0, height: 0.0,
child: new Column([ child: new Column(
children: <Widget>[
new Container( new Container(
key: childKey, key: childKey,
width: 100.0, width: 100.0,
height: 100.0 height: 100.0
)], justifyContent: FlexJustifyContent.collapse )
],
justifyContent: FlexJustifyContent.collapse
) )
) )
)); ));
@ -135,12 +146,15 @@ void main() {
child: new Container( child: new Container(
width: 0.0, width: 0.0,
height: 0.0, height: 0.0,
child: new Row([ child: new Row(
children: <Widget>[
new Container( new Container(
key: childKey, key: childKey,
width: 100.0, width: 100.0,
height: 100.0 height: 100.0
)], justifyContent: FlexJustifyContent.collapse )
],
justifyContent: FlexJustifyContent.collapse
) )
) )
)); ));

6
packages/flutter/test/widget/focus_test.dart
View File

@ -26,11 +26,13 @@ void main() {
GlobalKey keyB = new GlobalKey(); GlobalKey keyB = new GlobalKey();
tester.pumpWidget( tester.pumpWidget(
new Focus( new Focus(
child: new Column(<Widget>[ child: new Column(
children: <Widget>[
// reverse these when you fix https://github.com/flutter/engine/issues/1495 // reverse these when you fix https://github.com/flutter/engine/issues/1495
new TestFocusable('b', 'B FOCUSED', keyB), new TestFocusable('b', 'B FOCUSED', keyB),
new TestFocusable('a', 'A FOCUSED', keyA), new TestFocusable('a', 'A FOCUSED', keyA),
]) ]
)
) )
); );
expect(tester.findText('a'), isNull); expect(tester.findText('a'), isNull);

6
packages/flutter/test/widget/gesture_detector_test.dart
View File

@ -144,7 +144,8 @@ void main() {
void pumpWidgetTree(HitTestBehavior behavior) { void pumpWidgetTree(HitTestBehavior behavior) {
tester.pumpWidget( tester.pumpWidget(
new Stack([ new Stack(
children: <Widget>[
new Listener( new Listener(
onPointerDown: (_) { onPointerDown: (_) {
didReceivePointerDown = true; didReceivePointerDown = true;
@ -167,7 +168,8 @@ void main() {
behavior: behavior behavior: behavior
) )
) )
]) ]
)
); );
} }

118
packages/flutter/test/widget/multichild_test.dart
View File

@ -36,64 +36,76 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new DecoratedBox(decoration: kBoxDecorationB), new DecoratedBox(decoration: kBoxDecorationB),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new DecoratedBox(key: new Key('b'), decoration: kBoxDecorationB), new DecoratedBox(key: new Key('b'), decoration: kBoxDecorationB),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(key: new Key('b'), decoration: kBoxDecorationB), new DecoratedBox(key: new Key('b'), decoration: kBoxDecorationB),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
new DecoratedBox(key: new Key('a'), decoration: kBoxDecorationA), new DecoratedBox(key: new Key('a'), decoration: kBoxDecorationA),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationC, kBoxDecorationA]); checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationC, kBoxDecorationA]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(key: new Key('a'), decoration: kBoxDecorationA), new DecoratedBox(key: new Key('a'), decoration: kBoxDecorationA),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
new DecoratedBox(key: new Key('b'), decoration: kBoxDecorationB), new DecoratedBox(key: new Key('b'), decoration: kBoxDecorationB),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationC, kBoxDecorationB]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationC, kBoxDecorationB]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[]) new Stack()
); );
checkTree(tester, <BoxDecoration>[]); checkTree(tester, <BoxDecoration>[]);
@ -105,29 +117,34 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new DecoratedBox(decoration: kBoxDecorationB), new DecoratedBox(decoration: kBoxDecorationB),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new Container( new Container(
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new Container( new Container(
child: new Container( child: new Container(
@ -135,13 +152,15 @@ void main() {
) )
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Container( new Container(
child: new Container( child: new Container(
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
@ -151,13 +170,15 @@ void main() {
child: new DecoratedBox(decoration: kBoxDecorationA) child: new DecoratedBox(decoration: kBoxDecorationA)
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationA, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationA, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Container( new Container(
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
), ),
@ -165,13 +186,15 @@ void main() {
child: new DecoratedBox(decoration: kBoxDecorationA) child: new DecoratedBox(decoration: kBoxDecorationA)
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationA, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationA, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Container( new Container(
key: new Key('b'), key: new Key('b'),
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
@ -180,13 +203,15 @@ void main() {
key: new Key('a'), key: new Key('a'),
child: new DecoratedBox(decoration: kBoxDecorationA) child: new DecoratedBox(decoration: kBoxDecorationA)
), ),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationA]); checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationA]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Container( new Container(
key: new Key('a'), key: new Key('a'),
child: new DecoratedBox(decoration: kBoxDecorationA) child: new DecoratedBox(decoration: kBoxDecorationA)
@ -195,13 +220,14 @@ void main() {
key: new Key('b'), key: new Key('b'),
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
), ),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[]) new Stack()
); );
checkTree(tester, <BoxDecoration>[]); checkTree(tester, <BoxDecoration>[]);
@ -211,22 +237,26 @@ void main() {
test('MultiChildRenderObjectElement with stateful components', () { test('MultiChildRenderObjectElement with stateful components', () {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new DecoratedBox(decoration: kBoxDecorationB), new DecoratedBox(decoration: kBoxDecorationB),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationB]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new FlipComponent( new FlipComponent(
left: new DecoratedBox(decoration: kBoxDecorationA), left: new DecoratedBox(decoration: kBoxDecorationA),
right: new DecoratedBox(decoration: kBoxDecorationB) right: new DecoratedBox(decoration: kBoxDecorationB)
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationA, kBoxDecorationC]);
@ -237,12 +267,14 @@ void main() {
checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationC]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new FlipComponent( new FlipComponent(
left: new DecoratedBox(decoration: kBoxDecorationA), left: new DecoratedBox(decoration: kBoxDecorationA),
right: new DecoratedBox(decoration: kBoxDecorationB) right: new DecoratedBox(decoration: kBoxDecorationB)
), ),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationB]); checkTree(tester, <BoxDecoration>[kBoxDecorationB]);
@ -253,24 +285,28 @@ void main() {
checkTree(tester, <BoxDecoration>[kBoxDecorationA]); checkTree(tester, <BoxDecoration>[kBoxDecorationA]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new FlipComponent( new FlipComponent(
key: new Key('flip'), key: new Key('flip'),
left: new DecoratedBox(decoration: kBoxDecorationA), left: new DecoratedBox(decoration: kBoxDecorationA),
right: new DecoratedBox(decoration: kBoxDecorationB) right: new DecoratedBox(decoration: kBoxDecorationB)
), ),
]) ]
)
); );
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(key: new Key('c'), decoration: kBoxDecorationC), new DecoratedBox(key: new Key('c'), decoration: kBoxDecorationC),
new FlipComponent( new FlipComponent(
key: new Key('flip'), key: new Key('flip'),
left: new DecoratedBox(decoration: kBoxDecorationA), left: new DecoratedBox(decoration: kBoxDecorationA),
right: new DecoratedBox(decoration: kBoxDecorationB) right: new DecoratedBox(decoration: kBoxDecorationB)
), ),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationC, kBoxDecorationA]); checkTree(tester, <BoxDecoration>[kBoxDecorationC, kBoxDecorationA]);
@ -281,14 +317,16 @@ void main() {
checkTree(tester, <BoxDecoration>[kBoxDecorationC, kBoxDecorationB]); checkTree(tester, <BoxDecoration>[kBoxDecorationC, kBoxDecorationB]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new FlipComponent( new FlipComponent(
key: new Key('flip'), key: new Key('flip'),
left: new DecoratedBox(decoration: kBoxDecorationA), left: new DecoratedBox(decoration: kBoxDecorationA),
right: new DecoratedBox(decoration: kBoxDecorationB) right: new DecoratedBox(decoration: kBoxDecorationB)
), ),
new DecoratedBox(key: new Key('c'), decoration: kBoxDecorationC), new DecoratedBox(key: new Key('c'), decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationC]); checkTree(tester, <BoxDecoration>[kBoxDecorationB, kBoxDecorationC]);

6
packages/flutter/test/widget/page_forward_transitions_test.dart
View File

@ -76,7 +76,8 @@ void main() {
key: insideKey, key: insideKey,
builder: (BuildContext context) { builder: (BuildContext context) {
PageRoute route = ModalRoute.of(context); PageRoute route = ModalRoute.of(context);
return new Column([ return new Column(
children: <Widget>[
new TestTransition( new TestTransition(
childFirstHalf: new Text('A'), childFirstHalf: new Text('A'),
childSecondHalf: new Text('B'), childSecondHalf: new Text('B'),
@ -87,7 +88,8 @@ void main() {
childSecondHalf: new Text('D'), childSecondHalf: new Text('D'),
performance: route.forwardPerformance performance: route.forwardPerformance
), ),
]); ]
);
} }
) )
); );

84
packages/flutter/test/widget/parent_data_test.dart
View File

@ -65,7 +65,8 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new DecoratedBox(decoration: kBoxDecorationA), new DecoratedBox(decoration: kBoxDecorationA),
new Positioned( new Positioned(
top: 10.0, top: 10.0,
@ -73,7 +74,8 @@ void main() {
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -83,7 +85,8 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
bottom: 5.0, bottom: 5.0,
right: 7.0, right: 7.0,
@ -95,7 +98,8 @@ void main() {
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
), ),
new DecoratedBox(decoration: kBoxDecorationC), new DecoratedBox(decoration: kBoxDecorationC),
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -109,7 +113,8 @@ void main() {
DecoratedBox kDecoratedBoxC = new DecoratedBox(decoration: kBoxDecorationC); DecoratedBox kDecoratedBoxC = new DecoratedBox(decoration: kBoxDecorationC);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
bottom: 5.0, bottom: 5.0,
right: 7.0, right: 7.0,
@ -121,7 +126,8 @@ void main() {
child: kDecoratedBoxB child: kDecoratedBoxB
), ),
kDecoratedBoxC, kDecoratedBoxC,
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -131,7 +137,8 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
bottom: 6.0, bottom: 6.0,
right: 8.0, right: 8.0,
@ -143,7 +150,8 @@ void main() {
child: kDecoratedBoxB child: kDecoratedBoxB
), ),
kDecoratedBoxC, kDecoratedBoxC,
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -153,7 +161,8 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
kDecoratedBoxA, kDecoratedBoxA,
new Positioned( new Positioned(
left: 11.0, left: 11.0,
@ -161,7 +170,8 @@ void main() {
child: new Container(child: kDecoratedBoxB) child: new Container(child: kDecoratedBoxB)
), ),
kDecoratedBoxC, kDecoratedBoxC,
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -171,7 +181,8 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
kDecoratedBoxA, kDecoratedBoxA,
new Positioned( new Positioned(
right: 10.0, right: 10.0,
@ -183,7 +194,8 @@ void main() {
child: kDecoratedBoxC child: kDecoratedBoxC
) )
) )
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -193,12 +205,14 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
right: 10.0, right: 10.0,
child: new FlipComponent(left: kDecoratedBoxA, right: kDecoratedBoxB) child: new FlipComponent(left: kDecoratedBoxA, right: kDecoratedBoxB)
), ),
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -213,12 +227,14 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 7.0, top: 7.0,
child: new FlipComponent(left: kDecoratedBoxA, right: kDecoratedBoxB) child: new FlipComponent(left: kDecoratedBoxA, right: kDecoratedBoxB)
), ),
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -233,7 +249,7 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[]) new Stack()
); );
checkTree(tester, <TestParentData>[]); checkTree(tester, <TestParentData>[]);
@ -245,7 +261,8 @@ void main() {
expect(cachedException, isNull); expect(cachedException, isNull);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 5.0, top: 5.0,
bottom: 8.0, bottom: 8.0,
@ -255,26 +272,29 @@ void main() {
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
) )
) )
]) ]
)
); );
expect(cachedException, isNotNull); expect(cachedException, isNotNull);
cachedException = null; cachedException = null;
tester.pumpWidget(new Stack(<Widget>[])); tester.pumpWidget(new Stack());
checkTree(tester, <TestParentData>[]); checkTree(tester, <TestParentData>[]);
expect(cachedException, isNull); expect(cachedException, isNull);
tester.pumpWidget( tester.pumpWidget(
new Container( new Container(
child: new Flex(<Widget>[ child: new Flex(
children: <Widget>[
new Positioned( new Positioned(
top: 6.0, top: 6.0,
left: 7.0, left: 7.0,
child: new DecoratedBox(decoration: kBoxDecorationB) child: new DecoratedBox(decoration: kBoxDecorationB)
) )
]) ]
)
) )
); );
@ -282,7 +302,7 @@ void main() {
cachedException = null; cachedException = null;
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[]) new Stack()
); );
checkTree(tester, <TestParentData>[]); checkTree(tester, <TestParentData>[]);
@ -294,13 +314,15 @@ void main() {
GlobalKey key = new GlobalKey(); GlobalKey key = new GlobalKey();
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 10.0, top: 10.0,
left: 10.0, left: 10.0,
child: new DecoratedBox(key: key, decoration: kBoxDecorationA) child: new DecoratedBox(key: key, decoration: kBoxDecorationA)
) )
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -308,7 +330,8 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 10.0, top: 10.0,
left: 10.0, left: 10.0,
@ -317,7 +340,8 @@ void main() {
child: new DecoratedBox(key: key, decoration: kBoxDecorationA) child: new DecoratedBox(key: key, decoration: kBoxDecorationA)
) )
) )
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[
@ -325,13 +349,15 @@ void main() {
]); ]);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 10.0, top: 10.0,
left: 10.0, left: 10.0,
child: new DecoratedBox(key: key, decoration: kBoxDecorationA) child: new DecoratedBox(key: key, decoration: kBoxDecorationA)
) )
]) ]
)
); );
checkTree(tester, <TestParentData>[ checkTree(tester, <TestParentData>[

6
packages/flutter/test/widget/positioned_test.dart
View File

@ -43,7 +43,8 @@ void main() {
child: new Container( child: new Container(
height: 100.0, height: 100.0,
width: 100.0, width: 100.0,
child: new Stack(<Widget>[ child: new Stack(
children: <Widget>[
new PositionedTransition( new PositionedTransition(
rect: rect, rect: rect,
performance: performance, performance: performance,
@ -51,7 +52,8 @@ void main() {
key: key key: key
) )
) )
]) ]
)
) )
) )
); // t=0 ); // t=0

12
packages/flutter/test/widget/reparent_state_test.dart
View File

@ -32,7 +32,8 @@ void main() {
StateMarker grandchild = new StateMarker(); StateMarker grandchild = new StateMarker();
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Container( new Container(
child: new StateMarker(key: left) child: new StateMarker(key: left)
), ),
@ -42,7 +43,8 @@ void main() {
child: grandchild child: grandchild
) )
), ),
]) ]
)
); );
(left.currentState as StateMarkerState).marker = "left"; (left.currentState as StateMarkerState).marker = "left";
@ -54,7 +56,8 @@ void main() {
StateMarker newGrandchild = new StateMarker(); StateMarker newGrandchild = new StateMarker();
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Container( new Container(
child: new StateMarker( child: new StateMarker(
key: right, key: right,
@ -64,7 +67,8 @@ void main() {
new Container( new Container(
child: new StateMarker(key: left) child: new StateMarker(key: left)
), ),
]) ]
)
); );
expect((left.currentState as StateMarkerState).marker, equals("left")); expect((left.currentState as StateMarkerState).marker, equals("left"));

43
packages/flutter/test/widget/stack_test.dart
View File

@ -12,13 +12,13 @@ import '../rendering/rendering_tester.dart';
void main() { void main() {
test('Can construct an empty Stack', () { test('Can construct an empty Stack', () {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget(new Stack(<Widget>[])); tester.pumpWidget(new Stack());
}); });
}); });
test('Can construct an empty Centered Stack', () { test('Can construct an empty Centered Stack', () {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget(new Center(child: new Stack(<Widget>[]))); tester.pumpWidget(new Center(child: new Stack()));
}); });
}); });
@ -27,7 +27,8 @@ void main() {
Key key = new Key('container'); Key key = new Key('container');
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
left: 10.0, left: 10.0,
child: new Container( child: new Container(
@ -36,7 +37,8 @@ void main() {
height: 10.0 height: 10.0
) )
) )
]) ]
)
); );
Element container; Element container;
@ -52,7 +54,8 @@ void main() {
expect(parentData.height, isNull); expect(parentData.height, isNull);
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
right: 10.0, right: 10.0,
child: new Container( child: new Container(
@ -61,7 +64,8 @@ void main() {
height: 10.0 height: 10.0
) )
) )
]) ]
)
); );
container = tester.findElementByKey(key); container = tester.findElementByKey(key);
@ -80,7 +84,7 @@ void main() {
Key key = new Key('container'); Key key = new Key('container');
Container container = new Container(key: key, width: 10.0, height: 10.0); Container container = new Container(key: key, width: 10.0, height: 10.0);
tester.pumpWidget(new Stack(<Widget>[ new Positioned(left: 10.0, child: container) ])); tester.pumpWidget(new Stack(children: <Widget>[ new Positioned(left: 10.0, child: container) ]));
Element containerElement = tester.findElementByKey(key); Element containerElement = tester.findElementByKey(key);
StackParentData parentData; StackParentData parentData;
@ -92,7 +96,7 @@ void main() {
expect(parentData.width, isNull); expect(parentData.width, isNull);
expect(parentData.height, isNull); expect(parentData.height, isNull);
tester.pumpWidget(new Stack(<Widget>[ container ])); tester.pumpWidget(new Stack(children: <Widget>[ container ]));
containerElement = tester.findElementByKey(key); containerElement = tester.findElementByKey(key);
parentData = containerElement.renderObject.parentData; parentData = containerElement.renderObject.parentData;
@ -112,7 +116,8 @@ void main() {
tester.pumpWidget( tester.pumpWidget(
new Center( new Center(
child: new Stack(<Widget>[ child: new Stack(
children: <Widget>[
new Container(key: child0Key, width: 20.0, height: 20.0), new Container(key: child0Key, width: 20.0, height: 20.0),
new Container(key: child1Key, width: 10.0, height: 10.0) new Container(key: child1Key, width: 10.0, height: 10.0)
], ],
@ -133,13 +138,13 @@ void main() {
test('Can construct an empty IndexedStack', () { test('Can construct an empty IndexedStack', () {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget(new IndexedStack(<Widget>[])); tester.pumpWidget(new IndexedStack());
}); });
}); });
test('Can construct an empty Centered IndexedStack', () { test('Can construct an empty Centered IndexedStack', () {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
tester.pumpWidget(new Center(child: new IndexedStack(<Widget>[]))); tester.pumpWidget(new Center(child: new IndexedStack()));
}); });
}); });
@ -158,7 +163,7 @@ void main() {
) )
); );
}); });
return new Center(child: new IndexedStack(items, index: index)); return new Center(child: new IndexedStack(children: items, index: index));
} }
tester.pumpWidget(buildFrame(0)); tester.pumpWidget(buildFrame(0));
@ -186,7 +191,7 @@ void main() {
List<Widget> items = new List<Widget>.generate(itemCount, (i) { List<Widget> items = new List<Widget>.generate(itemCount, (i) {
return new GestureDetector(child: new Text('$i'), onTap: () { itemsTapped.add(i); }); return new GestureDetector(child: new Text('$i'), onTap: () { itemsTapped.add(i); });
}); });
return new Center(child: new IndexedStack(items, key: key, index: index)); return new Center(child: new IndexedStack(children: items, key: key, index: index));
} }
tester.pumpWidget(buildFrame(0)); tester.pumpWidget(buildFrame(0));
@ -210,14 +215,16 @@ void main() {
); );
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
left: 10.0, left: 10.0,
width: 11.0, width: 11.0,
height: 12.0, height: 12.0,
child: new DecoratedBox(key: key, decoration: kBoxDecoration) child: new DecoratedBox(key: key, decoration: kBoxDecoration)
) )
]) ]
)
); );
Element box; Element box;
@ -239,14 +246,16 @@ void main() {
expect(renderBox.size.height, equals(12.0)); expect(renderBox.size.height, equals(12.0));
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
right: 10.0, right: 10.0,
width: 11.0, width: 11.0,
height: 12.0, height: 12.0,
child: new DecoratedBox(key: key, decoration: kBoxDecoration) child: new DecoratedBox(key: key, decoration: kBoxDecoration)
) )
]) ]
)
); );
box = tester.findElementByKey(key); box = tester.findElementByKey(key);

20
packages/flutter/test/widget/syncing_test.dart
View File

@ -115,13 +115,14 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
Widget a = new TestWidget(persistentState: 0x61, syncedState: 0x41, child: new Text('apple')); Widget a = new TestWidget(persistentState: 0x61, syncedState: 0x41, child: new Text('apple'));
Widget b = new TestWidget(persistentState: 0x62, syncedState: 0x42, child: new Text('banana')); Widget b = new TestWidget(persistentState: 0x62, syncedState: 0x42, child: new Text('banana'));
tester.pumpWidget(new Column(<Widget>[])); tester.pumpWidget(new Column());
GlobalKey keyA = new GlobalKey(); GlobalKey keyA = new GlobalKey();
GlobalKey keyB = new GlobalKey(); GlobalKey keyB = new GlobalKey();
tester.pumpWidget( tester.pumpWidget(
new Column(<Widget>[ new Column(
children: <Widget>[
new Container( new Container(
key: keyA, key: keyA,
child: a child: a
@ -130,7 +131,8 @@ void main() {
key: keyB, key: keyB,
child: b child: b
) )
]) ]
)
); );
TestWidgetState first, second; TestWidgetState first, second;
@ -146,7 +148,8 @@ void main() {
expect(second.syncedState, equals(0x42)); expect(second.syncedState, equals(0x42));
tester.pumpWidget( tester.pumpWidget(
new Column(<Widget>[ new Column(
children: <Widget>[
new Container( new Container(
key: keyA, key: keyA,
child: a child: a
@ -155,7 +158,8 @@ void main() {
key: keyB, key: keyB,
child: b child: b
) )
]) ]
)
); );
first = tester.findStateByConfig(a); first = tester.findStateByConfig(a);
@ -173,7 +177,8 @@ void main() {
// since they are both "old" nodes, they shouldn't sync with each other even though they look alike // since they are both "old" nodes, they shouldn't sync with each other even though they look alike
tester.pumpWidget( tester.pumpWidget(
new Column(<Widget>[ new Column(
children: <Widget>[
new Container( new Container(
key: keyA, key: keyA,
child: b child: b
@ -182,7 +187,8 @@ void main() {
key: keyB, key: keyB,
child: a child: a
) )
]) ]
)
); );
first = tester.findStateByConfig(b); first = tester.findStateByConfig(b);

18
packages/flutter/test/widget/transform_test.dart
View File

@ -11,7 +11,8 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
bool didReceiveTap = false; bool didReceiveTap = false;
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 100.0, top: 100.0,
left: 100.0, left: 100.0,
@ -45,7 +46,8 @@ void main() {
) )
) )
) )
]) ]
)
); );
expect(didReceiveTap, isFalse); expect(didReceiveTap, isFalse);
@ -60,7 +62,8 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
bool didReceiveTap = false; bool didReceiveTap = false;
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 100.0, top: 100.0,
left: 100.0, left: 100.0,
@ -94,7 +97,8 @@ void main() {
) )
) )
) )
]) ]
)
); );
expect(didReceiveTap, isFalse); expect(didReceiveTap, isFalse);
@ -109,7 +113,8 @@ void main() {
testWidgets((WidgetTester tester) { testWidgets((WidgetTester tester) {
bool didReceiveTap = false; bool didReceiveTap = false;
tester.pumpWidget( tester.pumpWidget(
new Stack(<Widget>[ new Stack(
children: <Widget>[
new Positioned( new Positioned(
top: 100.0, top: 100.0,
left: 100.0, left: 100.0,
@ -144,7 +149,8 @@ void main() {
) )
) )
) )
]) ]
)
); );
expect(didReceiveTap, isFalse); expect(didReceiveTap, isFalse);