Merge pull request #1556 from abarth/split_widgets

Split material design widgets out of widgets.dart

examples/address_book/lib/main.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/widgets.dart';
 
 class Field extends StatelessComponent {
   Field({

examples/demo_launcher/lib/main.dart

@@ -5,7 +5,6 @@
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets.dart';
 
 AssetBundle _initBundle() {
   if (rootBundle != null)

examples/fitness/lib/main.dart

@@ -7,7 +7,6 @@ library fitness;
 import 'package:playfair/playfair.dart' as playfair;
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/widgets.dart';
 
 import 'user_data.dart';
 import 'date_utils.dart';

examples/game/lib/main.dart

@@ -8,7 +8,6 @@ import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets.dart';
 import 'package:skysprites/skysprites.dart';
 
 import 'game_demo.dart';

examples/mine_digger/lib/main.dart

@@ -8,7 +8,6 @@ import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets.dart';
 
 // Classic minesweeper-inspired game. The mouse controls are standard
 // except for left + right combo which is not implemented. For touch,

examples/stocks/lib/main.dart

@@ -11,7 +11,6 @@ import 'dart:sky' as sky;
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/widgets.dart';
 
 import 'stock_data.dart';
 

examples/widgets/big_switch.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/widgets.dart';
 
 class BigSwitch extends StatefulComponent {
   BigSwitch({ this.scale });

examples/widgets/card_collection.dart

@@ -6,7 +6,6 @@ import 'dart:sky' as sky;
 
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/widgets.dart';
 
 class CardModel {
   CardModel(this.value, this.height) {

examples/widgets/container.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/widgets.dart';
+import 'package:sky/material.dart';
 
 class ContainerApp extends StatelessComponent {
   Widget build(BuildContext context) {

examples/widgets/date_picker.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/widgets.dart';
 import 'package:sky/material.dart';
 
 void main() => runApp(new DatePickerDemo());

examples/widgets/drag_and_drop.dart

@@ -5,7 +5,6 @@
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 class DragData {
   DragData(this.text);

examples/widgets/ensure_visible.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/widgets.dart';
 
 class CardModel {
   CardModel(this.value, this.height, this.color);

examples/widgets/indexed_stack.dart

@@ -4,7 +4,6 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 class IndexedStackDemo extends StatefulComponent {
   IndexedStackDemo({ this.navigator });

examples/widgets/navigation.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/widgets.dart';
 
 final Map<String, RouteBuilder> routes = <String, RouteBuilder>{
   '/': (RouteArguments args) => new Container(

examples/widgets/overlay_geometry.dart

@@ -6,7 +6,6 @@ import 'dart:sky' as sky;
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 class CardModel {
   CardModel(this.value, this.height, this.color);

examples/widgets/pageable_list.dart

@@ -4,7 +4,6 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/widgets.dart';
 
 class CardModel {
   CardModel(this.value, this.size, this.color);

examples/widgets/piano.dart

@@ -7,7 +7,6 @@ import 'package:sky_services/media/media.mojom.dart';
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets.dart';
 
 // All of these sounds are marked as public domain at soundbible.
 const String chimes = "http://soundbible.com/grab.php?id=2030&type=wav";

examples/widgets/progress_indicator.dart

@@ -4,7 +4,6 @@
 
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
-import 'package:sky/widgets.dart';
 
 class ProgressIndicatorApp extends StatefulComponent {
   ProgressIndicatorAppState createState() => new ProgressIndicatorAppState();

examples/widgets/scale.dart

@@ -4,7 +4,6 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 class ScaleApp extends StatefulComponent {
   ScaleAppState createState() => new ScaleAppState();

examples/widgets/sector.dart

@@ -4,8 +4,8 @@
 
 import 'dart:math' as math;
 
+import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 import '../rendering/sector_layout.dart';
 

examples/widgets/spinning_mixed.dart

@@ -5,8 +5,8 @@
 import 'dart:sky' as sky;
 
 import 'package:sky/animation.dart';
+import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 import '../rendering/solid_color_box.dart';
 

examples/widgets/styled_text.dart

@@ -4,7 +4,6 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
 
 class StyledTextApp extends StatefulComponent {
   StyledTextAppState createState() => new StyledTextAppState();

examples/widgets/tabs.dart

@@ -4,7 +4,6 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/widgets.dart';
 
 class TabbedNavigatorApp extends StatefulComponent {
   TabbedNavigatorAppState createState() => new TabbedNavigatorAppState();

packages/flutter/lib/material.dart

@@ -7,9 +7,40 @@
 /// See https://www.google.com/design/spec/material-design/introduction.html
 library material;
 
+export 'src/material/app.dart';
+export 'src/material/card.dart';
+export 'src/material/checkbox.dart';
 export 'src/material/colors.dart';
+export 'src/material/constants.dart';
+export 'src/material/date_picker.dart';
+export 'src/material/dialog.dart';
+export 'src/material/drawer.dart';
+export 'src/material/drawer_divider.dart';
+export 'src/material/drawer_header.dart';
+export 'src/material/drawer_item.dart';
 export 'src/material/edges.dart';
+export 'src/material/flat_button.dart';
+export 'src/material/floating_action_button.dart';
+export 'src/material/icon_button.dart';
+export 'src/material/icon.dart';
+export 'src/material/ink_well.dart';
+export 'src/material/input.dart';
+export 'src/material/material_button.dart';
+export 'src/material/material.dart';
+export 'src/material/popup_menu.dart';
+export 'src/material/popup_menu_item.dart';
+export 'src/material/progress_indicator.dart';
+export 'src/material/radio.dart';
+export 'src/material/raised_button.dart';
+export 'src/material/scaffold.dart';
 export 'src/material/shadows.dart';
+export 'src/material/snack_bar.dart';
+export 'src/material/switch.dart';
+export 'src/material/tabs.dart';
+export 'src/material/theme.dart';
 export 'src/material/theme_data.dart';
+export 'src/material/title.dart';
+export 'src/material/tool_bar.dart';
 export 'src/material/typography.dart';
-export 'src/material/constants.dart';
+
+export 'widgets.dart';

packages/flutter/lib/src/widgets/app.dart → packages/flutter/lib/src/material/app.dart

@@ -7,12 +7,10 @@ import 'dart:sky' as sky;
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/services.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/binding.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/navigator.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/title.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
+import 'title.dart';
 
 const TextStyle _errorTextStyle = const TextStyle(
   color: const Color(0xD0FF0000),

packages/flutter/lib/src/widgets/card.dart → packages/flutter/lib/src/material/card.dart

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/material.dart';
+import 'package:sky/widgets.dart';
+
+import 'material.dart';
 
 const EdgeDims _kCardMargins = const EdgeDims.all(4.0);
 

packages/flutter/lib/src/widgets/checkbox.dart → packages/flutter/lib/src/material/checkbox.dart

@@ -4,13 +4,12 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/rendering/object.dart';
-import 'package:sky/src/rendering/toggleable.dart';
+import 'package:sky/rendering.dart';
+import 'package:sky/widgets.dart';
 
-export 'package:sky/src/rendering/toggleable.dart' show ValueChanged;
+import 'theme.dart';
+
+export 'package:sky/rendering.dart' show ValueChanged;
 
 const double _kMidpoint = 0.5;
 const sky.Color _kLightUncheckedColor = const sky.Color(0x8A000000);

packages/flutter/lib/src/widgets/date_picker.dart → packages/flutter/lib/src/material/date_picker.dart

@@ -9,12 +9,10 @@ import 'package:intl/intl.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/services.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
-import 'package:sky/src/widgets/ink_well.dart';
-import 'package:sky/src/widgets/scrollable.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'ink_well.dart';
+import 'theme.dart';
 
 typedef void DatePickerValueChanged(DateTime dateTime);
 

packages/flutter/lib/src/widgets/dialog.dart → packages/flutter/lib/src/material/dialog.dart

@@ -7,16 +7,11 @@ import 'dart:async';
 import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/focus.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
-import 'package:sky/src/widgets/material.dart';
-import 'package:sky/src/widgets/material_button.dart';
-import 'package:sky/src/widgets/navigator.dart';
-import 'package:sky/src/widgets/scrollable.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/transitions.dart';
+import 'package:sky/widgets.dart';
+
+import 'material.dart';
+import 'material_button.dart';
+import 'theme.dart';
 
 typedef Widget DialogBuilder(NavigatorState navigator);
 

packages/flutter/lib/src/widgets/drawer.dart → packages/flutter/lib/src/material/drawer.dart

@@ -4,14 +4,9 @@
 
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/animated_container.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
-import 'package:sky/src/widgets/navigator.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/transitions.dart';
-import 'package:sky/src/widgets/focus.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 // TODO(eseidel): Draw width should vary based on device size:
 // http://www.google.com/design/spec/layout/structure.html#structure-side-nav

packages/flutter/lib/src/widgets/drawer_divider.dart → packages/flutter/lib/src/material/drawer_divider.dart

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 class DrawerDivider extends StatelessComponent {
   const DrawerDivider({ Key key }) : super(key: key);

packages/flutter/lib/src/widgets/drawer_header.dart → packages/flutter/lib/src/material/drawer_header.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 // TODO(jackson): This class should usually render the user's
 // preferred banner image rather than a solid background

packages/flutter/lib/src/widgets/drawer_item.dart → packages/flutter/lib/src/material/drawer_item.dart

@@ -7,11 +7,11 @@ import 'dart:sky' as sky;
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/icon.dart';
-import 'package:sky/src/widgets/ink_well.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'icon.dart';
+import 'ink_well.dart';
+import 'theme.dart';
 
 class DrawerItem extends StatefulComponent {
   const DrawerItem({ Key key, this.icon, this.child, this.onPressed, this.selected: false })

packages/flutter/lib/src/widgets/flat_button.dart → packages/flutter/lib/src/material/flat_button.dart

@@ -4,10 +4,10 @@
 
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/material_button.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'material_button.dart';
+import 'theme.dart';
 
 class FlatButton extends MaterialButton {
   FlatButton({

packages/flutter/lib/src/widgets/floating_action_button.dart → packages/flutter/lib/src/material/floating_action_button.dart

@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 import 'package:sky/gestures.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/icon.dart';
-import 'package:sky/src/widgets/ink_well.dart';
-import 'package:sky/src/widgets/material.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'icon.dart';
+import 'ink_well.dart';
+import 'material.dart';
+import 'theme.dart';
 
 // TODO(eseidel): This needs to change based on device size?
 // http://www.google.com/design/spec/layout/metrics-keylines.html#metrics-keylines-keylines-spacing

packages/flutter/lib/src/widgets/icon.dart → packages/flutter/lib/src/material/icon.dart

@@ -5,9 +5,9 @@
 import 'dart:sky' as sky;
 
 import 'package:sky/services.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 enum IconThemeColor { white, black }
 

packages/flutter/lib/src/widgets/icon_button.dart → packages/flutter/lib/src/material/icon_button.dart

@@ -5,10 +5,9 @@
 import 'dart:sky' as sky;
 
 import 'package:sky/gestures.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/icon.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
+import 'package:sky/widgets.dart';
+
+import 'icon.dart';
 
 class IconButton extends StatelessComponent {
   const IconButton({ Key key, this.icon, this.onPressed, this.color }) : super(key: key);

packages/flutter/lib/src/widgets/ink_well.dart → packages/flutter/lib/src/material/ink_well.dart

@@ -9,8 +9,7 @@ import 'dart:sky' as sky;
 import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'package:sky/widgets.dart';
 
 const int _kSplashInitialOpacity = 0x30;
 const double _kSplashCanceledVelocity = 0.7;

packages/flutter/lib/src/widgets/input.dart → packages/flutter/lib/src/material/input.dart

@@ -6,12 +6,9 @@ import 'package:sky/animation.dart';
 import 'package:sky/services.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/editable_text.dart';
-import 'package:sky/src/widgets/focus.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/scrollable.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 export 'package:sky/services.dart' show KeyboardType;
 

packages/flutter/lib/src/widgets/material.dart → packages/flutter/lib/src/material/material.dart

@@ -5,10 +5,9 @@
 import 'package:sky/animation.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/animated_container.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 enum MaterialType { canvas, card, circle, button }
 

packages/flutter/lib/src/widgets/material_button.dart → packages/flutter/lib/src/material/material_button.dart

@@ -4,11 +4,11 @@
 
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/ink_well.dart';
-import 'package:sky/src/widgets/material.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'ink_well.dart';
+import 'material.dart';
+import 'theme.dart';
 
 enum ButtonColor { normal, accent }
 

packages/flutter/lib/src/widgets/popup_menu.dart → packages/flutter/lib/src/material/popup_menu.dart

@@ -8,15 +8,11 @@ import 'dart:sky' as sky;
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/focus.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/ink_well.dart';
-import 'package:sky/src/widgets/navigator.dart';
-import 'package:sky/src/widgets/popup_menu_item.dart';
-import 'package:sky/src/widgets/scrollable.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/transitions.dart';
+import 'package:sky/widgets.dart';
+
+import 'ink_well.dart';
+import 'popup_menu_item.dart';
+import 'theme.dart';
 
 const Duration _kMenuDuration = const Duration(milliseconds: 300);
 const double _kMenuCloseIntervalEnd = 2.0 / 3.0;

packages/flutter/lib/src/widgets/popup_menu_item.dart → packages/flutter/lib/src/material/popup_menu_item.dart

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 const double _kMenuItemHeight = 48.0;
 const double _kBaselineOffsetFromBottom = 20.0;

packages/flutter/lib/src/widgets/progress_indicator.dart → packages/flutter/lib/src/material/progress_indicator.dart

@@ -6,10 +6,9 @@ import 'dart:math' as math;
 import 'dart:sky' as sky;
 
 import 'package:sky/animation.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/transitions.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 const double _kLinearProgressIndicatorHeight = 6.0;
 const double _kMinCircularProgressIndicatorSize = 15.0;

packages/flutter/lib/src/widgets/radio.dart → packages/flutter/lib/src/material/radio.dart

@@ -4,10 +4,9 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 const sky.Color _kLightOffColor = const sky.Color(0x8A000000);
 const sky.Color _kDarkOffColor = const sky.Color(0xB2FFFFFF);

packages/flutter/lib/src/widgets/raised_button.dart → packages/flutter/lib/src/material/raised_button.dart

@@ -4,10 +4,10 @@
 
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/material_button.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'material_button.dart';
+import 'theme.dart';
 
 class RaisedButton extends MaterialButton {
   RaisedButton({

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

@@ -6,8 +6,7 @@ import 'dart:sky' as sky;
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'package:sky/widgets.dart';
 
 class Scaffold extends StatelessComponent {
   Scaffold({

packages/flutter/lib/src/widgets/snack_bar.dart → packages/flutter/lib/src/material/snack_bar.dart

@@ -6,14 +6,10 @@ import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
-import 'package:sky/src/widgets/material.dart';
-import 'package:sky/src/widgets/navigator.dart';
-import 'package:sky/src/widgets/placeholder.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/transitions.dart';
+import 'package:sky/widgets.dart';
+
+import 'material.dart';
+import 'theme.dart';
 
 const double _kSideMargins = 24.0;
 const double _kVerticalPadding = 14.0;

packages/flutter/lib/src/widgets/switch.dart → packages/flutter/lib/src/material/switch.dart

@@ -8,9 +8,9 @@ import 'dart:sky' as sky;
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 export 'package:sky/rendering.dart' show ValueChanged;
 

packages/flutter/lib/src/widgets/tabs.dart → packages/flutter/lib/src/material/tabs.dart

@@ -8,17 +8,16 @@ import 'dart:sky' as sky;
 import 'package:newton/newton.dart';
 import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/animated_container.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/icon.dart';
-import 'package:sky/src/widgets/ink_well.dart';
-import 'package:sky/src/widgets/scrollable.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/transitions.dart';
+import 'package:sky/widgets.dart';
+
+import 'colors.dart';
+import 'constants.dart';
+import 'icon.dart';
+import 'ink_well.dart';
+import 'theme.dart';
+import 'typography.dart';
 
 typedef void TabSelectedIndexChanged(int selectedIndex);
 typedef void TabLayoutChanged(Size size, List<double> widths);

packages/flutter/lib/src/widgets/theme.dart → packages/flutter/lib/src/material/theme.dart

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/material.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'package:sky/widgets.dart';
 
-export 'package:sky/material.dart' show ThemeData, ThemeBrightness;
+import 'theme_data.dart';
+
+export 'theme_data.dart' show ThemeData, ThemeBrightness;
 
 class Theme extends InheritedWidget {
   Theme({

packages/flutter/lib/src/widgets/title.dart → packages/flutter/lib/src/material/title.dart

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/services.dart';
-import 'package:sky/src/widgets/theme.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'package:sky/widgets.dart';
+
+import 'theme.dart';
 
 class Title extends StatelessComponent {
   Title({ this.title, this.child });

packages/flutter/lib/src/widgets/tool_bar.dart → packages/flutter/lib/src/material/tool_bar.dart

@@ -4,11 +4,10 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/widgets/animated_container.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/icon.dart';
-import 'package:sky/src/widgets/theme.dart';
+import 'package:sky/widgets.dart';
+
+import 'icon.dart';
+import 'theme.dart';
 
 class ToolBar extends StatelessComponent {
   ToolBar({

packages/flutter/lib/src/widgets/animated_container.dart

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/animation.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
+
+import 'basic.dart';
+import 'framework.dart';
 
 import 'package:vector_math/vector_math_64.dart';
 

packages/flutter/lib/src/widgets/basic.dart

@@ -6,7 +6,8 @@ import 'dart:sky' as sky;
 
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/src/widgets/framework.dart';
+
+import 'framework.dart';
 
 export 'package:sky/rendering.dart' show
     BackgroundImage,

packages/flutter/lib/src/widgets/binding.dart

@@ -4,7 +4,8 @@
 
 import 'package:sky/animation.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/framework.dart';
+
+import 'framework.dart';
 
 class WidgetFlutterBinding extends FlutterBinding {
 

packages/flutter/lib/src/widgets/dismissable.dart

@@ -5,10 +5,11 @@
 import 'dart:sky' as sky;
 
 import 'package:sky/animation.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/transitions.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
+
+import 'basic.dart';
+import 'transitions.dart';
+import 'framework.dart';
+import 'gesture_detector.dart';
 
 const Duration _kCardDismissFadeout = const Duration(milliseconds: 200);
 const Duration _kCardDismissResize = const Duration(milliseconds: 300);

packages/flutter/lib/src/widgets/drag_target.dart

@@ -7,10 +7,11 @@ import 'dart:sky' as sky;
 
 import 'package:sky/animation.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/binding.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/navigator.dart';
+
+import 'basic.dart';
+import 'binding.dart';
+import 'framework.dart';
+import 'navigator.dart';
 
 typedef bool DragTargetWillAccept<T>(T data);
 typedef void DragTargetAccept<T>(T data);

packages/flutter/lib/src/widgets/editable_text.dart

@@ -7,8 +7,9 @@ import 'dart:async';
 import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
+
+import 'basic.dart';
+import 'framework.dart';
 
 const _kCursorBlinkPeriod = 500; // milliseconds
 

packages/flutter/lib/src/widgets/focus.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/widgets/framework.dart';
+import 'framework.dart';
 
 typedef void FocusChanged(GlobalKey key);
 

packages/flutter/lib/src/widgets/gesture_detector.dart

@@ -5,9 +5,10 @@
 import 'dart:sky' as sky;
 
 import 'package:sky/gestures.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/rendering/binding.dart';
+import 'package:sky/rendering.dart';
+
+import 'basic.dart';
+import 'framework.dart';
 
 class GestureDetector extends StatefulComponent {
   const GestureDetector({

packages/flutter/lib/src/widgets/mimic.dart

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
+
+import 'basic.dart';
+import 'framework.dart';
 
 class MimicableKey {
   MimicableKey._(this._state);

packages/flutter/lib/src/widgets/mixed_viewport.dart

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/basic.dart';
+
+import 'framework.dart';
+import 'basic.dart';
 
 typedef Widget IndexedBuilder(BuildContext context, int index); // return null if index is greater than index of last entry
 typedef void ExtentsUpdateCallback(double newExtents);

packages/flutter/lib/src/widgets/navigator.dart

@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 import 'package:sky/animation.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/focus.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/transitions.dart';
+
+import 'basic.dart';
+import 'focus.dart';
+import 'framework.dart';
+import 'transitions.dart';
 
 class RouteArguments {
   const RouteArguments({ this.navigator, this.previousPerformance, this.nextPerformance });

packages/flutter/lib/src/widgets/placeholder.dart

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
+import 'basic.dart';
+import 'framework.dart';
 
 class Placeholder extends StatefulComponent {
   Placeholder({ Key key }) : super(key: key);

packages/flutter/lib/src/widgets/scrollable.dart

@@ -10,11 +10,12 @@ import 'package:newton/newton.dart';
 import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
-import 'package:sky/src/widgets/gesture_detector.dart';
-import 'package:sky/src/widgets/homogeneous_viewport.dart';
-import 'package:sky/src/widgets/mixed_viewport.dart';
+
+import 'basic.dart';
+import 'framework.dart';
+import 'gesture_detector.dart';
+import 'homogeneous_viewport.dart';
+import 'mixed_viewport.dart';
 
 // The gesture velocity properties are pixels/second, config min,max limits are pixels/ms
 const double _kMillisecondsPerSecond = 1000.0;

packages/flutter/lib/src/widgets/statistics_overlay.dart

@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/widgets/framework.dart';
+import 'framework.dart';
+
 import 'package:sky/src/rendering/statistics_box.dart';
 
 /// The options that control whether the statistics overlay displays certain

packages/flutter/lib/src/widgets/transitions.dart

@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 import 'package:sky/animation.dart';
-import 'package:sky/src/widgets/basic.dart';
-import 'package:sky/src/widgets/framework.dart';
 import 'package:vector_math/vector_math_64.dart';
 
+import 'basic.dart';
+import 'framework.dart';
+
 export 'package:sky/animation.dart' show AnimationDirection;
 
 abstract class TransitionComponent extends StatefulComponent {

packages/flutter/lib/src/widgets/unique_component.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/widgets.dart';
+import 'framework.dart';
 
 abstract class UniqueComponent<T extends State> extends StatefulComponent {
   UniqueComponent({ GlobalKey key }) : super(key: key) {

packages/flutter/lib/widgets.dart

@@ -6,50 +6,21 @@
 library widgets;
 
 export 'src/widgets/animated_container.dart';
-export 'src/widgets/app.dart';
 export 'src/widgets/basic.dart';
 export 'src/widgets/binding.dart';
-export 'src/widgets/card.dart';
-export 'src/widgets/checkbox.dart';
-export 'src/widgets/date_picker.dart';
-export 'src/widgets/dialog.dart';
 export 'src/widgets/dismissable.dart';
 export 'src/widgets/drag_target.dart';
-export 'src/widgets/drawer.dart';
-export 'src/widgets/drawer_divider.dart';
-export 'src/widgets/drawer_header.dart';
-export 'src/widgets/drawer_item.dart';
 export 'src/widgets/editable_text.dart';
-export 'src/widgets/flat_button.dart';
-export 'src/widgets/floating_action_button.dart';
 export 'src/widgets/focus.dart';
 export 'src/widgets/framework.dart';
 export 'src/widgets/gesture_detector.dart';
 export 'src/widgets/homogeneous_viewport.dart';
-export 'src/widgets/icon.dart';
-export 'src/widgets/icon_button.dart';
-export 'src/widgets/ink_well.dart';
-export 'src/widgets/input.dart';
-export 'src/widgets/material.dart';
-export 'src/widgets/material_button.dart';
 export 'src/widgets/mimic.dart';
 export 'src/widgets/mixed_viewport.dart';
 export 'src/widgets/navigator.dart';
 export 'src/widgets/placeholder.dart';
-export 'src/widgets/popup_menu.dart';
-export 'src/widgets/popup_menu_item.dart';
-export 'src/widgets/progress_indicator.dart';
-export 'src/widgets/radio.dart';
-export 'src/widgets/raised_button.dart';
-export 'src/widgets/scaffold.dart';
 export 'src/widgets/scrollable.dart';
 export 'src/widgets/statistics_overlay.dart';
-export 'src/widgets/snack_bar.dart';
-export 'src/widgets/switch.dart';
-export 'src/widgets/tabs.dart';
-export 'src/widgets/theme.dart';
-export 'src/widgets/title.dart';
-export 'src/widgets/tool_bar.dart';
 export 'src/widgets/transitions.dart';
 export 'src/widgets/unique_component.dart';
 

packages/unit/test/widget/date_picker_test.dart

-import 'package:sky/widgets.dart';
+import 'package:sky/material.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/drawer_test.dart

+import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 import 'package:test/test.dart';
 

packages/unit/test/widget/input_test.dart

 import 'package:mojo_services/keyboard/keyboard.mojom.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets.dart';
+import 'package:sky/material.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/progress_indicator_test.dart

 
 import 'package:sky/rendering.dart';
-import 'package:sky/widgets.dart';
+import 'package:sky/material.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';

packages/unit/test/widget/snack_bar_test.dart

-import 'package:sky/widgets.dart';
+import 'package:sky/material.dart';
 import 'package:test/test.dart';
 
 import 'widget_tester.dart';