diff --git a/dev/benchmarks/complex_layout/lib/main.dart b/dev/benchmarks/complex_layout/lib/main.dart index c63c5934540..5acfecef488 100644 --- a/dev/benchmarks/complex_layout/lib/main.dart +++ b/dev/benchmarks/complex_layout/lib/main.dart @@ -589,7 +589,7 @@ class GalleryDrawer extends StatelessWidget { @override Widget build(BuildContext context) { return new Drawer( - child: new Block( + child: new ScrollView( children: [ new FancyDrawerHeader(), new DrawerItem( diff --git a/dev/manual_tests/card_collection.dart b/dev/manual_tests/card_collection.dart index e02e96da759..aa3c0e8795b 100644 --- a/dev/manual_tests/card_collection.dart +++ b/dev/manual_tests/card_collection.dart @@ -123,33 +123,35 @@ class CardCollectionState extends State { return new Drawer( child: new IconTheme( data: const IconThemeData(color: Colors.black), - child: new Block(children: [ - new DrawerHeader(child: new Center(child: new Text('Options'))), - buildDrawerCheckbox("Make card labels editable", _editable, _toggleEditable), - buildDrawerCheckbox("Snap fling scrolls to center", _snapToCenter, _toggleSnapToCenter), - buildDrawerCheckbox("Fixed size cards", _fixedSizeCards, _toggleFixedSizeCards), - buildDrawerCheckbox("Let the sun shine", _sunshine, _toggleSunshine), - buildDrawerCheckbox("Vary font sizes", _varyFontSizes, _toggleVaryFontSizes, enabled: !_editable), - new Divider(), - buildDrawerColorRadioItem("Deep Purple", Colors.deepPurple, _primaryColor, _selectColor), - buildDrawerColorRadioItem("Green", Colors.green, _primaryColor, _selectColor), - buildDrawerColorRadioItem("Amber", Colors.amber, _primaryColor, _selectColor), - buildDrawerColorRadioItem("Teal", Colors.teal, _primaryColor, _selectColor), - new Divider(), - buildDrawerDirectionRadioItem("Dismiss horizontally", DismissDirection.horizontal, _dismissDirection, _changeDismissDirection, icon: Icons.code), - buildDrawerDirectionRadioItem("Dismiss left", DismissDirection.endToStart, _dismissDirection, _changeDismissDirection, icon: Icons.arrow_back), - buildDrawerDirectionRadioItem("Dismiss right", DismissDirection.startToEnd, _dismissDirection, _changeDismissDirection, icon: Icons.arrow_forward), - new Divider(), - buildFontRadioItem("Left-align text", TextAlign.left, _textAlign, _changeTextAlign, icon: Icons.format_align_left, enabled: !_editable), - buildFontRadioItem("Center-align text", TextAlign.center, _textAlign, _changeTextAlign, icon: Icons.format_align_center, enabled: !_editable), - buildFontRadioItem("Right-align text", TextAlign.right, _textAlign, _changeTextAlign, icon: Icons.format_align_right, enabled: !_editable), - new Divider(), - new DrawerItem( - icon: new Icon(Icons.dvr), - onPressed: () { debugDumpApp(); debugDumpRenderTree(); }, - child: new Text('Dump App to Console') - ), - ]) + child: new ScrollView( + children: [ + new DrawerHeader(child: new Center(child: new Text('Options'))), + buildDrawerCheckbox("Make card labels editable", _editable, _toggleEditable), + buildDrawerCheckbox("Snap fling scrolls to center", _snapToCenter, _toggleSnapToCenter), + buildDrawerCheckbox("Fixed size cards", _fixedSizeCards, _toggleFixedSizeCards), + buildDrawerCheckbox("Let the sun shine", _sunshine, _toggleSunshine), + buildDrawerCheckbox("Vary font sizes", _varyFontSizes, _toggleVaryFontSizes, enabled: !_editable), + new Divider(), + buildDrawerColorRadioItem("Deep Purple", Colors.deepPurple, _primaryColor, _selectColor), + buildDrawerColorRadioItem("Green", Colors.green, _primaryColor, _selectColor), + buildDrawerColorRadioItem("Amber", Colors.amber, _primaryColor, _selectColor), + buildDrawerColorRadioItem("Teal", Colors.teal, _primaryColor, _selectColor), + new Divider(), + buildDrawerDirectionRadioItem("Dismiss horizontally", DismissDirection.horizontal, _dismissDirection, _changeDismissDirection, icon: Icons.code), + buildDrawerDirectionRadioItem("Dismiss left", DismissDirection.endToStart, _dismissDirection, _changeDismissDirection, icon: Icons.arrow_back), + buildDrawerDirectionRadioItem("Dismiss right", DismissDirection.startToEnd, _dismissDirection, _changeDismissDirection, icon: Icons.arrow_forward), + new Divider(), + buildFontRadioItem("Left-align text", TextAlign.left, _textAlign, _changeTextAlign, icon: Icons.format_align_left, enabled: !_editable), + buildFontRadioItem("Center-align text", TextAlign.center, _textAlign, _changeTextAlign, icon: Icons.format_align_center, enabled: !_editable), + buildFontRadioItem("Right-align text", TextAlign.right, _textAlign, _changeTextAlign, icon: Icons.format_align_right, enabled: !_editable), + new Divider(), + new DrawerItem( + icon: new Icon(Icons.dvr), + onPressed: () { debugDumpApp(); debugDumpRenderTree(); }, + child: new Text('Dump App to Console') + ), + ] + ) ) ); } diff --git a/dev/manual_tests/pageable_list.dart b/dev/manual_tests/pageable_list.dart index 2547fa17ce1..80954ca774e 100644 --- a/dev/manual_tests/pageable_list.dart +++ b/dev/manual_tests/pageable_list.dart @@ -84,31 +84,33 @@ class PageableListAppState extends State { Widget _buildDrawer() { return new Drawer( - child: new Block(children: [ - new DrawerHeader(child: new Center(child: new Text('Options'))), - new DrawerItem( - icon: new Icon(Icons.more_horiz), - selected: scrollDirection == Axis.horizontal, - child: new Text('Horizontal Layout'), - onPressed: switchScrollDirection - ), - new DrawerItem( - icon: new Icon(Icons.more_vert), - selected: scrollDirection == Axis.vertical, - child: new Text('Vertical Layout'), - onPressed: switchScrollDirection - ), - new DrawerItem( - onPressed: toggleItemsWrap, - child: new Row( - children: [ - new Expanded(child: new Text('Scrolling wraps around')), - // TODO(abarth): Actually make this checkbox change this value. - new Checkbox(value: itemsWrap, onChanged: null) - ] + child: new ScrollView( + children: [ + new DrawerHeader(child: new Center(child: new Text('Options'))), + new DrawerItem( + icon: new Icon(Icons.more_horiz), + selected: scrollDirection == Axis.horizontal, + child: new Text('Horizontal Layout'), + onPressed: switchScrollDirection + ), + new DrawerItem( + icon: new Icon(Icons.more_vert), + selected: scrollDirection == Axis.vertical, + child: new Text('Vertical Layout'), + onPressed: switchScrollDirection + ), + new DrawerItem( + onPressed: toggleItemsWrap, + child: new Row( + children: [ + new Expanded(child: new Text('Scrolling wraps around')), + // TODO(abarth): Actually make this checkbox change this value. + new Checkbox(value: itemsWrap, onChanged: null) + ] + ) ) - ) - ]) + ] + ) ); } diff --git a/examples/flutter_gallery/lib/demo/chip_demo.dart b/examples/flutter_gallery/lib/demo/chip_demo.dart index 08b2ae87f1e..118f874a20d 100644 --- a/examples/flutter_gallery/lib/demo/chip_demo.dart +++ b/examples/flutter_gallery/lib/demo/chip_demo.dart @@ -41,7 +41,7 @@ class _ChipDemoState extends State { return new Scaffold( appBar: new AppBar(title: new Text('Chips')), - body: new Block( + body: new ScrollView( children: chips.map((Widget widget) { return new Container( height: 100.0, diff --git a/examples/flutter_gallery/lib/demo/drawer_demo.dart b/examples/flutter_gallery/lib/demo/drawer_demo.dart index caae2615b8a..68e973244c7 100644 --- a/examples/flutter_gallery/lib/demo/drawer_demo.dart +++ b/examples/flutter_gallery/lib/demo/drawer_demo.dart @@ -88,7 +88,7 @@ class _DrawerDemoState extends State with TickerProviderStateMixin { title: new Text('Navigation drawer'), ), drawer: new Drawer( - child: new Block( + child: new ScrollView( children: [ new UserAccountsDrawerHeader( accountName: new Text('Zach Widget'), diff --git a/examples/flutter_gallery/lib/demo/leave_behind_demo.dart b/examples/flutter_gallery/lib/demo/leave_behind_demo.dart index 1849bff70c4..704f8fe9edc 100644 --- a/examples/flutter_gallery/lib/demo/leave_behind_demo.dart +++ b/examples/flutter_gallery/lib/demo/leave_behind_demo.dart @@ -161,7 +161,7 @@ class LeaveBehindDemoState extends State { ) ] ), - body: new Block( + body: new ScrollView( children: leaveBehindItems.map(buildItem).toList() ) ); diff --git a/examples/flutter_gallery/lib/demo/snack_bar_demo.dart b/examples/flutter_gallery/lib/demo/snack_bar_demo.dart index d89aa365550..c6b78392644 100644 --- a/examples/flutter_gallery/lib/demo/snack_bar_demo.dart +++ b/examples/flutter_gallery/lib/demo/snack_bar_demo.dart @@ -29,41 +29,39 @@ class _SnackBarDemoState extends State { int _snackBarIndex = 1; Widget buildBody(BuildContext context) { - return new Padding( + return new Block( padding: const EdgeInsets.all(24.0), - child: new Block( - children: [ - new Text(_text1), - new Text(_text2), - new Center( - child: new RaisedButton( - child: new Text('SHOW A SNACKBAR'), - onPressed: () { - final int thisSnackBarIndex = _snackBarIndex++; - Scaffold.of(context).showSnackBar(new SnackBar( - content: new Text('This is snackbar #$thisSnackBarIndex.'), - action: new SnackBarAction( - label: 'ACTION', - onPressed: () { - Scaffold.of(context).showSnackBar(new SnackBar( - content: new Text('You pressed snackbar $thisSnackBarIndex\'s action.') - )); - } - ) - )); - } - ) - ), - new Text(_text3), - ] - .map((Widget child) { - return new Container( - margin: const EdgeInsets.symmetric(vertical: 12.0), - child: child - ); - }) - .toList() - ) + children: [ + new Text(_text1), + new Text(_text2), + new Center( + child: new RaisedButton( + child: new Text('SHOW A SNACKBAR'), + onPressed: () { + final int thisSnackBarIndex = _snackBarIndex++; + Scaffold.of(context).showSnackBar(new SnackBar( + content: new Text('This is snackbar #$thisSnackBarIndex.'), + action: new SnackBarAction( + label: 'ACTION', + onPressed: () { + Scaffold.of(context).showSnackBar(new SnackBar( + content: new Text('You pressed snackbar $thisSnackBarIndex\'s action.') + )); + } + ) + )); + } + ) + ), + new Text(_text3), + ] + .map((Widget child) { + return new Container( + margin: const EdgeInsets.symmetric(vertical: 12.0), + child: child + ); + }) + .toList() ); } diff --git a/examples/flutter_gallery/lib/demo/tooltip_demo.dart b/examples/flutter_gallery/lib/demo/tooltip_demo.dart index 7522c6ff84b..d264fcd0420 100644 --- a/examples/flutter_gallery/lib/demo/tooltip_demo.dart +++ b/examples/flutter_gallery/lib/demo/tooltip_demo.dart @@ -22,7 +22,7 @@ class TooltipDemo extends StatelessWidget { ), body: new Builder( builder: (BuildContext context) { - return new Block( + return new ScrollView( children: [ new Text(_introText, style: theme.textTheme.subhead), new Row( diff --git a/examples/flutter_gallery/lib/demo/typography_demo.dart b/examples/flutter_gallery/lib/demo/typography_demo.dart index 52d2dabb0b5..2daa1a8040c 100644 --- a/examples/flutter_gallery/lib/demo/typography_demo.dart +++ b/examples/flutter_gallery/lib/demo/typography_demo.dart @@ -66,7 +66,7 @@ class TypographyDemo extends StatelessWidget { return new Scaffold( appBar: new AppBar(title: new Text('Typography')), - body: new Block(children: styleItems) + body: new ScrollView(children: styleItems) ); } } diff --git a/examples/flutter_gallery/lib/gallery/drawer.dart b/examples/flutter_gallery/lib/gallery/drawer.dart index 41c3bd3d67f..280b48846f9 100644 --- a/examples/flutter_gallery/lib/gallery/drawer.dart +++ b/examples/flutter_gallery/lib/gallery/drawer.dart @@ -305,6 +305,6 @@ class GalleryDrawer extends StatelessWidget { )); } - return new Drawer(child: new Block(children: allDrawerItems)); + return new Drawer(child: new ScrollView(children: allDrawerItems)); } } diff --git a/examples/stocks/lib/stock_home.dart b/examples/stocks/lib/stock_home.dart index 3419ac658da..e3fcdb5c3f6 100644 --- a/examples/stocks/lib/stock_home.dart +++ b/examples/stocks/lib/stock_home.dart @@ -121,63 +121,65 @@ class StockHomeState extends State { Widget _buildDrawer(BuildContext context) { return new Drawer( - child: new Block(children: [ - new DrawerHeader(child: new Center(child: new Text('Stocks'))), - new DrawerItem( - icon: new Icon(Icons.assessment), - selected: true, - child: new Text('Stock List') - ), - new DrawerItem( - icon: new Icon(Icons.account_balance), - onPressed: null, - child: new Text('Account Balance') - ), - new DrawerItem( - icon: new Icon(Icons.dvr), - onPressed: () { - try { - debugDumpApp(); - debugDumpRenderTree(); - debugDumpLayerTree(); - debugDumpSemanticsTree(); - } catch (e, stack) { - debugPrint('Exception while dumping app:\n$e\n$stack'); - } - }, - child: new Text('Dump App to Console') - ), - new Divider(), - new DrawerItem( - icon: new Icon(Icons.thumb_up), - onPressed: () => _handleStockModeChange(StockMode.optimistic), - child: new Row( - children: [ - new Expanded(child: new Text('Optimistic')), - new Radio(value: StockMode.optimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange) - ] - ) - ), - new DrawerItem( - icon: new Icon(Icons.thumb_down), - onPressed: () => _handleStockModeChange(StockMode.pessimistic), - child: new Row( - children: [ - new Expanded(child: new Text('Pessimistic')), - new Radio(value: StockMode.pessimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange) - ] - ) - ), - new Divider(), - new DrawerItem( - icon: new Icon(Icons.settings), - onPressed: _handleShowSettings, - child: new Text('Settings')), - new DrawerItem( - icon: new Icon(Icons.help), - onPressed: _handleShowAbout, - child: new Text('About')) - ]) + child: new ScrollView( + children: [ + new DrawerHeader(child: new Center(child: new Text('Stocks'))), + new DrawerItem( + icon: new Icon(Icons.assessment), + selected: true, + child: new Text('Stock List') + ), + new DrawerItem( + icon: new Icon(Icons.account_balance), + onPressed: null, + child: new Text('Account Balance') + ), + new DrawerItem( + icon: new Icon(Icons.dvr), + onPressed: () { + try { + debugDumpApp(); + debugDumpRenderTree(); + debugDumpLayerTree(); + debugDumpSemanticsTree(); + } catch (e, stack) { + debugPrint('Exception while dumping app:\n$e\n$stack'); + } + }, + child: new Text('Dump App to Console') + ), + new Divider(), + new DrawerItem( + icon: new Icon(Icons.thumb_up), + onPressed: () => _handleStockModeChange(StockMode.optimistic), + child: new Row( + children: [ + new Expanded(child: new Text('Optimistic')), + new Radio(value: StockMode.optimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange) + ] + ) + ), + new DrawerItem( + icon: new Icon(Icons.thumb_down), + onPressed: () => _handleStockModeChange(StockMode.pessimistic), + child: new Row( + children: [ + new Expanded(child: new Text('Pessimistic')), + new Radio(value: StockMode.pessimistic, groupValue: config.configuration.stockMode, onChanged: _handleStockModeChange) + ] + ) + ), + new Divider(), + new DrawerItem( + icon: new Icon(Icons.settings), + onPressed: _handleShowSettings, + child: new Text('Settings')), + new DrawerItem( + icon: new Icon(Icons.help), + onPressed: _handleShowAbout, + child: new Text('About')) + ] + ) ); } diff --git a/examples/stocks/lib/stock_settings.dart b/examples/stocks/lib/stock_settings.dart index 5b61d6a43ce..32d4c06840e 100644 --- a/examples/stocks/lib/stock_settings.dart +++ b/examples/stocks/lib/stock_settings.dart @@ -241,8 +241,8 @@ class StockSettingsState extends State { return true; }); return new Block( + padding: const EdgeInsets.symmetric(vertical: 20.0), children: rows, - padding: const EdgeInsets.symmetric(vertical: 20.0) ); } diff --git a/examples/stocks/lib/stock_symbol_viewer.dart b/examples/stocks/lib/stock_symbol_viewer.dart index 0dd10aa3bb2..0b12771e17e 100644 --- a/examples/stocks/lib/stock_symbol_viewer.dart +++ b/examples/stocks/lib/stock_symbol_viewer.dart @@ -73,22 +73,20 @@ class StockSymbolPage extends StatelessWidget { appBar: new AppBar( title: new Text(stock.name) ), - body: new Block( - children: [ - new Container( - margin: new EdgeInsets.all(20.0), - child: new Card( - child: new _StockSymbolView( - stock: stock, - arrow: new Hero( - tag: stock, - turns: 2, - child: new StockArrow(percentChange: stock.percentChange) - ) + body: new SingleChildScrollView( + child: new Container( + margin: new EdgeInsets.all(20.0), + child: new Card( + child: new _StockSymbolView( + stock: stock, + arrow: new Hero( + tag: stock, + turns: 2, + child: new StockArrow(percentChange: stock.percentChange) ) ) ) - ] + ) ) ); } diff --git a/packages/flutter/bin/loader/loader_app.dart b/packages/flutter/bin/loader/loader_app.dart index 32f17c2f5e9..e2df8ade4c9 100644 --- a/packages/flutter/bin/loader/loader_app.dart +++ b/packages/flutter/bin/loader/loader_app.dart @@ -39,7 +39,7 @@ void main() { children.add(const SizedBox(height: 18.0)); children.add(new Center(child: new CircularProgressIndicator(value: progressMax > 0 ? progress / progressMax : null))); } - return new Block(children: children); + return new ScrollView(children: children); }, ), ), @@ -114,4 +114,4 @@ class LoaderBinding extends WidgetsFlutterBinding { } ); } -} \ No newline at end of file +}