Scaffold should wrap its body in a Material

Fixes #1669

examples/address_book/lib/main.dart

@@ -60,8 +60,7 @@ class AddressBookHome extends StatelessComponent {
   static final GlobalKey noteKey = new GlobalKey(label: 'note field');
 
   Widget buildBody(BuildContext context) {
-    return new Material(
-      child: new Block([
+    return new Block([
       new AspectRatio(
         aspectRatio: 16.0 / 9.0,
         child: new Container(
@@ -74,8 +73,7 @@ class AddressBookHome extends StatelessComponent {
       new Field(inputKey: addressKey, icon: "maps/place", placeholder: "Address"),
       new Field(inputKey: ringtoneKey, icon: "av/volume_up", placeholder: "Ringtone"),
       new Field(inputKey: noteKey, icon: "content/add", placeholder: "Add note"),
-      ])
-    );
+    ]);
   }
 
   Widget build(BuildContext context) {

examples/fitness/lib/feed.dart

@@ -14,13 +14,11 @@ class FitnessItemList extends StatelessComponent {
   final FitnessItemHandler onDismissed;
 
   Widget build(BuildContext context) {
-    return new Material(
-      child: new ScrollableList<FitnessItem>(
+    return new ScrollableList<FitnessItem>(
       padding: const EdgeDims.all(4.0),
       items: items,
       itemExtent: kFitnessItemHeight,
       itemBuilder: (_, item) => item.toRow(onDismissed: onDismissed)
-      )
     );
   }
 }
@@ -171,14 +169,13 @@ class FeedFragmentState extends State<FeedFragment> {
   Widget buildBody() {
     TextStyle style = Theme.of(context).text.title;
     if (config.userData == null)
-      return new Material();
-    if (config.userData.items.length == 0)
-      return new Material(
-        child: new Row(
+      return new Container();
+    if (config.userData.items.length == 0) {
+      return new Row(
         [new Text("No data yet.\nAdd some!", style: style)],
         justifyContent: FlexJustifyContent.center
-        )
       );
+    }
     switch (_fitnessMode) {
       case FitnessMode.feed:
         return new FitnessItemList(
@@ -186,11 +183,9 @@ class FeedFragmentState extends State<FeedFragment> {
           onDismissed: _handleItemDismissed
         );
       case FitnessMode.chart:
-        return new Material(
-          child: new Container(
+        return new Container(
           padding: const EdgeDims.all(20.0),
           child: buildChart()
-          )
         );
     }
   }

examples/fitness/lib/meal.dart

@@ -85,8 +85,7 @@ class MealFragmentState extends State<MealFragment> {
 
   Widget buildBody() {
     Meal meal = new Meal(when: new DateTime.now());
-    return new Material(
-      child: new ScrollableViewport(
+    return new ScrollableViewport(
       child: new Container(
         padding: const EdgeDims.all(20.0),
         child: new BlockBody([
@@ -98,7 +97,6 @@ class MealFragmentState extends State<MealFragment> {
           ),
         ])
       )
-      )
     );
   }
 

examples/fitness/lib/measurement.dart

@@ -172,8 +172,7 @@ class MeasurementFragmentState extends State<MeasurementFragment> {
   Widget buildBody(BuildContext context) {
     Measurement measurement = new Measurement(when: _when);
     // TODO(jackson): Revisit the layout of this pane to be more maintainable
-    return new Material(
-      child: new Container(
+    return new Container(
       padding: const EdgeDims.all(20.0),
       child: new Column([
         new GestureDetector(
@@ -193,7 +192,6 @@ class MeasurementFragmentState extends State<MeasurementFragment> {
           onChanged: _handleWeightChanged
         ),
       ], alignItems: FlexAlignItems.stretch)
-      )
     );
   }
 

examples/fitness/lib/settings.dart

@@ -92,8 +92,7 @@ class SettingsFragmentState extends State<SettingsFragment> {
   }
 
   Widget buildSettingsPane(BuildContext context) {
-    return new Material(
-      child: new ScrollableViewport(
+    return new ScrollableViewport(
       child: new Container(
         padding: const EdgeDims.symmetric(vertical: 20.0),
         child: new BlockBody([
@@ -115,7 +114,6 @@ class SettingsFragmentState extends State<SettingsFragment> {
           ),
         ])
       )
-      )
     );
   }
 

examples/stocks/lib/stock_list.dart

@@ -12,8 +12,7 @@ class StockList extends StatelessComponent {
   final StockRowActionCallback onAction;
 
   Widget build(BuildContext context) {
-    return new Material(
-      child: new ScrollableList<Stock>(
+    return new ScrollableList<Stock>(
       items: stocks,
       itemExtent: StockRow.kHeight,
       itemBuilder: (BuildContext context, Stock stock) {
@@ -23,7 +22,6 @@ class StockList extends StatelessComponent {
           onLongPressed: onAction
         );
       }
-      )
     );
   }
 }

examples/stocks/lib/stock_settings.dart

@@ -83,8 +83,7 @@ class StockSettingsState extends State<StockSettings> {
   Widget buildSettingsPane(BuildContext context) {
     // TODO(ianh): Once we have the gesture API hooked up, fix https://github.com/domokit/mojo/issues/281
     // (whereby tapping the widgets below causes both the widget and the menu item to fire their callbacks)
-    return new Material(
-      child: new ScrollableViewport(
+    return new ScrollableViewport(
       child: new Container(
         padding: const EdgeDims.symmetric(vertical: 20.0),
         child: new BlockBody(<Widget>[
@@ -112,7 +111,6 @@ class StockSettingsState extends State<StockSettings> {
           ),
         ])
       )
-      )
     );
   }
 

examples/stocks/lib/stock_symbol_viewer.dart

@@ -32,8 +32,7 @@ class StockSymbolViewerState extends State<StockSymbolViewer> {
         ),
         center: new Text('${config.stock.name} (${config.stock.symbol})')
       ),
-      body: new Material(
-        child: new Block(<Widget>[
+      body: new Block(<Widget>[
         new Container(
           padding: new EdgeDims.all(20.0),
           child: new Column(<Widget>[
@@ -49,7 +48,6 @@ class StockSymbolViewerState extends State<StockSymbolViewer> {
           )
         )
       ])
-      )
     );
   }
 

examples/widgets/date_picker.dart

@@ -34,13 +34,11 @@ class DatePickerDemoState extends State<DatePickerDemo> {
       child: new Stack([
         new Scaffold(
           toolBar: new ToolBar(center: new Text("Date Picker")),
-          body: new Material(
-            child: new Row(
+          body: new Row(
             [new Text(_dateTime.toString())],
             alignItems: FlexAlignItems.end,
             justifyContent: FlexJustifyContent.center
           )
-          )
         ),
         new Dialog(
           content: new DatePicker(

examples/widgets/drag_and_drop.dart

@@ -103,8 +103,7 @@ class DragAndDropAppState extends State<DragAndDropApp> {
       toolBar: new ToolBar(
         center: new Text('Drag and Drop Flutter Demo')
       ),
-      body: new Material(
-        child: new DefaultTextStyle(
+      body: new DefaultTextStyle(
         style: Theme.of(context).text.body1.copyWith(textAlign: TextAlign.center),
         child: new Column([
           new Flexible(child: new Row([
@@ -123,7 +122,6 @@ class DragAndDropAppState extends State<DragAndDropApp> {
           ])),
         ])
       )
-      )
     );
   }
 }

examples/widgets/indexed_stack.dart

@@ -40,8 +40,6 @@ class IndexedStackDemoState extends State<IndexedStackDemo> {
       toolBar: new ToolBar(center: new Text('IndexedStackDemo Demo')),
       body: new GestureDetector(
         onTap: _handleTap,
-        child: new Container(
-          decoration: new BoxDecoration(backgroundColor: Theme.of(context).primarySwatch[50]),
         child: new Center(
           child: new Container(
             child: indexedStack,
@@ -50,7 +48,6 @@ class IndexedStackDemoState extends State<IndexedStackDemo> {
           )
         )
       )
-      )
     );
   }
 }

examples/widgets/overlay_geometry.dart

@@ -139,7 +139,6 @@ class OverlayGeometryAppState extends State<OverlayGeometryApp> {
         toolBar: new ToolBar(center: new Text('Tap a Card')),
         body: new Container(
           padding: const EdgeDims.symmetric(vertical: 12.0, horizontal: 8.0),
-          decoration: new BoxDecoration(backgroundColor: Theme.of(context).primarySwatch[50]),
           child: new ScrollableMixedWidgetList(
             builder: builder,
             token: cardModels.length,

examples/widgets/pageable_list.dart

@@ -137,10 +137,7 @@ class PageableListAppState extends State<PageableListApp> {
     );
     return new SizeObserver(
       callback: updatePageSize,
-      child: new Container(
-        child: list,
-        decoration: new BoxDecoration(backgroundColor: Theme.of(context).primarySwatch[50])
-      )
+      child: list
     );
   }
 

examples/widgets/progress_indicator.dart

@@ -82,7 +82,6 @@ class ProgressIndicatorAppState extends State<ProgressIndicatorApp> {
       onTap: handleTap,
       child: new Container(
         padding: const EdgeDims.symmetric(vertical: 12.0, horizontal: 8.0),
-        decoration: new BoxDecoration(backgroundColor: Theme.of(context).cardColor),
         child: new BuilderTransition(
           variables: [valueAnimation.variable],
           performance: valueAnimation.view,

examples/widgets/scale.dart

@@ -60,14 +60,12 @@ class ScaleAppState extends State<ScaleApp> {
       child: new Scaffold(
         toolBar: new ToolBar(
             center: new Text('Scale Demo')),
-        body: new Material(
-          child: new GestureDetector(
+        body: new GestureDetector(
           onScaleStart: _handleScaleStart,
           onScaleUpdate: _handleScaleUpdate,
           child: new CustomPaint(callback: paint, token: "$_zoom $_offset")
         )
       )
-      )
     );
   }
 }

examples/widgets/scrollbar.dart

@@ -49,7 +49,6 @@ class ScrollbarAppState extends State<ScrollbarApp> {
     return new Scaffold(
       toolBar: new ToolBar(center: new Text('Scrollbar Demo')),
       body: new Container(
-        decoration: new BoxDecoration(backgroundColor: Theme.of(context).primarySwatch[50]),
         padding: new EdgeDims.all(12.0),
         child: new Center(child: new Card(child: scrollable))
       )

examples/widgets/sector.dart

@@ -68,8 +68,7 @@ class SectorAppState extends State<SectorApp> {
   }
 
   Widget buildBody() {
-    return new Material(
-      child: new Column(<Widget>[
+    return new Column(<Widget>[
         new Container(
           padding: new EdgeDims.symmetric(horizontal: 8.0, vertical: 25.0),
           child: new Row(<Widget>[
@@ -117,7 +116,6 @@ class SectorAppState extends State<SectorApp> {
         ),
       ],
       justifyContent: FlexJustifyContent.spaceBetween
-      )
     );
   }
 

examples/widgets/tabs.dart

@@ -96,9 +96,8 @@ class TabbedNavigatorAppState extends State<TabbedNavigatorApp> {
 
   Container _buildCard(BuildContext context, TabNavigator tabNavigator) {
     return new Container(
-     child: new Card(child: new Padding(child: tabNavigator, padding: const EdgeDims.all(8.0))),
       padding: const EdgeDims.all(12.0),
-     decoration: new BoxDecoration(backgroundColor: Theme.of(context).primarySwatch[100])
+      child: new Card(child: new Padding(child: tabNavigator, padding: const EdgeDims.all(8.0)))
     );
   }
 

packages/flutter/lib/src/material/scaffold.dart

@@ -7,6 +7,7 @@ import 'dart:ui' as ui;
 import 'package:flutter/widgets.dart';
 
 import 'constants.dart';
+import 'material.dart';
 
 class Scaffold extends StatelessComponent {
   Scaffold({
@@ -38,7 +39,9 @@ class Scaffold extends StatelessComponent {
     if (body != null) {
       children.add(new Positioned(
         top: toolBarHeight, right: 0.0, bottom: statusBarHeight, left: 0.0,
+        child: new Material(
           child: body
+        )
       ));
     }