Commit 1251f01e authored by Adam Barth's avatar Adam Barth

Convert some Columns into Blocks (#3210)

These columns were secretly re-creating Block in a more complex way. Now we
just use Block directly.
parent e456d863
...@@ -159,12 +159,8 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> { ...@@ -159,12 +159,8 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
) )
] ]
), ),
body: new Padding( body: new Block(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
child: new ScrollableViewport(
child: new Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.collapse,
children: <Widget>[ children: <Widget>[
new Container( new Container(
padding: const EdgeInsets.symmetric(vertical: 8.0), padding: const EdgeInsets.symmetric(vertical: 8.0),
...@@ -187,8 +183,7 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> { ...@@ -187,8 +183,7 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
) )
), ),
new Column( new Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
new Text('From', style: theme.textTheme.caption), new Text('From', style: theme.textTheme.caption),
new DateTimeItem( new DateTimeItem(
...@@ -203,8 +198,7 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> { ...@@ -203,8 +198,7 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
] ]
), ),
new Column( new Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
new Text('To', style: theme.textTheme.caption), new Text('To', style: theme.textTheme.caption),
new DateTimeItem( new DateTimeItem(
...@@ -247,8 +241,6 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> { ...@@ -247,8 +241,6 @@ class FullScreenDialogDemoState extends State<FullScreenDialogDemo> {
}) })
.toList() .toList()
) )
)
)
); );
} }
} }
...@@ -38,9 +38,7 @@ class ListDemoState extends State<ListDemo> { ...@@ -38,9 +38,7 @@ class ListDemoState extends State<ListDemo> {
decoration: new BoxDecoration( decoration: new BoxDecoration(
border: new Border(top: new BorderSide(color: Colors.black26)) border: new Border(top: new BorderSide(color: Colors.black26))
), ),
child: new Column( child: new Block(
mainAxisAlignment: MainAxisAlignment.collapse,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
new ListItem( new ListItem(
dense: true, dense: true,
......
...@@ -19,8 +19,7 @@ class TooltipDemo extends StatelessWidget { ...@@ -19,8 +19,7 @@ class TooltipDemo extends StatelessWidget {
), ),
body: new Builder( body: new Builder(
builder: (BuildContext context) { builder: (BuildContext context) {
return new Column( return new Block(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
new Text(_introText, style: theme.textTheme.subhead), new Text(_introText, style: theme.textTheme.subhead),
new Row( new Row(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment