From be7074806ca8f07d3f2a8ca0ca03fd24c3eaa416 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 12 Oct 2015 09:36:47 -0700 Subject: [PATCH] Change the default MaterialType to canvas Canvas is by far the most popular type of material by call site (and makes for a faster default because it doesn't have a RRect clip). --- examples/demo_launcher/lib/main.dart | 1 - examples/fitness/lib/feed.dart | 5 +---- examples/fitness/lib/meal.dart | 1 - examples/fitness/lib/measurement.dart | 1 - examples/fitness/lib/settings.dart | 1 - examples/stocks/lib/stock_list.dart | 1 - examples/stocks/lib/stock_settings.dart | 1 - examples/stocks/lib/stock_symbol_viewer.dart | 1 - examples/widgets/scale.dart | 1 - examples/widgets/sector.dart | 1 - sky/packages/sky/lib/src/material/dialog.dart | 1 + sky/packages/sky/lib/src/material/material.dart | 2 +- sky/packages/sky/lib/src/material/snack_bar.dart | 1 - 13 files changed, 3 insertions(+), 15 deletions(-) diff --git a/examples/demo_launcher/lib/main.dart b/examples/demo_launcher/lib/main.dart index 4d3be4e08..f2ed11c69 100644 --- a/examples/demo_launcher/lib/main.dart +++ b/examples/demo_launcher/lib/main.dart @@ -193,7 +193,6 @@ class DemoHome extends StatelessComponent { return new Scaffold( toolBar: new ToolBar(center: new Text('Sky Demos')), body: new Material( - type: MaterialType.canvas, child: new DemoList() ) ); diff --git a/examples/fitness/lib/feed.dart b/examples/fitness/lib/feed.dart index cf075f0f8..cbb9922be 100644 --- a/examples/fitness/lib/feed.dart +++ b/examples/fitness/lib/feed.dart @@ -15,7 +15,6 @@ class FitnessItemList extends StatelessComponent { Widget build(BuildContext context) { return new Material( - type: MaterialType.canvas, child: new ScrollableList( padding: const EdgeDims.all(4.0), items: items, @@ -172,10 +171,9 @@ class FeedFragmentState extends State { Widget buildBody() { TextStyle style = Theme.of(context).text.title; if (config.userData == null) - return new Material(type: MaterialType.canvas); + return new Material(); if (config.userData.items.length == 0) return new Material( - type: MaterialType.canvas, child: new Row( [new Text("No data yet.\nAdd some!", style: style)], justifyContent: FlexJustifyContent.center @@ -189,7 +187,6 @@ class FeedFragmentState extends State { ); case FitnessMode.chart: return new Material( - type: MaterialType.canvas, child: new Container( padding: const EdgeDims.all(20.0), child: buildChart() diff --git a/examples/fitness/lib/meal.dart b/examples/fitness/lib/meal.dart index f7e94f06a..ea96b91ba 100644 --- a/examples/fitness/lib/meal.dart +++ b/examples/fitness/lib/meal.dart @@ -86,7 +86,6 @@ class MealFragmentState extends State { Widget buildBody() { Meal meal = new Meal(when: new DateTime.now()); return new Material( - type: MaterialType.canvas, child: new ScrollableViewport( child: new Container( padding: const EdgeDims.all(20.0), diff --git a/examples/fitness/lib/measurement.dart b/examples/fitness/lib/measurement.dart index 5adbca1f6..83b8c88cc 100644 --- a/examples/fitness/lib/measurement.dart +++ b/examples/fitness/lib/measurement.dart @@ -173,7 +173,6 @@ class MeasurementFragmentState extends State { Measurement measurement = new Measurement(when: _when); // TODO(jackson): Revisit the layout of this pane to be more maintainable return new Material( - type: MaterialType.canvas, child: new Container( padding: const EdgeDims.all(20.0), child: new Column([ diff --git a/examples/fitness/lib/settings.dart b/examples/fitness/lib/settings.dart index 983181834..5c6035290 100644 --- a/examples/fitness/lib/settings.dart +++ b/examples/fitness/lib/settings.dart @@ -93,7 +93,6 @@ class SettingsFragmentState extends State { Widget buildSettingsPane(BuildContext context) { return new Material( - type: MaterialType.canvas, child: new ScrollableViewport( child: new Container( padding: const EdgeDims.symmetric(vertical: 20.0), diff --git a/examples/stocks/lib/stock_list.dart b/examples/stocks/lib/stock_list.dart index 54c55c088..c49078626 100644 --- a/examples/stocks/lib/stock_list.dart +++ b/examples/stocks/lib/stock_list.dart @@ -13,7 +13,6 @@ class StockList extends StatelessComponent { Widget build(BuildContext context) { return new Material( - type: MaterialType.canvas, child: new ScrollableList( items: stocks, itemExtent: StockRow.kHeight, diff --git a/examples/stocks/lib/stock_settings.dart b/examples/stocks/lib/stock_settings.dart index 3686a737f..1be3c8266 100644 --- a/examples/stocks/lib/stock_settings.dart +++ b/examples/stocks/lib/stock_settings.dart @@ -84,7 +84,6 @@ class StockSettingsState extends State { // 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( - type: MaterialType.canvas, child: new ScrollableViewport( child: new Container( padding: const EdgeDims.symmetric(vertical: 20.0), diff --git a/examples/stocks/lib/stock_symbol_viewer.dart b/examples/stocks/lib/stock_symbol_viewer.dart index f2407c082..3f73b08a1 100644 --- a/examples/stocks/lib/stock_symbol_viewer.dart +++ b/examples/stocks/lib/stock_symbol_viewer.dart @@ -33,7 +33,6 @@ class StockSymbolViewerState extends State { center: new Text('${config.stock.name} (${config.stock.symbol})') ), body: new Material( - type: MaterialType.canvas, child: new Block([ new Container( padding: new EdgeDims.all(20.0), diff --git a/examples/widgets/scale.dart b/examples/widgets/scale.dart index 47824c82f..03c1b92c1 100644 --- a/examples/widgets/scale.dart +++ b/examples/widgets/scale.dart @@ -61,7 +61,6 @@ class ScaleAppState extends State { toolBar: new ToolBar( center: new Text('Scale Demo')), body: new Material( - type: MaterialType.canvas, child: new GestureDetector( onScaleStart: _handleScaleStart, onScaleUpdate: _handleScaleUpdate, diff --git a/examples/widgets/sector.dart b/examples/widgets/sector.dart index 624ba1541..0b7812118 100644 --- a/examples/widgets/sector.dart +++ b/examples/widgets/sector.dart @@ -65,7 +65,6 @@ class SectorApp extends MaterialApp { Widget buildBody() { return new Material( - type: MaterialType.canvas, child: new Column([ new Container( padding: new EdgeDims.symmetric(horizontal: 8.0, vertical: 25.0), diff --git a/sky/packages/sky/lib/src/material/dialog.dart b/sky/packages/sky/lib/src/material/dialog.dart index 596ceb61f..1f60f36f9 100644 --- a/sky/packages/sky/lib/src/material/dialog.dart +++ b/sky/packages/sky/lib/src/material/dialog.dart @@ -118,6 +118,7 @@ class Dialog extends StatelessComponent { child: new Material( level: 4, color: _getColor(context), + type: MaterialType.card, child: new IntrinsicWidth( child: new Block(dialogBody) ) diff --git a/sky/packages/sky/lib/src/material/material.dart b/sky/packages/sky/lib/src/material/material.dart index 03080432d..dcfbd2113 100644 --- a/sky/packages/sky/lib/src/material/material.dart +++ b/sky/packages/sky/lib/src/material/material.dart @@ -23,7 +23,7 @@ class Material extends StatelessComponent { Material({ Key key, this.child, - this.type: MaterialType.card, + this.type: MaterialType.canvas, this.level: 0, this.color, this.textStyle diff --git a/sky/packages/sky/lib/src/material/snack_bar.dart b/sky/packages/sky/lib/src/material/snack_bar.dart index 7aa793e22..8b631d0ce 100644 --- a/sky/packages/sky/lib/src/material/snack_bar.dart +++ b/sky/packages/sky/lib/src/material/snack_bar.dart @@ -79,7 +79,6 @@ class SnackBar extends StatelessComponent { child: new Material( level: 2, color: _kSnackBackground, - type: MaterialType.canvas, child: new Container( margin: const EdgeDims.symmetric(horizontal: _kSideMargins), child: new DefaultTextStyle(