Index: sky/examples/widgets/sector.dart |
diff --git a/sky/examples/widgets/sector.dart b/sky/examples/widgets/sector.dart |
index d4f13ecfee7c329d88ebabf1b9068373c7076a45..24fb4a5c5e05a44f338a4b44ecb15567a7393d48 100644 |
--- a/sky/examples/widgets/sector.dart |
+++ b/sky/examples/widgets/sector.dart |
@@ -7,13 +7,15 @@ import 'dart:math' as math; |
import 'package:sky/rendering/box.dart'; |
import 'package:sky/rendering/flex.dart'; |
import 'package:sky/rendering/sky_binding.dart'; |
-import 'package:sky/theme/colors.dart'; |
+import 'package:sky/theme/colors.dart' as colors; |
import 'package:sky/theme/edges.dart'; |
-import 'package:sky/theme/typography.dart'; |
+import 'package:sky/theme/theme_data.dart'; |
+import 'package:sky/theme/typography.dart' as typography; |
import 'package:sky/widgets/basic.dart'; |
import 'package:sky/widgets/material.dart'; |
import 'package:sky/widgets/raised_button.dart'; |
import 'package:sky/widgets/scaffold.dart'; |
+import 'package:sky/widgets/theme.dart'; |
import 'package:sky/widgets/tool_bar.dart'; |
import 'package:sky/widgets/widget.dart'; |
@@ -74,61 +76,63 @@ class SectorApp extends App { |
} |
Widget build() { |
- return new Scaffold( |
- toolbar: new ToolBar( |
- center: new Text('Sector Layout in a Widget Tree', style: white.title), |
- backgroundColor: Blue[500]), |
- body: new Material( |
- edge: MaterialEdge.canvas, |
- child: new Flex([ |
- new Container( |
- padding: new EdgeDims.symmetric(horizontal: 8.0, vertical: 25.0), |
- child: new Flex([ |
- new RaisedButton( |
- enabled: enabledAdd, |
- child: new ShrinkWrapWidth( |
- child: new Flex([ |
- new Container( |
- padding: new EdgeDims.all(4.0), |
- margin: new EdgeDims.only(right: 10.0), |
- child: new WidgetToRenderBoxAdapter(sectorAddIcon) |
- ), |
- new Text('ADD SECTOR'), |
- ]) |
+ return new Theme( |
+ data: new ThemeData(color: colors.Blue, text: typography.white), |
+ child: new Scaffold( |
+ toolbar: new ToolBar( |
+ center: new Text('Sector Layout in a Widget Tree', style: typography.white.title)), |
+ body: new Material( |
+ edge: MaterialEdge.canvas, |
+ child: new Flex([ |
+ new Container( |
+ padding: new EdgeDims.symmetric(horizontal: 8.0, vertical: 25.0), |
+ child: new Flex([ |
+ new RaisedButton( |
+ enabled: enabledAdd, |
+ child: new ShrinkWrapWidth( |
+ child: new Flex([ |
+ new Container( |
+ padding: new EdgeDims.all(4.0), |
+ margin: new EdgeDims.only(right: 10.0), |
+ child: new WidgetToRenderBoxAdapter(sectorAddIcon) |
+ ), |
+ new Text('ADD SECTOR'), |
+ ]) |
+ ), |
+ onPressed: addSector |
), |
- onPressed: addSector |
+ new RaisedButton( |
+ enabled: enabledRemove, |
+ child: new ShrinkWrapWidth( |
+ child: new Flex([ |
+ new Container( |
+ padding: new EdgeDims.all(4.0), |
+ margin: new EdgeDims.only(right: 10.0), |
+ child: new WidgetToRenderBoxAdapter(sectorRemoveIcon) |
+ ), |
+ new Text('REMOVE SECTOR'), |
+ ]) |
+ ), |
+ onPressed: removeSector |
+ ) |
+ ], |
+ justifyContent: FlexJustifyContent.spaceAround |
+ ) |
+ ), |
+ new Flexible( |
+ child: new Container( |
+ margin: new EdgeDims.all(8.0), |
+ decoration: new BoxDecoration( |
+ border: new Border.all(new BorderSide(color: new Color(0xFF000000))) |
), |
- new RaisedButton( |
- enabled: enabledRemove, |
- child: new ShrinkWrapWidth( |
- child: new Flex([ |
- new Container( |
- padding: new EdgeDims.all(4.0), |
- margin: new EdgeDims.only(right: 10.0), |
- child: new WidgetToRenderBoxAdapter(sectorRemoveIcon) |
- ), |
- new Text('REMOVE SECTOR'), |
- ]) |
- ), |
- onPressed: removeSector |
- ) |
- ], |
- justifyContent: FlexJustifyContent.spaceAround |
- ) |
- ), |
- new Flexible( |
- child: new Container( |
- margin: new EdgeDims.all(8.0), |
- decoration: new BoxDecoration( |
- border: new Border.all(new BorderSide(color: new Color(0xFF000000))) |
- ), |
- padding: new EdgeDims.all(8.0), |
- child: new WidgetToRenderBoxAdapter(sectors) |
- ) |
- ), |
- ], |
- direction: FlexDirection.vertical, |
- justifyContent: FlexJustifyContent.spaceBetween |
+ padding: new EdgeDims.all(8.0), |
+ child: new WidgetToRenderBoxAdapter(sectors) |
+ ) |
+ ), |
+ ], |
+ direction: FlexDirection.vertical, |
+ justifyContent: FlexJustifyContent.spaceBetween |
+ ) |
) |
) |
); |