From 9ac880d4257c4e6abef65dfa1f8f402a2bf7bfb5 Mon Sep 17 00:00:00 2001 From: Hixie Date: Fri, 28 Aug 2015 11:14:02 -0700 Subject: [PATCH] Stop exporting framework.dart from basic.dart, since we now have widgets.dart exporting all of framework.dart. --- sky/packages/sky/lib/editing/editable_text.dart | 1 + sky/packages/sky/lib/widgets/animated_component.dart | 2 +- sky/packages/sky/lib/widgets/animated_container.dart | 3 ++- sky/packages/sky/lib/widgets/basic.dart | 1 - sky/packages/sky/lib/widgets/button_base.dart | 2 +- sky/packages/sky/lib/widgets/card.dart | 1 + sky/packages/sky/lib/widgets/date_picker.dart | 11 ++++++++--- sky/packages/sky/lib/widgets/dialog.dart | 1 + sky/packages/sky/lib/widgets/drawer.dart | 1 + sky/packages/sky/lib/widgets/drawer_divider.dart | 1 + sky/packages/sky/lib/widgets/drawer_header.dart | 1 + sky/packages/sky/lib/widgets/flat_button.dart | 2 +- .../sky/lib/widgets/floating_action_button.dart | 1 + sky/packages/sky/lib/widgets/material.dart | 1 + sky/packages/sky/lib/widgets/material_button.dart | 1 + sky/packages/sky/lib/widgets/mimic.dart | 1 + sky/packages/sky/lib/widgets/mimic_overlay.dart | 1 + sky/packages/sky/lib/widgets/navigator.dart | 1 + sky/packages/sky/lib/widgets/popup_menu.dart | 1 + sky/packages/sky/lib/widgets/popup_menu_item.dart | 1 + sky/packages/sky/lib/widgets/radio.dart | 1 + sky/packages/sky/lib/widgets/raised_button.dart | 1 + sky/packages/sky/lib/widgets/snack_bar.dart | 1 + sky/packages/sky/lib/widgets/theme.dart | 1 - sky/packages/sky/lib/widgets/tool_bar.dart | 1 + sky/packages/sky/lib/widgets/transitions.dart | 5 +++-- 26 files changed, 34 insertions(+), 11 deletions(-) diff --git a/sky/packages/sky/lib/editing/editable_text.dart b/sky/packages/sky/lib/editing/editable_text.dart index 4810b569fd7..2fb6deefc9b 100644 --- a/sky/packages/sky/lib/editing/editable_text.dart +++ b/sky/packages/sky/lib/editing/editable_text.dart @@ -9,6 +9,7 @@ import 'package:sky/editing/editable_string.dart'; import 'package:sky/painting/text_style.dart'; import 'package:sky/rendering/object.dart'; import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; const _kCursorBlinkPeriod = 500; // milliseconds const _kCursorGap = 1.0; diff --git a/sky/packages/sky/lib/widgets/animated_component.dart b/sky/packages/sky/lib/widgets/animated_component.dart index 977fc485733..791341080fc 100644 --- a/sky/packages/sky/lib/widgets/animated_component.dart +++ b/sky/packages/sky/lib/widgets/animated_component.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:sky/animation/animation_performance.dart'; -import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; abstract class AnimatedComponent extends StatefulComponent { diff --git a/sky/packages/sky/lib/widgets/animated_container.dart b/sky/packages/sky/lib/widgets/animated_container.dart index 8470e5d307d..190765e7597 100644 --- a/sky/packages/sky/lib/widgets/animated_container.dart +++ b/sky/packages/sky/lib/widgets/animated_container.dart @@ -9,8 +9,9 @@ import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; import 'package:sky/base/lerp.dart'; import 'package:sky/painting/box_painter.dart'; -import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/animated_component.dart'; +import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; class AnimatedBoxConstraintsValue extends AnimatedValue { AnimatedBoxConstraintsValue(BoxConstraints begin, { BoxConstraints end, Curve curve: linear }) diff --git a/sky/packages/sky/lib/widgets/basic.dart b/sky/packages/sky/lib/widgets/basic.dart index bb0e334e07c..c9712525e4b 100644 --- a/sky/packages/sky/lib/widgets/basic.dart +++ b/sky/packages/sky/lib/widgets/basic.dart @@ -34,7 +34,6 @@ export 'package:sky/rendering/object.dart' show Point, Offset, Size, Rect, Color export 'package:sky/rendering/proxy_box.dart' show BackgroundImage, BoxDecoration, BoxDecorationPosition, BoxShadow, Border, BorderSide, EdgeDims, Shape; export 'package:sky/rendering/toggleable.dart' show ValueChanged; export 'package:sky/rendering/viewport.dart' show ScrollDirection; -export 'package:sky/widgets/framework.dart' show Key, GlobalKey, Widget, Component, StatefulComponent, App, runApp, Listener, ParentDataNode; // PAINTING NODES diff --git a/sky/packages/sky/lib/widgets/button_base.dart b/sky/packages/sky/lib/widgets/button_base.dart index 7f5aef0bed7..bf0829f3c57 100644 --- a/sky/packages/sky/lib/widgets/button_base.dart +++ b/sky/packages/sky/lib/widgets/button_base.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/basic.dart'; +import 'package:sky/widgets/framework.dart'; abstract class ButtonBase extends StatefulComponent { diff --git a/sky/packages/sky/lib/widgets/card.dart b/sky/packages/sky/lib/widgets/card.dart index c9b9aa3fcc9..8b16f4ca8ee 100644 --- a/sky/packages/sky/lib/widgets/card.dart +++ b/sky/packages/sky/lib/widgets/card.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/material.dart'; const EdgeDims kCardMargins = const EdgeDims.all(4.0); diff --git a/sky/packages/sky/lib/widgets/date_picker.dart b/sky/packages/sky/lib/widgets/date_picker.dart index c95deff0ab8..b6747be4416 100644 --- a/sky/packages/sky/lib/widgets/date_picker.dart +++ b/sky/packages/sky/lib/widgets/date_picker.dart @@ -4,12 +4,17 @@ import 'dart:async'; +import 'package:intl/date_symbols.dart'; +import 'package:intl/intl.dart'; import 'package:sky/mojo/activity.dart'; import 'package:sky/theme/colors.dart' as colors; import 'package:sky/theme/typography.dart' as typography; -import 'package:sky/widgets.dart'; -import 'package:intl/intl.dart'; -import 'package:intl/date_symbols.dart'; +import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; +import 'package:sky/widgets/gesture_detector.dart'; +import 'package:sky/widgets/ink_well.dart'; +import 'package:sky/widgets/scrollable.dart'; +import 'package:sky/widgets/theme.dart'; typedef void DatePickerValueChanged(DateTime dateTime); diff --git a/sky/packages/sky/lib/widgets/dialog.dart b/sky/packages/sky/lib/widgets/dialog.dart index 11073148385..23eeedccc8d 100644 --- a/sky/packages/sky/lib/widgets/dialog.dart +++ b/sky/packages/sky/lib/widgets/dialog.dart @@ -10,6 +10,7 @@ import 'package:sky/theme/colors.dart' as colors; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/default_text_style.dart'; import 'package:sky/widgets/focus.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/material.dart'; import 'package:sky/widgets/navigator.dart'; diff --git a/sky/packages/sky/lib/widgets/drawer.dart b/sky/packages/sky/lib/widgets/drawer.dart index b789d525d51..1822e395d0c 100644 --- a/sky/packages/sky/lib/widgets/drawer.dart +++ b/sky/packages/sky/lib/widgets/drawer.dart @@ -11,6 +11,7 @@ import 'package:sky/animation/forces.dart'; import 'package:sky/theme/colors.dart' as colors; import 'package:sky/theme/shadows.dart'; import 'package:sky/widgets/animated_container.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/navigator.dart'; diff --git a/sky/packages/sky/lib/widgets/drawer_divider.dart b/sky/packages/sky/lib/widgets/drawer_divider.dart index 0acab63bc76..e29dd95bc7d 100644 --- a/sky/packages/sky/lib/widgets/drawer_divider.dart +++ b/sky/packages/sky/lib/widgets/drawer_divider.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/theme.dart'; class DrawerDivider extends Component { diff --git a/sky/packages/sky/lib/widgets/drawer_header.dart b/sky/packages/sky/lib/widgets/drawer_header.dart index 292271fcd97..f2c7caff9df 100644 --- a/sky/packages/sky/lib/widgets/drawer_header.dart +++ b/sky/packages/sky/lib/widgets/drawer_header.dart @@ -5,6 +5,7 @@ import 'package:sky/theme/view_configuration.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/default_text_style.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/theme.dart'; // TODO(jackson): This class should usually render the user's diff --git a/sky/packages/sky/lib/widgets/flat_button.dart b/sky/packages/sky/lib/widgets/flat_button.dart index 18ac2a1c9eb..f61e95d7344 100644 --- a/sky/packages/sky/lib/widgets/flat_button.dart +++ b/sky/packages/sky/lib/widgets/flat_button.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:sky/theme/colors.dart'; -import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/material_button.dart'; import 'package:sky/widgets/theme.dart'; diff --git a/sky/packages/sky/lib/widgets/floating_action_button.dart b/sky/packages/sky/lib/widgets/floating_action_button.dart index 4f15df92009..e6efe3340f5 100644 --- a/sky/packages/sky/lib/widgets/floating_action_button.dart +++ b/sky/packages/sky/lib/widgets/floating_action_button.dart @@ -4,6 +4,7 @@ import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/button_base.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/icon.dart'; import 'package:sky/widgets/ink_well.dart'; diff --git a/sky/packages/sky/lib/widgets/material.dart b/sky/packages/sky/lib/widgets/material.dart index a0e3f861846..5a03e6b6f36 100644 --- a/sky/packages/sky/lib/widgets/material.dart +++ b/sky/packages/sky/lib/widgets/material.dart @@ -7,6 +7,7 @@ import 'package:sky/theme/shadows.dart'; import 'package:sky/widgets/animated_container.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/default_text_style.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/theme.dart'; enum MaterialType { canvas, card, circle, button } diff --git a/sky/packages/sky/lib/widgets/material_button.dart b/sky/packages/sky/lib/widgets/material_button.dart index 94873c058a7..ca13b9099a3 100644 --- a/sky/packages/sky/lib/widgets/material_button.dart +++ b/sky/packages/sky/lib/widgets/material_button.dart @@ -4,6 +4,7 @@ import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/button_base.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/ink_well.dart'; import 'package:sky/widgets/material.dart'; diff --git a/sky/packages/sky/lib/widgets/mimic.dart b/sky/packages/sky/lib/widgets/mimic.dart index df92c5e2118..b87028b8e86 100644 --- a/sky/packages/sky/lib/widgets/mimic.dart +++ b/sky/packages/sky/lib/widgets/mimic.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; abstract class GlobalKeyWatcher extends StatefulComponent { GlobalKeyWatcher({ diff --git a/sky/packages/sky/lib/widgets/mimic_overlay.dart b/sky/packages/sky/lib/widgets/mimic_overlay.dart index 298d74384cc..ef09885f524 100644 --- a/sky/packages/sky/lib/widgets/mimic_overlay.dart +++ b/sky/packages/sky/lib/widgets/mimic_overlay.dart @@ -7,6 +7,7 @@ import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; import 'package:sky/widgets/animated_component.dart'; import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/mimic.dart'; class MimicOverlay extends AnimatedComponent { diff --git a/sky/packages/sky/lib/widgets/navigator.dart b/sky/packages/sky/lib/widgets/navigator.dart index c1c48faaead..f23a751e299 100644 --- a/sky/packages/sky/lib/widgets/navigator.dart +++ b/sky/packages/sky/lib/widgets/navigator.dart @@ -7,6 +7,7 @@ import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/focus.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/transitions.dart'; typedef Widget RouteBuilder(Navigator navigator, RouteBase route); diff --git a/sky/packages/sky/lib/widgets/popup_menu.dart b/sky/packages/sky/lib/widgets/popup_menu.dart index b2b6d5eacc0..89a92486ab2 100644 --- a/sky/packages/sky/lib/widgets/popup_menu.dart +++ b/sky/packages/sky/lib/widgets/popup_menu.dart @@ -10,6 +10,7 @@ import 'package:sky/painting/box_painter.dart'; import 'package:sky/theme/colors.dart'; import 'package:sky/theme/shadows.dart'; import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/navigator.dart'; import 'package:sky/widgets/popup_menu_item.dart'; import 'package:sky/widgets/scrollable.dart'; diff --git a/sky/packages/sky/lib/widgets/popup_menu_item.dart b/sky/packages/sky/lib/widgets/popup_menu_item.dart index 1f5eb380171..d79ed3a7045 100644 --- a/sky/packages/sky/lib/widgets/popup_menu_item.dart +++ b/sky/packages/sky/lib/widgets/popup_menu_item.dart @@ -5,6 +5,7 @@ import 'package:sky/painting/text_style.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/default_text_style.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/ink_well.dart'; import 'package:sky/widgets/theme.dart'; diff --git a/sky/packages/sky/lib/widgets/radio.dart b/sky/packages/sky/lib/widgets/radio.dart index 912e638b339..034a0cb0727 100644 --- a/sky/packages/sky/lib/widgets/radio.dart +++ b/sky/packages/sky/lib/widgets/radio.dart @@ -7,6 +7,7 @@ import 'dart:sky' as sky; import 'package:sky/rendering/object.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/button_base.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/theme.dart'; diff --git a/sky/packages/sky/lib/widgets/raised_button.dart b/sky/packages/sky/lib/widgets/raised_button.dart index 03d7b8c6ee3..dffc87847ac 100644 --- a/sky/packages/sky/lib/widgets/raised_button.dart +++ b/sky/packages/sky/lib/widgets/raised_button.dart @@ -4,6 +4,7 @@ import 'package:sky/theme/colors.dart' as colors; import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/material_button.dart'; import 'package:sky/widgets/theme.dart'; diff --git a/sky/packages/sky/lib/widgets/snack_bar.dart b/sky/packages/sky/lib/widgets/snack_bar.dart index 83ba2e20b4a..4603fc8f7ff 100644 --- a/sky/packages/sky/lib/widgets/snack_bar.dart +++ b/sky/packages/sky/lib/widgets/snack_bar.dart @@ -10,6 +10,7 @@ import 'package:sky/painting/text_style.dart'; import 'package:sky/theme/typography.dart' as typography; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/default_text_style.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/gesture_detector.dart'; import 'package:sky/widgets/material.dart'; import 'package:sky/widgets/theme.dart'; diff --git a/sky/packages/sky/lib/widgets/theme.dart b/sky/packages/sky/lib/widgets/theme.dart index fb7cad8d3a0..eb568f9fe50 100644 --- a/sky/packages/sky/lib/widgets/theme.dart +++ b/sky/packages/sky/lib/widgets/theme.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:sky/theme/theme_data.dart'; -import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/framework.dart'; export 'package:sky/theme/theme_data.dart' show ThemeData, ThemeBrightness; diff --git a/sky/packages/sky/lib/widgets/tool_bar.dart b/sky/packages/sky/lib/widgets/tool_bar.dart index c14fca7beb9..9ac4821d56b 100644 --- a/sky/packages/sky/lib/widgets/tool_bar.dart +++ b/sky/packages/sky/lib/widgets/tool_bar.dart @@ -11,6 +11,7 @@ import 'package:sky/theme/typography.dart' as typography; import 'package:sky/theme/view_configuration.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/default_text_style.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/icon.dart'; class ToolBar extends Component { diff --git a/sky/packages/sky/lib/widgets/transitions.dart b/sky/packages/sky/lib/widgets/transitions.dart index d7bc35acab4..8144f83fe67 100644 --- a/sky/packages/sky/lib/widgets/transitions.dart +++ b/sky/packages/sky/lib/widgets/transitions.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/widgets/animated_component.dart'; -import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/animated_value.dart'; +import 'package:sky/animation/animation_performance.dart'; +import 'package:sky/widgets/animated_component.dart'; import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:vector_math/vector_math.dart'; export 'package:sky/animation/direction.dart' show Direction;