From cc809491baae03ac9fc6278d7017fc54c7d044b5 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 9 Oct 2015 10:03:40 -0700 Subject: [PATCH] Split material design widgets out of widgets.dart These are now part of material.dart. --- examples/address_book/lib/main.dart | 1 - examples/demo_launcher/lib/main.dart | 1 - examples/fitness/lib/main.dart | 1 - examples/game/lib/main.dart | 1 - examples/mine_digger/lib/main.dart | 1 - examples/stocks/lib/main.dart | 1 - examples/widgets/big_switch.dart | 1 - examples/widgets/card_collection.dart | 1 - examples/widgets/container.dart | 2 +- examples/widgets/date_picker.dart | 1 - examples/widgets/drag_and_drop.dart | 1 - examples/widgets/ensure_visible.dart | 1 - examples/widgets/indexed_stack.dart | 1 - examples/widgets/navigation.dart | 1 - examples/widgets/overlay_geometry.dart | 1 - examples/widgets/pageable_list.dart | 1 - examples/widgets/piano.dart | 1 - examples/widgets/progress_indicator.dart | 1 - examples/widgets/scale.dart | 1 - examples/widgets/sector.dart | 2 +- examples/widgets/spinning_mixed.dart | 2 +- examples/widgets/styled_text.dart | 1 - examples/widgets/tabs.dart | 1 - packages/flutter/lib/material.dart | 39 +++++++++++++++++-- .../lib/src/{widgets => material}/app.dart | 10 ++--- .../lib/src/{widgets => material}/card.dart | 6 +-- .../src/{widgets => material}/checkbox.dart | 11 +++--- .../{widgets => material}/date_picker.dart | 10 ++--- .../lib/src/{widgets => material}/dialog.dart | 15 +++---- .../lib/src/{widgets => material}/drawer.dart | 11 ++---- .../{widgets => material}/drawer_divider.dart | 6 +-- .../{widgets => material}/drawer_header.dart | 6 +-- .../{widgets => material}/drawer_item.dart | 10 ++--- .../{widgets => material}/flat_button.dart | 8 ++-- .../floating_action_button.dart | 12 +++--- .../lib/src/{widgets => material}/icon.dart | 6 +-- .../{widgets => material}/icon_button.dart | 7 ++-- .../src/{widgets => material}/ink_well.dart | 3 +- .../lib/src/{widgets => material}/input.dart | 9 ++--- .../src/{widgets => material}/material.dart | 7 ++-- .../material_button.dart | 10 ++--- .../src/{widgets => material}/popup_menu.dart | 14 +++---- .../popup_menu_item.dart | 6 +-- .../progress_indicator.dart | 7 ++-- .../lib/src/{widgets => material}/radio.dart | 7 ++-- .../{widgets => material}/raised_button.dart | 8 ++-- .../src/{widgets => material}/scaffold.dart | 3 +- .../src/{widgets => material}/snack_bar.dart | 12 ++---- .../lib/src/{widgets => material}/switch.dart | 6 +-- .../lib/src/{widgets => material}/tabs.dart | 17 ++++---- .../lib/src/{widgets => material}/theme.dart | 7 ++-- .../lib/src/{widgets => material}/title.dart | 5 ++- .../src/{widgets => material}/tool_bar.dart | 9 ++--- .../lib/src/widgets/animated_container.dart | 5 ++- packages/flutter/lib/src/widgets/basic.dart | 3 +- packages/flutter/lib/src/widgets/binding.dart | 3 +- .../flutter/lib/src/widgets/dismissable.dart | 9 +++-- .../flutter/lib/src/widgets/drag_target.dart | 9 +++-- .../lib/src/widgets/editable_text.dart | 5 ++- packages/flutter/lib/src/widgets/focus.dart | 2 +- .../lib/src/widgets/gesture_detector.dart | 7 ++-- packages/flutter/lib/src/widgets/mimic.dart | 5 ++- .../lib/src/widgets/mixed_viewport.dart | 5 ++- .../flutter/lib/src/widgets/navigator.dart | 9 +++-- .../flutter/lib/src/widgets/placeholder.dart | 4 +- .../flutter/lib/src/widgets/scrollable.dart | 11 +++--- .../lib/src/widgets/statistics_overlay.dart | 3 +- .../flutter/lib/src/widgets/transitions.dart | 5 ++- .../lib/src/widgets/unique_component.dart | 2 +- packages/flutter/lib/widgets.dart | 29 -------------- .../unit/test/widget/date_picker_test.dart | 2 +- packages/unit/test/widget/drawer_test.dart | 1 + packages/unit/test/widget/input_test.dart | 2 +- .../test/widget/progress_indicator_test.dart | 2 +- packages/unit/test/widget/snack_bar_test.dart | 2 +- 75 files changed, 201 insertions(+), 237 deletions(-) rename packages/flutter/lib/src/{widgets => material}/app.dart (89%) rename packages/flutter/lib/src/{widgets => material}/card.dart (83%) rename packages/flutter/lib/src/{widgets => material}/checkbox.dart (95%) rename packages/flutter/lib/src/{widgets => material}/date_picker.dart (97%) rename packages/flutter/lib/src/{widgets => material}/dialog.dart (90%) rename packages/flutter/lib/src/{widgets => material}/drawer.dart (92%) rename packages/flutter/lib/src/{widgets => material}/drawer_divider.dart (81%) rename packages/flutter/lib/src/{widgets => material}/drawer_header.dart (89%) rename packages/flutter/lib/src/{widgets => material}/drawer_item.dart (91%) rename packages/flutter/lib/src/{widgets => material}/flat_button.dart (84%) rename packages/flutter/lib/src/{widgets => material}/floating_action_button.dart (87%) rename packages/flutter/lib/src/{widgets => material}/icon.dart (95%) rename packages/flutter/lib/src/{widgets => material}/icon_button.dart (81%) rename packages/flutter/lib/src/{widgets => material}/ink_well.dart (98%) rename packages/flutter/lib/src/{widgets => material}/input.dart (94%) rename packages/flutter/lib/src/{widgets => material}/material.dart (91%) rename packages/flutter/lib/src/{widgets => material}/material_button.dart (92%) rename packages/flutter/lib/src/{widgets => material}/popup_menu.dart (92%) rename packages/flutter/lib/src/{widgets => material}/popup_menu_item.dart (84%) rename packages/flutter/lib/src/{widgets => material}/progress_indicator.dart (96%) rename packages/flutter/lib/src/{widgets => material}/radio.dart (90%) rename packages/flutter/lib/src/{widgets => material}/raised_button.dart (89%) rename packages/flutter/lib/src/{widgets => material}/scaffold.dart (96%) rename packages/flutter/lib/src/{widgets => material}/snack_bar.dart (89%) rename packages/flutter/lib/src/{widgets => material}/switch.dart (97%) rename packages/flutter/lib/src/{widgets => material}/tabs.dart (97%) rename packages/flutter/lib/src/{widgets => material}/theme.dart (81%) rename packages/flutter/lib/src/{widgets => material}/title.dart (82%) rename packages/flutter/lib/src/{widgets => material}/tool_bar.dart (90%) diff --git a/examples/address_book/lib/main.dart b/examples/address_book/lib/main.dart index 0c66e80f3e..fb10eccbcc 100644 --- a/examples/address_book/lib/main.dart +++ b/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({ diff --git a/examples/demo_launcher/lib/main.dart b/examples/demo_launcher/lib/main.dart index 5f466f4002..dd4bf62a3c 100644 --- a/examples/demo_launcher/lib/main.dart +++ b/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) diff --git a/examples/fitness/lib/main.dart b/examples/fitness/lib/main.dart index ecc10820b5..c747be646d 100644 --- a/examples/fitness/lib/main.dart +++ b/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'; diff --git a/examples/game/lib/main.dart b/examples/game/lib/main.dart index c8cf7417cb..9150ab95fc 100644 --- a/examples/game/lib/main.dart +++ b/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'; diff --git a/examples/mine_digger/lib/main.dart b/examples/mine_digger/lib/main.dart index 112d5a3b80..095b010f09 100644 --- a/examples/mine_digger/lib/main.dart +++ b/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, diff --git a/examples/stocks/lib/main.dart b/examples/stocks/lib/main.dart index 61c8d62a4e..1a4679006e 100644 --- a/examples/stocks/lib/main.dart +++ b/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'; diff --git a/examples/widgets/big_switch.dart b/examples/widgets/big_switch.dart index 991ab70b5f..cd812fac33 100644 --- a/examples/widgets/big_switch.dart +++ b/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 }); diff --git a/examples/widgets/card_collection.dart b/examples/widgets/card_collection.dart index ce7ac66ee6..7896c6809a 100644 --- a/examples/widgets/card_collection.dart +++ b/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) { diff --git a/examples/widgets/container.dart b/examples/widgets/container.dart index fbcd0e16ce..5a4b929753 100644 --- a/examples/widgets/container.dart +++ b/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) { diff --git a/examples/widgets/date_picker.dart b/examples/widgets/date_picker.dart index 48d8e30313..845af140f6 100644 --- a/examples/widgets/date_picker.dart +++ b/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()); diff --git a/examples/widgets/drag_and_drop.dart b/examples/widgets/drag_and_drop.dart index 8a7829dc79..a7c5ff63d7 100644 --- a/examples/widgets/drag_and_drop.dart +++ b/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); diff --git a/examples/widgets/ensure_visible.dart b/examples/widgets/ensure_visible.dart index ddd1891953..d59e0d6cea 100644 --- a/examples/widgets/ensure_visible.dart +++ b/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); diff --git a/examples/widgets/indexed_stack.dart b/examples/widgets/indexed_stack.dart index 1833412763..e7a5e4952b 100644 --- a/examples/widgets/indexed_stack.dart +++ b/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 }); diff --git a/examples/widgets/navigation.dart b/examples/widgets/navigation.dart index 7ade991408..1e76049291 100644 --- a/examples/widgets/navigation.dart +++ b/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 routes = { '/': (RouteArguments args) => new Container( diff --git a/examples/widgets/overlay_geometry.dart b/examples/widgets/overlay_geometry.dart index cdbc56d253..34be772d52 100644 --- a/examples/widgets/overlay_geometry.dart +++ b/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); diff --git a/examples/widgets/pageable_list.dart b/examples/widgets/pageable_list.dart index 4ad845dc22..f51083e801 100644 --- a/examples/widgets/pageable_list.dart +++ b/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); diff --git a/examples/widgets/piano.dart b/examples/widgets/piano.dart index 98a942c258..14845b0e2a 100644 --- a/examples/widgets/piano.dart +++ b/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"; diff --git a/examples/widgets/progress_indicator.dart b/examples/widgets/progress_indicator.dart index a83de62df1..511f2484df 100644 --- a/examples/widgets/progress_indicator.dart +++ b/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(); diff --git a/examples/widgets/scale.dart b/examples/widgets/scale.dart index 626547010d..ecd4c8d41f 100644 --- a/examples/widgets/scale.dart +++ b/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(); diff --git a/examples/widgets/sector.dart b/examples/widgets/sector.dart index d32d39944a..c87d87c1a2 100644 --- a/examples/widgets/sector.dart +++ b/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'; diff --git a/examples/widgets/spinning_mixed.dart b/examples/widgets/spinning_mixed.dart index f44b0e0acd..eefb71fc26 100644 --- a/examples/widgets/spinning_mixed.dart +++ b/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'; diff --git a/examples/widgets/styled_text.dart b/examples/widgets/styled_text.dart index a21da29b11..1764acd227 100644 --- a/examples/widgets/styled_text.dart +++ b/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(); diff --git a/examples/widgets/tabs.dart b/examples/widgets/tabs.dart index 540b3327f9..cec0e7aa53 100644 --- a/examples/widgets/tabs.dart +++ b/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(); diff --git a/packages/flutter/lib/material.dart b/packages/flutter/lib/material.dart index 0d69716374..69cabb7288 100644 --- a/packages/flutter/lib/material.dart +++ b/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/edges.dart'; -export 'src/material/shadows.dart'; -export 'src/material/theme_data.dart'; -export 'src/material/typography.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 'widgets.dart'; diff --git a/packages/flutter/lib/src/widgets/app.dart b/packages/flutter/lib/src/material/app.dart similarity index 89% rename from packages/flutter/lib/src/widgets/app.dart rename to packages/flutter/lib/src/material/app.dart index c38da71607..e73eab17bd 100644 --- a/packages/flutter/lib/src/widgets/app.dart +++ b/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), diff --git a/packages/flutter/lib/src/widgets/card.dart b/packages/flutter/lib/src/material/card.dart similarity index 83% rename from packages/flutter/lib/src/widgets/card.dart rename to packages/flutter/lib/src/material/card.dart index c9e0435805..caf2a647d4 100644 --- a/packages/flutter/lib/src/widgets/card.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/checkbox.dart b/packages/flutter/lib/src/material/checkbox.dart similarity index 95% rename from packages/flutter/lib/src/widgets/checkbox.dart rename to packages/flutter/lib/src/material/checkbox.dart index 2ae53375be..17c57a2750 100644 --- a/packages/flutter/lib/src/widgets/checkbox.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart similarity index 97% rename from packages/flutter/lib/src/widgets/date_picker.dart rename to packages/flutter/lib/src/material/date_picker.dart index 5f428d65e3..8df5a45e5e 100644 --- a/packages/flutter/lib/src/widgets/date_picker.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/dialog.dart b/packages/flutter/lib/src/material/dialog.dart similarity index 90% rename from packages/flutter/lib/src/widgets/dialog.dart rename to packages/flutter/lib/src/material/dialog.dart index 202db68580..534ec6e5be 100644 --- a/packages/flutter/lib/src/widgets/dialog.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/drawer.dart b/packages/flutter/lib/src/material/drawer.dart similarity index 92% rename from packages/flutter/lib/src/widgets/drawer.dart rename to packages/flutter/lib/src/material/drawer.dart index 2b63b2aebc..fed362e566 100644 --- a/packages/flutter/lib/src/widgets/drawer.dart +++ b/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 diff --git a/packages/flutter/lib/src/widgets/drawer_divider.dart b/packages/flutter/lib/src/material/drawer_divider.dart similarity index 81% rename from packages/flutter/lib/src/widgets/drawer_divider.dart rename to packages/flutter/lib/src/material/drawer_divider.dart index 7841726153..a9f1088270 100644 --- a/packages/flutter/lib/src/widgets/drawer_divider.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/drawer_header.dart b/packages/flutter/lib/src/material/drawer_header.dart similarity index 89% rename from packages/flutter/lib/src/widgets/drawer_header.dart rename to packages/flutter/lib/src/material/drawer_header.dart index be71d34d41..45ae13728e 100644 --- a/packages/flutter/lib/src/widgets/drawer_header.dart +++ b/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 diff --git a/packages/flutter/lib/src/widgets/drawer_item.dart b/packages/flutter/lib/src/material/drawer_item.dart similarity index 91% rename from packages/flutter/lib/src/widgets/drawer_item.dart rename to packages/flutter/lib/src/material/drawer_item.dart index a963398ce6..bf5fd3035e 100644 --- a/packages/flutter/lib/src/widgets/drawer_item.dart +++ b/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 }) diff --git a/packages/flutter/lib/src/widgets/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart similarity index 84% rename from packages/flutter/lib/src/widgets/flat_button.dart rename to packages/flutter/lib/src/material/flat_button.dart index 238879bfba..b87e7d1b3c 100644 --- a/packages/flutter/lib/src/widgets/flat_button.dart +++ b/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({ diff --git a/packages/flutter/lib/src/widgets/floating_action_button.dart b/packages/flutter/lib/src/material/floating_action_button.dart similarity index 87% rename from packages/flutter/lib/src/widgets/floating_action_button.dart rename to packages/flutter/lib/src/material/floating_action_button.dart index 8b95422f96..368e3c5ad7 100644 --- a/packages/flutter/lib/src/widgets/floating_action_button.dart +++ b/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 diff --git a/packages/flutter/lib/src/widgets/icon.dart b/packages/flutter/lib/src/material/icon.dart similarity index 95% rename from packages/flutter/lib/src/widgets/icon.dart rename to packages/flutter/lib/src/material/icon.dart index 9b71b138c6..6d0d119410 100644 --- a/packages/flutter/lib/src/widgets/icon.dart +++ b/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 } diff --git a/packages/flutter/lib/src/widgets/icon_button.dart b/packages/flutter/lib/src/material/icon_button.dart similarity index 81% rename from packages/flutter/lib/src/widgets/icon_button.dart rename to packages/flutter/lib/src/material/icon_button.dart index 662ee5fb52..a2b826d342 100644 --- a/packages/flutter/lib/src/widgets/icon_button.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/ink_well.dart b/packages/flutter/lib/src/material/ink_well.dart similarity index 98% rename from packages/flutter/lib/src/widgets/ink_well.dart rename to packages/flutter/lib/src/material/ink_well.dart index 140e2c9ae5..f77563509c 100644 --- a/packages/flutter/lib/src/widgets/ink_well.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/input.dart b/packages/flutter/lib/src/material/input.dart similarity index 94% rename from packages/flutter/lib/src/widgets/input.dart rename to packages/flutter/lib/src/material/input.dart index d3a1373073..0b2ad3cb17 100644 --- a/packages/flutter/lib/src/widgets/input.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/material.dart b/packages/flutter/lib/src/material/material.dart similarity index 91% rename from packages/flutter/lib/src/widgets/material.dart rename to packages/flutter/lib/src/material/material.dart index 4f42d63abd..375a436d51 100644 --- a/packages/flutter/lib/src/widgets/material.dart +++ b/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 } diff --git a/packages/flutter/lib/src/widgets/material_button.dart b/packages/flutter/lib/src/material/material_button.dart similarity index 92% rename from packages/flutter/lib/src/widgets/material_button.dart rename to packages/flutter/lib/src/material/material_button.dart index cd01b0df43..4db52a39b3 100644 --- a/packages/flutter/lib/src/widgets/material_button.dart +++ b/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 } diff --git a/packages/flutter/lib/src/widgets/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart similarity index 92% rename from packages/flutter/lib/src/widgets/popup_menu.dart rename to packages/flutter/lib/src/material/popup_menu.dart index 518d921a95..6b1922bdac 100644 --- a/packages/flutter/lib/src/widgets/popup_menu.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/popup_menu_item.dart b/packages/flutter/lib/src/material/popup_menu_item.dart similarity index 84% rename from packages/flutter/lib/src/widgets/popup_menu_item.dart rename to packages/flutter/lib/src/material/popup_menu_item.dart index d52d8e26ab..d09bda2be1 100644 --- a/packages/flutter/lib/src/widgets/popup_menu_item.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/progress_indicator.dart b/packages/flutter/lib/src/material/progress_indicator.dart similarity index 96% rename from packages/flutter/lib/src/widgets/progress_indicator.dart rename to packages/flutter/lib/src/material/progress_indicator.dart index 92cdeda620..398b6040ef 100644 --- a/packages/flutter/lib/src/widgets/progress_indicator.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/radio.dart b/packages/flutter/lib/src/material/radio.dart similarity index 90% rename from packages/flutter/lib/src/widgets/radio.dart rename to packages/flutter/lib/src/material/radio.dart index dfecc4cbbf..30ae00732c 100644 --- a/packages/flutter/lib/src/widgets/radio.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart similarity index 89% rename from packages/flutter/lib/src/widgets/raised_button.dart rename to packages/flutter/lib/src/material/raised_button.dart index b6db80487a..3484f6c8a7 100644 --- a/packages/flutter/lib/src/widgets/raised_button.dart +++ b/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({ diff --git a/packages/flutter/lib/src/widgets/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart similarity index 96% rename from packages/flutter/lib/src/widgets/scaffold.dart rename to packages/flutter/lib/src/material/scaffold.dart index bd02c3c4ca..fb65a23884 100644 --- a/packages/flutter/lib/src/widgets/scaffold.dart +++ b/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({ diff --git a/packages/flutter/lib/src/widgets/snack_bar.dart b/packages/flutter/lib/src/material/snack_bar.dart similarity index 89% rename from packages/flutter/lib/src/widgets/snack_bar.dart rename to packages/flutter/lib/src/material/snack_bar.dart index 85454960b4..bc66cceb01 100644 --- a/packages/flutter/lib/src/widgets/snack_bar.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/switch.dart b/packages/flutter/lib/src/material/switch.dart similarity index 97% rename from packages/flutter/lib/src/widgets/switch.dart rename to packages/flutter/lib/src/material/switch.dart index 5452545529..959d940a7a 100644 --- a/packages/flutter/lib/src/widgets/switch.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/tabs.dart b/packages/flutter/lib/src/material/tabs.dart similarity index 97% rename from packages/flutter/lib/src/widgets/tabs.dart rename to packages/flutter/lib/src/material/tabs.dart index 89367d9977..d6df9b9972 100644 --- a/packages/flutter/lib/src/widgets/tabs.dart +++ b/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 widths); diff --git a/packages/flutter/lib/src/widgets/theme.dart b/packages/flutter/lib/src/material/theme.dart similarity index 81% rename from packages/flutter/lib/src/widgets/theme.dart rename to packages/flutter/lib/src/material/theme.dart index c06978b2d7..e46a79ffc4 100644 --- a/packages/flutter/lib/src/widgets/theme.dart +++ b/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({ diff --git a/packages/flutter/lib/src/widgets/title.dart b/packages/flutter/lib/src/material/title.dart similarity index 82% rename from packages/flutter/lib/src/widgets/title.dart rename to packages/flutter/lib/src/material/title.dart index f9f9ae5c4f..bcba1421c4 100644 --- a/packages/flutter/lib/src/widgets/title.dart +++ b/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 }); diff --git a/packages/flutter/lib/src/widgets/tool_bar.dart b/packages/flutter/lib/src/material/tool_bar.dart similarity index 90% rename from packages/flutter/lib/src/widgets/tool_bar.dart rename to packages/flutter/lib/src/material/tool_bar.dart index b92c938efe..16fc3398a8 100644 --- a/packages/flutter/lib/src/widgets/tool_bar.dart +++ b/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({ diff --git a/packages/flutter/lib/src/widgets/animated_container.dart b/packages/flutter/lib/src/widgets/animated_container.dart index 12f65ad1ea..5734cfb8cc 100644 --- a/packages/flutter/lib/src/widgets/animated_container.dart +++ b/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'; diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index ea3a835f99..340fa56e6f 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/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, diff --git a/packages/flutter/lib/src/widgets/binding.dart b/packages/flutter/lib/src/widgets/binding.dart index 2699254b6a..d6b6393a2f 100644 --- a/packages/flutter/lib/src/widgets/binding.dart +++ b/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 { diff --git a/packages/flutter/lib/src/widgets/dismissable.dart b/packages/flutter/lib/src/widgets/dismissable.dart index 44c9d6ae29..a4d43114c9 100644 --- a/packages/flutter/lib/src/widgets/dismissable.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart index 679c2fa1d4..ddd98ba0c0 100644 --- a/packages/flutter/lib/src/widgets/drag_target.dart +++ b/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 data); typedef void DragTargetAccept(T data); diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index fee3793f93..0990eded4f 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/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 diff --git a/packages/flutter/lib/src/widgets/focus.dart b/packages/flutter/lib/src/widgets/focus.dart index 098fcf954e..5f2f129d3d 100644 --- a/packages/flutter/lib/src/widgets/focus.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart index c2d1454c13..6738389db4 100644 --- a/packages/flutter/lib/src/widgets/gesture_detector.dart +++ b/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({ diff --git a/packages/flutter/lib/src/widgets/mimic.dart b/packages/flutter/lib/src/widgets/mimic.dart index 961db37986..69006782ca 100644 --- a/packages/flutter/lib/src/widgets/mimic.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/mixed_viewport.dart b/packages/flutter/lib/src/widgets/mixed_viewport.dart index bf03507751..3941ec81b9 100644 --- a/packages/flutter/lib/src/widgets/mixed_viewport.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart index 04e839fe50..97c9e63255 100644 --- a/packages/flutter/lib/src/widgets/navigator.dart +++ b/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 }); diff --git a/packages/flutter/lib/src/widgets/placeholder.dart b/packages/flutter/lib/src/widgets/placeholder.dart index 69c79184f7..79da8dcdb4 100644 --- a/packages/flutter/lib/src/widgets/placeholder.dart +++ b/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); diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index bf4a08605d..36b1502155 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/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; diff --git a/packages/flutter/lib/src/widgets/statistics_overlay.dart b/packages/flutter/lib/src/widgets/statistics_overlay.dart index 6677cfbdd9..a4c5eb62a2 100644 --- a/packages/flutter/lib/src/widgets/statistics_overlay.dart +++ b/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 diff --git a/packages/flutter/lib/src/widgets/transitions.dart b/packages/flutter/lib/src/widgets/transitions.dart index 5f3d52bf01..71e9a985ac 100644 --- a/packages/flutter/lib/src/widgets/transitions.dart +++ b/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 { diff --git a/packages/flutter/lib/src/widgets/unique_component.dart b/packages/flutter/lib/src/widgets/unique_component.dart index 065ee3b033..73b2cc32dd 100644 --- a/packages/flutter/lib/src/widgets/unique_component.dart +++ b/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 extends StatefulComponent { UniqueComponent({ GlobalKey key }) : super(key: key) { diff --git a/packages/flutter/lib/widgets.dart b/packages/flutter/lib/widgets.dart index 84f308d536..2ecb32b564 100644 --- a/packages/flutter/lib/widgets.dart +++ b/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'; diff --git a/packages/unit/test/widget/date_picker_test.dart b/packages/unit/test/widget/date_picker_test.dart index e3892137f8..975cbe3f42 100644 --- a/packages/unit/test/widget/date_picker_test.dart +++ b/packages/unit/test/widget/date_picker_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:sky/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/drawer_test.dart b/packages/unit/test/widget/drawer_test.dart index 2fb0b24278..36389c8b3b 100644 --- a/packages/unit/test/widget/drawer_test.dart +++ b/packages/unit/test/widget/drawer_test.dart @@ -1,3 +1,4 @@ +import 'package:sky/material.dart'; import 'package:sky/widgets.dart'; import 'package:test/test.dart'; diff --git a/packages/unit/test/widget/input_test.dart b/packages/unit/test/widget/input_test.dart index 01670d5ec0..e2bfbad04f 100644 --- a/packages/unit/test/widget/input_test.dart +++ b/packages/unit/test/widget/input_test.dart @@ -1,7 +1,7 @@ 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'; diff --git a/packages/unit/test/widget/progress_indicator_test.dart b/packages/unit/test/widget/progress_indicator_test.dart index 83389335de..849818b3de 100644 --- a/packages/unit/test/widget/progress_indicator_test.dart +++ b/packages/unit/test/widget/progress_indicator_test.dart @@ -1,6 +1,6 @@ import 'package:sky/rendering.dart'; -import 'package:sky/widgets.dart'; +import 'package:sky/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart'; diff --git a/packages/unit/test/widget/snack_bar_test.dart b/packages/unit/test/widget/snack_bar_test.dart index 6cb2d6605b..eb056b390f 100644 --- a/packages/unit/test/widget/snack_bar_test.dart +++ b/packages/unit/test/widget/snack_bar_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/widgets.dart'; +import 'package:sky/material.dart'; import 'package:test/test.dart'; import 'widget_tester.dart';