diff --git a/examples/game/lib/game_demo.dart b/examples/game/lib/game_demo.dart index 88ac1160b..c32561326 100644 --- a/examples/game/lib/game_demo.dart +++ b/examples/game/lib/game_demo.dart @@ -4,9 +4,9 @@ import 'dart:async'; import 'dart:math' as math; import 'dart:sky' as sky; -import 'package:sky/rendering/object.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/framework.dart'; import 'package:skysprites/skysprites.dart'; import 'package:vector_math/vector_math.dart'; diff --git a/examples/game/lib/main.dart b/examples/game/lib/main.dart index 6570eb010..6ba4765f6 100644 --- a/examples/game/lib/main.dart +++ b/examples/game/lib/main.dart @@ -5,15 +5,15 @@ import 'dart:async'; import 'package:sky/mojo/asset_bundle.dart'; -import 'package:sky/theme/colors.dart' as colors; -import 'package:sky/rendering/object.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/button_base.dart'; -import 'package:sky/widgets/navigator.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/title.dart'; -import 'package:sky/widgets/theme.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/button_base.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/theme/colors.dart' as colors; import 'package:skysprites/skysprites.dart'; import 'game_demo.dart'; diff --git a/examples/game/test_drawatlas.dart b/examples/game/test_drawatlas.dart index 56b70d0a4..c6c806197 100644 --- a/examples/game/test_drawatlas.dart +++ b/examples/game/test_drawatlas.dart @@ -1,9 +1,8 @@ import 'dart:sky'; import 'package:sky/mojo/asset_bundle.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/rendering.dart'; import 'package:sky/theme/colors.dart' as colors; -import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets.dart'; import 'package:skysprites/skysprites.dart'; diff --git a/examples/game/test_performance.dart b/examples/game/test_performance.dart index c65e08d80..d7f79cd32 100644 --- a/examples/game/test_performance.dart +++ b/examples/game/test_performance.dart @@ -2,7 +2,7 @@ import 'dart:sky' as sky; import 'dart:math' as math; import 'package:sky/mojo/asset_bundle.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/rendering.dart'; import 'package:sky/theme/colors.dart' as colors; import 'package:sky/widgets.dart'; import 'package:skysprites/skysprites.dart'; diff --git a/sky/packages/sky/lib/editing/editable_text.dart b/sky/packages/sky/lib/editing/editable_text.dart index 2fb6deefc..3a2da193b 100644 --- a/sky/packages/sky/lib/editing/editable_text.dart +++ b/sky/packages/sky/lib/editing/editable_text.dart @@ -7,9 +7,9 @@ import 'dart:sky' as sky; 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'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; const _kCursorBlinkPeriod = 500; // milliseconds const _kCursorGap = 1.0; diff --git a/sky/packages/sky/lib/editing/input.dart b/sky/packages/sky/lib/editing/input.dart index 632e467fb..a253c1a4c 100644 --- a/sky/packages/sky/lib/editing/input.dart +++ b/sky/packages/sky/lib/editing/input.dart @@ -6,10 +6,10 @@ import 'package:sky/editing/editable_string.dart'; import 'package:sky/editing/editable_text.dart'; import 'package:sky/mojo/keyboard.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/focus.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/theme.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/theme.dart'; export 'package:sky/mojo/keyboard.dart' show KeyboardType_TEXT, KeyboardType_NUMBER, KeyboardType_PHONE, KeyboardType_DATETIME; diff --git a/sky/packages/sky/lib/rendering.dart b/sky/packages/sky/lib/rendering.dart index 4755544c3..52db6c6c1 100644 --- a/sky/packages/sky/lib/rendering.dart +++ b/sky/packages/sky/lib/rendering.dart @@ -7,21 +7,21 @@ /// The Sky render tree library rendering; -export 'package:sky/rendering/auto_layout.dart'; -export 'package:sky/rendering/block.dart'; -export 'package:sky/rendering/box.dart'; -export 'package:sky/rendering/flex.dart'; -export 'package:sky/rendering/grid.dart'; -export 'package:sky/rendering/image.dart'; -export 'package:sky/rendering/layer.dart'; -export 'package:sky/rendering/object.dart'; -export 'package:sky/rendering/paragraph.dart'; -export 'package:sky/rendering/proxy_box.dart'; -export 'package:sky/rendering/shifted_box.dart'; -export 'package:sky/rendering/sky_binding.dart'; -export 'package:sky/rendering/stack.dart'; -export 'package:sky/rendering/toggleable.dart'; -export 'package:sky/rendering/view.dart'; -export 'package:sky/rendering/viewport.dart'; +export 'package:sky/src/rendering/auto_layout.dart'; +export 'package:sky/src/rendering/block.dart'; +export 'package:sky/src/rendering/box.dart'; +export 'package:sky/src/rendering/flex.dart'; +export 'package:sky/src/rendering/grid.dart'; +export 'package:sky/src/rendering/image.dart'; +export 'package:sky/src/rendering/layer.dart'; +export 'package:sky/src/rendering/object.dart'; +export 'package:sky/src/rendering/paragraph.dart'; +export 'package:sky/src/rendering/proxy_box.dart'; +export 'package:sky/src/rendering/shifted_box.dart'; +export 'package:sky/src/rendering/sky_binding.dart'; +export 'package:sky/src/rendering/stack.dart'; +export 'package:sky/src/rendering/toggleable.dart'; +export 'package:sky/src/rendering/view.dart'; +export 'package:sky/src/rendering/viewport.dart'; export 'package:vector_math/vector_math.dart' show Matrix4; diff --git a/sky/packages/sky/lib/rendering/README.md b/sky/packages/sky/lib/src/rendering/README.md similarity index 99% rename from sky/packages/sky/lib/rendering/README.md rename to sky/packages/sky/lib/src/rendering/README.md index d14a48a83..91ba8a2ab 100644 --- a/sky/packages/sky/lib/rendering/README.md +++ b/sky/packages/sky/lib/src/rendering/README.md @@ -372,7 +372,7 @@ This can be quite useful in figuring out exactly what is going on when working with the render tree. ```dart -import 'package:sky/rendering/sky_binding.dart'; +import 'package:sky/src/rendering/sky_binding.dart'; import 'package:sky/base/scheduler.dart' as scheduler; scheduler.addPersistentFrameCallback((_) { diff --git a/sky/packages/sky/lib/rendering/auto_layout.dart b/sky/packages/sky/lib/src/rendering/auto_layout.dart similarity index 98% rename from sky/packages/sky/lib/rendering/auto_layout.dart rename to sky/packages/sky/lib/src/rendering/auto_layout.dart index 82ea25573..150f7f4f7 100644 --- a/sky/packages/sky/lib/rendering/auto_layout.dart +++ b/sky/packages/sky/lib/src/rendering/auto_layout.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:cassowary/cassowary.dart' as al; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; /// Hosts the edge parameters and vends useful methods to construct expressions /// for constraints. Also sets up and manages implicit constraints and edit diff --git a/sky/packages/sky/lib/rendering/block.dart b/sky/packages/sky/lib/src/rendering/block.dart similarity index 99% rename from sky/packages/sky/lib/rendering/block.dart rename to sky/packages/sky/lib/src/rendering/block.dart index bb113f6d0..994c81d29 100644 --- a/sky/packages/sky/lib/rendering/block.dart +++ b/sky/packages/sky/lib/src/rendering/block.dart @@ -4,8 +4,8 @@ import 'dart:math' as math; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; import 'package:vector_math/vector_math.dart'; class BlockParentData extends BoxParentData with ContainerParentDataMixin { } diff --git a/sky/packages/sky/lib/rendering/box.dart b/sky/packages/sky/lib/src/rendering/box.dart similarity index 99% rename from sky/packages/sky/lib/rendering/box.dart rename to sky/packages/sky/lib/src/rendering/box.dart index 713dd7f81..2af20e181 100644 --- a/sky/packages/sky/lib/rendering/box.dart +++ b/sky/packages/sky/lib/src/rendering/box.dart @@ -8,7 +8,7 @@ import 'dart:sky' as sky; import 'package:sky/base/debug.dart'; import 'package:sky/painting/box_painter.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/object.dart'; import 'package:vector_math/vector_math.dart'; export 'package:sky/painting/text_style.dart' show TextBaseline; diff --git a/sky/packages/sky/lib/rendering/flex.dart b/sky/packages/sky/lib/src/rendering/flex.dart similarity index 99% rename from sky/packages/sky/lib/rendering/flex.dart rename to sky/packages/sky/lib/src/rendering/flex.dart index a6236e41e..fa3fa3468 100644 --- a/sky/packages/sky/lib/rendering/flex.dart +++ b/sky/packages/sky/lib/src/rendering/flex.dart @@ -4,10 +4,10 @@ import 'dart:math' as math; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; -export 'package:sky/rendering/object.dart' show EventDisposition; +export 'package:sky/src/rendering/object.dart' show EventDisposition; class FlexParentData extends BoxParentData with ContainerParentDataMixin { int flex; diff --git a/sky/packages/sky/lib/rendering/grid.dart b/sky/packages/sky/lib/src/rendering/grid.dart similarity index 98% rename from sky/packages/sky/lib/rendering/grid.dart rename to sky/packages/sky/lib/src/rendering/grid.dart index 37186d932..4431e0f5e 100644 --- a/sky/packages/sky/lib/rendering/grid.dart +++ b/sky/packages/sky/lib/src/rendering/grid.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/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; class GridParentData extends BoxParentData with ContainerParentDataMixin {} diff --git a/sky/packages/sky/lib/rendering/image.dart b/sky/packages/sky/lib/src/rendering/image.dart similarity index 97% rename from sky/packages/sky/lib/rendering/image.dart rename to sky/packages/sky/lib/src/rendering/image.dart index 0d1f5182f..e3eb3a1ad 100644 --- a/sky/packages/sky/lib/rendering/image.dart +++ b/sky/packages/sky/lib/src/rendering/image.dart @@ -5,8 +5,8 @@ import 'dart:sky' as sky; import 'package:sky/painting/box_painter.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; class RenderImage extends RenderBox { RenderImage({ diff --git a/sky/packages/sky/lib/rendering/layer.dart b/sky/packages/sky/lib/src/rendering/layer.dart similarity index 100% rename from sky/packages/sky/lib/rendering/layer.dart rename to sky/packages/sky/lib/src/rendering/layer.dart diff --git a/sky/packages/sky/lib/rendering/object.dart b/sky/packages/sky/lib/src/rendering/object.dart similarity index 99% rename from sky/packages/sky/lib/rendering/object.dart rename to sky/packages/sky/lib/src/rendering/object.dart index 6b5d797cc..0977c1f3e 100644 --- a/sky/packages/sky/lib/rendering/object.dart +++ b/sky/packages/sky/lib/src/rendering/object.dart @@ -10,7 +10,7 @@ import 'package:sky/base/debug.dart'; import 'package:sky/base/hit_test.dart'; import 'package:sky/base/node.dart'; import 'package:sky/base/scheduler.dart' as scheduler; -import 'package:sky/rendering/layer.dart'; +import 'package:sky/src/rendering/layer.dart'; import 'package:vector_math/vector_math.dart'; export 'dart:sky' show Point, Offset, Size, Rect, Color, Paint, Path; diff --git a/sky/packages/sky/lib/rendering/paragraph.dart b/sky/packages/sky/lib/src/rendering/paragraph.dart similarity index 97% rename from sky/packages/sky/lib/rendering/paragraph.dart rename to sky/packages/sky/lib/src/rendering/paragraph.dart index 1f7f1241d..dd0072148 100644 --- a/sky/packages/sky/lib/rendering/paragraph.dart +++ b/sky/packages/sky/lib/src/rendering/paragraph.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:sky/painting/text_painter.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; export 'package:sky/painting/text_painter.dart'; diff --git a/sky/packages/sky/lib/rendering/proxy_box.dart b/sky/packages/sky/lib/src/rendering/proxy_box.dart similarity index 99% rename from sky/packages/sky/lib/rendering/proxy_box.dart rename to sky/packages/sky/lib/src/rendering/proxy_box.dart index 6dec1dfdc..163225077 100644 --- a/sky/packages/sky/lib/rendering/proxy_box.dart +++ b/sky/packages/sky/lib/src/rendering/proxy_box.dart @@ -6,8 +6,8 @@ import 'dart:sky' as sky; import 'package:sky/painting/box_painter.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; import 'package:vector_math/vector_math.dart'; export 'package:sky/painting/box_painter.dart'; diff --git a/sky/packages/sky/lib/rendering/shifted_box.dart b/sky/packages/sky/lib/src/rendering/shifted_box.dart similarity index 98% rename from sky/packages/sky/lib/rendering/shifted_box.dart rename to sky/packages/sky/lib/src/rendering/shifted_box.dart index 22d8f4b4f..a7c32f660 100644 --- a/sky/packages/sky/lib/rendering/shifted_box.dart +++ b/sky/packages/sky/lib/src/rendering/shifted_box.dart @@ -4,8 +4,8 @@ import 'package:sky/painting/box_painter.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; abstract class RenderShiftedBox extends RenderBox with RenderObjectWithChildMixin { diff --git a/sky/packages/sky/lib/rendering/sky_binding.dart b/sky/packages/sky/lib/src/rendering/sky_binding.dart similarity index 97% rename from sky/packages/sky/lib/rendering/sky_binding.dart rename to sky/packages/sky/lib/src/rendering/sky_binding.dart index 59f761c88..4afacd3c4 100644 --- a/sky/packages/sky/lib/rendering/sky_binding.dart +++ b/sky/packages/sky/lib/src/rendering/sky_binding.dart @@ -8,9 +8,9 @@ import 'package:sky/base/pointer_router.dart'; import 'package:sky/base/hit_test.dart'; import 'package:sky/base/scheduler.dart' as scheduler; import 'package:sky/gestures/arena.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/view.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/view.dart'; int _hammingWeight(int value) { if (value == 0) diff --git a/sky/packages/sky/lib/rendering/stack.dart b/sky/packages/sky/lib/src/rendering/stack.dart similarity index 98% rename from sky/packages/sky/lib/rendering/stack.dart rename to sky/packages/sky/lib/src/rendering/stack.dart index 0d850a6c2..4ee6eb55e 100644 --- a/sky/packages/sky/lib/rendering/stack.dart +++ b/sky/packages/sky/lib/src/rendering/stack.dart @@ -4,8 +4,8 @@ import 'dart:math' as math; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; class StackParentData extends BoxParentData with ContainerParentDataMixin { double top; diff --git a/sky/packages/sky/lib/rendering/toggleable.dart b/sky/packages/sky/lib/src/rendering/toggleable.dart similarity index 93% rename from sky/packages/sky/lib/rendering/toggleable.dart rename to sky/packages/sky/lib/src/rendering/toggleable.dart index 796f49cca..c42d1d820 100644 --- a/sky/packages/sky/lib/rendering/toggleable.dart +++ b/sky/packages/sky/lib/src/rendering/toggleable.dart @@ -7,9 +7,9 @@ import 'dart:sky' as sky; import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/proxy_box.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/proxy_box.dart'; typedef void ValueChanged(bool value); diff --git a/sky/packages/sky/lib/rendering/view.dart b/sky/packages/sky/lib/src/rendering/view.dart similarity index 95% rename from sky/packages/sky/lib/rendering/view.dart rename to sky/packages/sky/lib/src/rendering/view.dart index e835ce393..f5c4637d8 100644 --- a/sky/packages/sky/lib/rendering/view.dart +++ b/sky/packages/sky/lib/src/rendering/view.dart @@ -5,9 +5,9 @@ import 'dart:sky' as sky; import 'package:sky/base/scheduler.dart' as scheduler; -import 'package:sky/rendering/layer.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/box.dart'; +import 'package:sky/src/rendering/layer.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; import 'package:vector_math/vector_math.dart'; class ViewConstraints { diff --git a/sky/packages/sky/lib/rendering/viewport.dart b/sky/packages/sky/lib/src/rendering/viewport.dart similarity index 98% rename from sky/packages/sky/lib/rendering/viewport.dart rename to sky/packages/sky/lib/src/rendering/viewport.dart index 7b7664522..96cc073ae 100644 --- a/sky/packages/sky/lib/rendering/viewport.dart +++ b/sky/packages/sky/lib/src/rendering/viewport.dart @@ -4,8 +4,8 @@ import 'dart:sky' as sky; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; import 'package:vector_math/vector_math.dart'; enum ScrollDirection { horizontal, vertical, both } diff --git a/sky/packages/sky/lib/widgets/README.md b/sky/packages/sky/lib/src/widgets/README.md similarity index 100% rename from sky/packages/sky/lib/widgets/README.md rename to sky/packages/sky/lib/src/widgets/README.md diff --git a/sky/packages/sky/lib/widgets/animated_component.dart b/sky/packages/sky/lib/src/widgets/animated_component.dart similarity index 96% rename from sky/packages/sky/lib/widgets/animated_component.dart rename to sky/packages/sky/lib/src/widgets/animated_component.dart index 791341080..2088a4d6a 100644 --- a/sky/packages/sky/lib/widgets/animated_component.dart +++ b/sky/packages/sky/lib/src/widgets/animated_component.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:sky/animation/animation_performance.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; abstract class AnimatedComponent extends StatefulComponent { diff --git a/sky/packages/sky/lib/widgets/animated_container.dart b/sky/packages/sky/lib/src/widgets/animated_container.dart similarity index 98% rename from sky/packages/sky/lib/widgets/animated_container.dart rename to sky/packages/sky/lib/src/widgets/animated_container.dart index 4e53bebe8..0eb19b185 100644 --- a/sky/packages/sky/lib/widgets/animated_container.dart +++ b/sky/packages/sky/lib/src/widgets/animated_container.dart @@ -9,9 +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/animated_component.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/animated_component.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/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/src/widgets/basic.dart similarity index 95% rename from sky/packages/sky/lib/widgets/basic.dart rename to sky/packages/sky/lib/src/widgets/basic.dart index e29786430..469714474 100644 --- a/sky/packages/sky/lib/widgets/basic.dart +++ b/sky/packages/sky/lib/src/widgets/basic.dart @@ -11,29 +11,29 @@ import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/mojo/net/image_cache.dart' as image_cache; import 'package:sky/painting/text_painter.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/rendering/block.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/flex.dart'; -import 'package:sky/rendering/grid.dart'; -import 'package:sky/rendering/image.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/paragraph.dart'; -import 'package:sky/rendering/proxy_box.dart'; -import 'package:sky/rendering/shifted_box.dart'; -import 'package:sky/rendering/stack.dart'; -import 'package:sky/rendering/viewport.dart'; -import 'package:sky/widgets/default_text_style.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/rendering/block.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/flex.dart'; +import 'package:sky/src/rendering/grid.dart'; +import 'package:sky/src/rendering/image.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/paragraph.dart'; +import 'package:sky/src/rendering/proxy_box.dart'; +import 'package:sky/src/rendering/shifted_box.dart'; +import 'package:sky/src/rendering/stack.dart'; +import 'package:sky/src/rendering/viewport.dart'; +import 'package:sky/src/widgets/default_text_style.dart'; +import 'package:sky/src/widgets/framework.dart'; export 'package:sky/base/hit_test.dart' show EventDisposition, combineEventDispositions; export 'package:sky/painting/text_style.dart'; -export 'package:sky/rendering/block.dart' show BlockDirection; -export 'package:sky/rendering/box.dart' show BoxConstraints; -export 'package:sky/rendering/flex.dart' show FlexJustifyContent, FlexAlignItems, FlexDirection; -export 'package:sky/rendering/object.dart' show Point, Offset, Size, Rect, Color, Paint, Path; -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/src/rendering/block.dart' show BlockDirection; +export 'package:sky/src/rendering/box.dart' show BoxConstraints; +export 'package:sky/src/rendering/flex.dart' show FlexJustifyContent, FlexAlignItems, FlexDirection; +export 'package:sky/src/rendering/object.dart' show Point, Offset, Size, Rect, Color, Paint, Path; +export 'package:sky/src/rendering/proxy_box.dart' show BackgroundImage, BoxDecoration, BoxDecorationPosition, BoxShadow, Border, BorderSide, EdgeDims, Shape; +export 'package:sky/src/rendering/toggleable.dart' show ValueChanged; +export 'package:sky/src/rendering/viewport.dart' show ScrollDirection; // PAINTING NODES diff --git a/sky/packages/sky/lib/widgets/button_base.dart b/sky/packages/sky/lib/src/widgets/button_base.dart similarity index 95% rename from sky/packages/sky/lib/widgets/button_base.dart rename to sky/packages/sky/lib/src/widgets/button_base.dart index bf0829f3c..7fd9b934b 100644 --- a/sky/packages/sky/lib/widgets/button_base.dart +++ b/sky/packages/sky/lib/src/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/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; abstract class ButtonBase extends StatefulComponent { diff --git a/sky/packages/sky/lib/widgets/card.dart b/sky/packages/sky/lib/src/widgets/card.dart similarity index 82% rename from sky/packages/sky/lib/widgets/card.dart rename to sky/packages/sky/lib/src/widgets/card.dart index 3f86a7821..db059fb6e 100644 --- a/sky/packages/sky/lib/widgets/card.dart +++ b/sky/packages/sky/lib/src/widgets/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/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/material.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/material.dart'; const EdgeDims _kCardMargins = const EdgeDims.all(4.0); diff --git a/sky/packages/sky/lib/widgets/checkbox.dart b/sky/packages/sky/lib/src/widgets/checkbox.dart similarity index 94% rename from sky/packages/sky/lib/widgets/checkbox.dart rename to sky/packages/sky/lib/src/widgets/checkbox.dart index 6e615d0d6..f4dc443ce 100644 --- a/sky/packages/sky/lib/widgets/checkbox.dart +++ b/sky/packages/sky/lib/src/widgets/checkbox.dart @@ -4,13 +4,13 @@ import 'dart:sky' as sky; -import 'package:sky/rendering/object.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/rendering/toggleable.dart'; +import 'package:sky/src/rendering/object.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/rendering/toggleable.dart'; -export 'package:sky/rendering/toggleable.dart' show ValueChanged; +export 'package:sky/src/rendering/toggleable.dart' show ValueChanged; const double _kMidpoint = 0.5; const sky.Color _kLightUncheckedColor = const sky.Color(0x8A000000); diff --git a/sky/packages/sky/lib/widgets/date_picker.dart b/sky/packages/sky/lib/src/widgets/date_picker.dart similarity index 97% rename from sky/packages/sky/lib/widgets/date_picker.dart rename to sky/packages/sky/lib/src/widgets/date_picker.dart index b6747be44..101a80975 100644 --- a/sky/packages/sky/lib/widgets/date_picker.dart +++ b/sky/packages/sky/lib/src/widgets/date_picker.dart @@ -9,12 +9,12 @@ 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/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'; +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'; typedef void DatePickerValueChanged(DateTime dateTime); diff --git a/sky/packages/sky/lib/widgets/default_text_style.dart b/sky/packages/sky/lib/src/widgets/default_text_style.dart similarity index 87% rename from sky/packages/sky/lib/widgets/default_text_style.dart rename to sky/packages/sky/lib/src/widgets/default_text_style.dart index c4a763d29..4c8b18e63 100644 --- a/sky/packages/sky/lib/widgets/default_text_style.dart +++ b/sky/packages/sky/lib/src/widgets/default_text_style.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:sky/painting/text_style.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; class DefaultTextStyle extends Inherited { diff --git a/sky/packages/sky/lib/widgets/dialog.dart b/sky/packages/sky/lib/src/widgets/dialog.dart similarity index 90% rename from sky/packages/sky/lib/widgets/dialog.dart rename to sky/packages/sky/lib/src/widgets/dialog.dart index 979b7772a..7ab5b32bd 100644 --- a/sky/packages/sky/lib/widgets/dialog.dart +++ b/sky/packages/sky/lib/src/widgets/dialog.dart @@ -7,16 +7,16 @@ import 'dart:async'; import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/curves.dart'; 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'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/transitions.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.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/navigator.dart'; +import 'package:sky/src/widgets/scrollable.dart'; +import 'package:sky/src/widgets/theme.dart'; +import 'package:sky/src/widgets/transitions.dart'; typedef Widget DialogBuilder(Navigator navigator); diff --git a/sky/packages/sky/lib/widgets/dismissable.dart b/sky/packages/sky/lib/src/widgets/dismissable.dart similarity index 96% rename from sky/packages/sky/lib/widgets/dismissable.dart rename to sky/packages/sky/lib/src/widgets/dismissable.dart index c33b24e9e..321fc1c9f 100644 --- a/sky/packages/sky/lib/widgets/dismissable.dart +++ b/sky/packages/sky/lib/src/widgets/dismissable.dart @@ -7,10 +7,10 @@ import 'dart:sky' as sky; import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/transitions.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/gesture_detector.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'; const Duration _kCardDismissFadeout = const Duration(milliseconds: 200); const Duration _kCardDismissResize = const Duration(milliseconds: 300); diff --git a/sky/packages/sky/lib/widgets/drag_target.dart b/sky/packages/sky/lib/src/widgets/drag_target.dart similarity index 94% rename from sky/packages/sky/lib/widgets/drag_target.dart rename to sky/packages/sky/lib/src/widgets/drag_target.dart index 63e8c1ec9..3b9b2d5a3 100644 --- a/sky/packages/sky/lib/widgets/drag_target.dart +++ b/sky/packages/sky/lib/src/widgets/drag_target.dart @@ -5,10 +5,10 @@ import 'dart:collection'; import 'package:sky/base/hit_test.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/sky_binding.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/sky_binding.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; typedef bool DragTargetWillAccept(T data); typedef void DragTargetAccept(T data); diff --git a/sky/packages/sky/lib/widgets/drawer.dart b/sky/packages/sky/lib/src/widgets/drawer.dart similarity index 92% rename from sky/packages/sky/lib/widgets/drawer.dart rename to sky/packages/sky/lib/src/widgets/drawer.dart index 1822e395d..feb2a0296 100644 --- a/sky/packages/sky/lib/widgets/drawer.dart +++ b/sky/packages/sky/lib/src/widgets/drawer.dart @@ -10,14 +10,14 @@ import 'package:sky/animation/animation_performance.dart'; 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'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/transitions.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/scrollable.dart'; +import 'package:sky/src/widgets/theme.dart'; +import 'package:sky/src/widgets/transitions.dart'; export 'package:sky/animation/animation_performance.dart' show AnimationStatus; diff --git a/sky/packages/sky/lib/widgets/drawer_divider.dart b/sky/packages/sky/lib/src/widgets/drawer_divider.dart similarity index 80% rename from sky/packages/sky/lib/widgets/drawer_divider.dart rename to sky/packages/sky/lib/src/widgets/drawer_divider.dart index e29dd95bc..a73fbdefe 100644 --- a/sky/packages/sky/lib/widgets/drawer_divider.dart +++ b/sky/packages/sky/lib/src/widgets/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/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/theme.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/theme.dart'; class DrawerDivider extends Component { DrawerDivider({ Key key }) : super(key: key); diff --git a/sky/packages/sky/lib/widgets/drawer_header.dart b/sky/packages/sky/lib/src/widgets/drawer_header.dart similarity index 86% rename from sky/packages/sky/lib/widgets/drawer_header.dart rename to sky/packages/sky/lib/src/widgets/drawer_header.dart index f2c7caff9..64c393e87 100644 --- a/sky/packages/sky/lib/widgets/drawer_header.dart +++ b/sky/packages/sky/lib/src/widgets/drawer_header.dart @@ -3,10 +3,10 @@ // found in the LICENSE file. 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'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/theme.dart'; // TODO(jackson): This class should usually render the user's // preferred banner image rather than a solid background diff --git a/sky/packages/sky/lib/widgets/drawer_item.dart b/sky/packages/sky/lib/src/widgets/drawer_item.dart similarity index 85% rename from sky/packages/sky/lib/widgets/drawer_item.dart rename to sky/packages/sky/lib/src/widgets/drawer_item.dart index 84b878763..bda484e40 100644 --- a/sky/packages/sky/lib/widgets/drawer_item.dart +++ b/sky/packages/sky/lib/src/widgets/drawer_item.dart @@ -6,14 +6,14 @@ import 'dart:sky' as sky; import 'package:sky/painting/text_style.dart'; import 'package:sky/theme/colors.dart' as colors; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/button_base.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/icon.dart'; -import 'package:sky/widgets/ink_well.dart'; -import 'package:sky/widgets/theme.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/button_base.dart'; +import 'package:sky/src/widgets/default_text_style.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/gesture_detector.dart'; +import 'package:sky/src/widgets/icon.dart'; +import 'package:sky/src/widgets/ink_well.dart'; +import 'package:sky/src/widgets/theme.dart'; typedef EventDisposition OnPressedFunction(); diff --git a/sky/packages/sky/lib/widgets/flat_button.dart b/sky/packages/sky/lib/src/widgets/flat_button.dart similarity index 82% rename from sky/packages/sky/lib/widgets/flat_button.dart rename to sky/packages/sky/lib/src/widgets/flat_button.dart index f61e95d73..d7bfe263b 100644 --- a/sky/packages/sky/lib/widgets/flat_button.dart +++ b/sky/packages/sky/lib/src/widgets/flat_button.dart @@ -3,9 +3,9 @@ // found in the LICENSE file. import 'package:sky/theme/colors.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/material_button.dart'; -import 'package:sky/widgets/theme.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/material_button.dart'; +import 'package:sky/src/widgets/theme.dart'; class FlatButton extends MaterialButton { FlatButton({ diff --git a/sky/packages/sky/lib/widgets/floating_action_button.dart b/sky/packages/sky/lib/src/widgets/floating_action_button.dart similarity index 82% rename from sky/packages/sky/lib/widgets/floating_action_button.dart rename to sky/packages/sky/lib/src/widgets/floating_action_button.dart index e6efe3340..ddc2eb0fe 100644 --- a/sky/packages/sky/lib/widgets/floating_action_button.dart +++ b/sky/packages/sky/lib/src/widgets/floating_action_button.dart @@ -2,14 +2,14 @@ // 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/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'; -import 'package:sky/widgets/material.dart'; -import 'package:sky/widgets/theme.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/button_base.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/gesture_detector.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'; // 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/sky/packages/sky/lib/widgets/focus.dart b/sky/packages/sky/lib/src/widgets/focus.dart similarity index 99% rename from sky/packages/sky/lib/widgets/focus.dart rename to sky/packages/sky/lib/src/widgets/focus.dart index 44f8aaacf..139a8cb89 100644 --- a/sky/packages/sky/lib/widgets/focus.dart +++ b/sky/packages/sky/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/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; typedef void FocusChanged(GlobalKey key); diff --git a/sky/packages/sky/lib/widgets/framework.dart b/sky/packages/sky/lib/src/widgets/framework.dart similarity index 99% rename from sky/packages/sky/lib/widgets/framework.dart rename to sky/packages/sky/lib/src/widgets/framework.dart index b29384b8b..badcf927d 100644 --- a/sky/packages/sky/lib/widgets/framework.dart +++ b/sky/packages/sky/lib/src/widgets/framework.dart @@ -9,14 +9,14 @@ import 'dart:sky' as sky; import 'package:sky/base/hit_test.dart'; import 'package:sky/base/scheduler.dart' as scheduler; import 'package:sky/mojo/activity.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/sky_binding.dart'; -import 'package:sky/rendering/view.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/sky_binding.dart'; +import 'package:sky/src/rendering/view.dart'; export 'package:sky/base/hit_test.dart' show EventDisposition, combineEventDispositions; -export 'package:sky/rendering/box.dart' show BoxConstraints, BoxDecoration, Border, BorderSide, EdgeDims; -export 'package:sky/rendering/object.dart' show Point, Offset, Size, Rect, Color, Paint, Path; +export 'package:sky/src/rendering/box.dart' show BoxConstraints, BoxDecoration, Border, BorderSide, EdgeDims; +export 'package:sky/src/rendering/object.dart' show Point, Offset, Size, Rect, Color, Paint, Path; final bool _shouldLogRenderDuration = false; // see also 'enableProfilingLoop' argument to runApp() diff --git a/sky/packages/sky/lib/widgets/gesture_detector.dart b/sky/packages/sky/lib/src/widgets/gesture_detector.dart similarity index 98% rename from sky/packages/sky/lib/widgets/gesture_detector.dart rename to sky/packages/sky/lib/src/widgets/gesture_detector.dart index 768dad374..904d39192 100644 --- a/sky/packages/sky/lib/widgets/gesture_detector.dart +++ b/sky/packages/sky/lib/src/widgets/gesture_detector.dart @@ -9,8 +9,8 @@ import 'package:sky/gestures/recognizer.dart'; import 'package:sky/gestures/scroll.dart'; import 'package:sky/gestures/show_press.dart'; import 'package:sky/gestures/tap.dart'; -import 'package:sky/rendering/sky_binding.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/rendering/sky_binding.dart'; +import 'package:sky/src/widgets/framework.dart'; class GestureDetector extends StatefulComponent { GestureDetector({ diff --git a/sky/packages/sky/lib/widgets/homogeneous_viewport.dart b/sky/packages/sky/lib/src/widgets/homogeneous_viewport.dart similarity index 96% rename from sky/packages/sky/lib/widgets/homogeneous_viewport.dart rename to sky/packages/sky/lib/src/widgets/homogeneous_viewport.dart index e613112c5..dcca0b3b8 100644 --- a/sky/packages/sky/lib/widgets/homogeneous_viewport.dart +++ b/sky/packages/sky/lib/src/widgets/homogeneous_viewport.dart @@ -4,11 +4,11 @@ import 'dart:math' as math; -import 'package:sky/rendering/block.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/basic.dart'; +import 'package:sky/src/rendering/block.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/basic.dart'; typedef List ListBuilder(int startIndex, int count); diff --git a/sky/packages/sky/lib/widgets/icon.dart b/sky/packages/sky/lib/src/widgets/icon.dart similarity index 94% rename from sky/packages/sky/lib/widgets/icon.dart rename to sky/packages/sky/lib/src/widgets/icon.dart index 768cfc20b..495bd0120 100644 --- a/sky/packages/sky/lib/widgets/icon.dart +++ b/sky/packages/sky/lib/src/widgets/icon.dart @@ -5,9 +5,9 @@ import 'dart:sky' as sky; import 'package:sky/mojo/asset_bundle.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/theme.dart'; +import 'package:sky/src/widgets/framework.dart'; enum IconThemeColor { white, black } diff --git a/sky/packages/sky/lib/widgets/icon_button.dart b/sky/packages/sky/lib/src/widgets/icon_button.dart similarity index 80% rename from sky/packages/sky/lib/widgets/icon_button.dart rename to sky/packages/sky/lib/src/widgets/icon_button.dart index af32206eb..714f1ae70 100644 --- a/sky/packages/sky/lib/widgets/icon_button.dart +++ b/sky/packages/sky/lib/src/widgets/icon_button.dart @@ -4,10 +4,10 @@ import 'dart:sky' as sky; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/icon.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/gesture_detector.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'; class IconButton extends Component { diff --git a/sky/packages/sky/lib/widgets/ink_well.dart b/sky/packages/sky/lib/src/widgets/ink_well.dart similarity index 94% rename from sky/packages/sky/lib/widgets/ink_well.dart rename to sky/packages/sky/lib/src/widgets/ink_well.dart index 6e2e22e22..584491212 100644 --- a/sky/packages/sky/lib/widgets/ink_well.dart +++ b/sky/packages/sky/lib/src/widgets/ink_well.dart @@ -8,11 +8,11 @@ import 'dart:sky' as sky; import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/proxy_box.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/proxy_box.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; const int _kSplashInitialOpacity = 0x30; const double _kSplashCancelledVelocity = 0.7; diff --git a/sky/packages/sky/lib/widgets/material.dart b/sky/packages/sky/lib/src/widgets/material.dart similarity index 87% rename from sky/packages/sky/lib/widgets/material.dart rename to sky/packages/sky/lib/src/widgets/material.dart index 5a03e6b6f..129f39de2 100644 --- a/sky/packages/sky/lib/widgets/material.dart +++ b/sky/packages/sky/lib/src/widgets/material.dart @@ -4,11 +4,11 @@ import 'package:sky/painting/box_painter.dart'; 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'; +import 'package:sky/src/widgets/animated_container.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/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/src/widgets/material_button.dart similarity index 82% rename from sky/packages/sky/lib/widgets/material_button.dart rename to sky/packages/sky/lib/src/widgets/material_button.dart index ca13b9099..747c218f3 100644 --- a/sky/packages/sky/lib/widgets/material_button.dart +++ b/sky/packages/sky/lib/src/widgets/material_button.dart @@ -2,12 +2,12 @@ // 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/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'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/button_base.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/material.dart'; // Rather than using this class directly, please use FlatButton or RaisedButton. abstract class MaterialButton extends ButtonBase { diff --git a/sky/packages/sky/lib/widgets/mimic.dart b/sky/packages/sky/lib/src/widgets/mimic.dart similarity index 97% rename from sky/packages/sky/lib/widgets/mimic.dart rename to sky/packages/sky/lib/src/widgets/mimic.dart index b87028b8e..6d5f29a96 100644 --- a/sky/packages/sky/lib/widgets/mimic.dart +++ b/sky/packages/sky/lib/src/widgets/mimic.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/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/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/src/widgets/mimic_overlay.dart similarity index 94% rename from sky/packages/sky/lib/widgets/mimic_overlay.dart rename to sky/packages/sky/lib/src/widgets/mimic_overlay.dart index ef09885f5..f4958d6ab 100644 --- a/sky/packages/sky/lib/widgets/mimic_overlay.dart +++ b/sky/packages/sky/lib/src/widgets/mimic_overlay.dart @@ -5,10 +5,10 @@ import 'package:sky/animation/animated_value.dart'; 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'; +import 'package:sky/src/widgets/animated_component.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/mimic.dart'; class MimicOverlay extends AnimatedComponent { MimicOverlay({ diff --git a/sky/packages/sky/lib/widgets/mixed_viewport.dart b/sky/packages/sky/lib/src/widgets/mixed_viewport.dart similarity index 98% rename from sky/packages/sky/lib/widgets/mixed_viewport.dart rename to sky/packages/sky/lib/src/widgets/mixed_viewport.dart index 5bd9dcf72..dd2b4203f 100644 --- a/sky/packages/sky/lib/widgets/mixed_viewport.dart +++ b/sky/packages/sky/lib/src/widgets/mixed_viewport.dart @@ -4,11 +4,11 @@ import 'dart:collection'; -import 'package:sky/rendering/block.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/basic.dart'; +import 'package:sky/src/rendering/block.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/basic.dart'; // return null if index is greater than index of last entry typedef Widget IndexedBuilder(int index); diff --git a/sky/packages/sky/lib/widgets/modal_overlay.dart b/sky/packages/sky/lib/src/widgets/modal_overlay.dart similarity index 75% rename from sky/packages/sky/lib/widgets/modal_overlay.dart rename to sky/packages/sky/lib/src/widgets/modal_overlay.dart index 35595a8c7..16ed10f73 100644 --- a/sky/packages/sky/lib/widgets/modal_overlay.dart +++ b/sky/packages/sky/lib/src/widgets/modal_overlay.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/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/gesture_detector.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/gesture_detector.dart'; class ModalOverlay extends Component { diff --git a/sky/packages/sky/lib/widgets/navigator.dart b/sky/packages/sky/lib/src/widgets/navigator.dart similarity index 96% rename from sky/packages/sky/lib/widgets/navigator.dart rename to sky/packages/sky/lib/src/widgets/navigator.dart index b848a9759..8fa3a1107 100644 --- a/sky/packages/sky/lib/widgets/navigator.dart +++ b/sky/packages/sky/lib/src/widgets/navigator.dart @@ -5,10 +5,10 @@ import 'package:sky/animation/animated_value.dart'; 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'; +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'; typedef Widget RouteBuilder(Navigator navigator, RouteBase route); diff --git a/sky/packages/sky/lib/widgets/popup_menu.dart b/sky/packages/sky/lib/src/widgets/popup_menu.dart similarity index 94% rename from sky/packages/sky/lib/widgets/popup_menu.dart rename to sky/packages/sky/lib/src/widgets/popup_menu.dart index 89a92486a..f08d7b7d9 100644 --- a/sky/packages/sky/lib/widgets/popup_menu.dart +++ b/sky/packages/sky/lib/src/widgets/popup_menu.dart @@ -9,12 +9,12 @@ import 'package:sky/animation/animation_performance.dart'; 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'; -import 'package:sky/widgets/transitions.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.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/transitions.dart'; export 'package:sky/animation/animation_performance.dart' show AnimationStatus; diff --git a/sky/packages/sky/lib/widgets/popup_menu_item.dart b/sky/packages/sky/lib/src/widgets/popup_menu_item.dart similarity index 76% rename from sky/packages/sky/lib/widgets/popup_menu_item.dart rename to sky/packages/sky/lib/src/widgets/popup_menu_item.dart index 1de7169ae..01cefe075 100644 --- a/sky/packages/sky/lib/widgets/popup_menu_item.dart +++ b/sky/packages/sky/lib/src/widgets/popup_menu_item.dart @@ -3,12 +3,12 @@ // found in the LICENSE file. 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'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.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/theme.dart'; const double _kMenuItemHeight = 48.0; const double _kBaselineOffsetFromBottom = 20.0; diff --git a/sky/packages/sky/lib/widgets/progress_indicator.dart b/sky/packages/sky/lib/src/widgets/progress_indicator.dart similarity index 96% rename from sky/packages/sky/lib/widgets/progress_indicator.dart rename to sky/packages/sky/lib/src/widgets/progress_indicator.dart index 0aa56dff8..3688e43d4 100644 --- a/sky/packages/sky/lib/widgets/progress_indicator.dart +++ b/sky/packages/sky/lib/src/widgets/progress_indicator.dart @@ -8,10 +8,10 @@ import 'dart:sky' as sky; import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/curves.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/transitions.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'; const double _kLinearProgressIndicatorHeight = 6.0; const double _kMinCircularProgressIndicatorSize = 15.0; diff --git a/sky/packages/sky/lib/widgets/radio.dart b/sky/packages/sky/lib/src/widgets/radio.dart similarity index 87% rename from sky/packages/sky/lib/widgets/radio.dart rename to sky/packages/sky/lib/src/widgets/radio.dart index 034a0cb07..6592ee9b7 100644 --- a/sky/packages/sky/lib/widgets/radio.dart +++ b/sky/packages/sky/lib/src/widgets/radio.dart @@ -4,12 +4,12 @@ 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'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/button_base.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/gesture_detector.dart'; +import 'package:sky/src/widgets/theme.dart'; const sky.Color _kLightOffColor = const sky.Color(0x8A000000); const sky.Color _kDarkOffColor = const sky.Color(0xB2FFFFFF); diff --git a/sky/packages/sky/lib/widgets/raised_button.dart b/sky/packages/sky/lib/src/widgets/raised_button.dart similarity index 84% rename from sky/packages/sky/lib/widgets/raised_button.dart rename to sky/packages/sky/lib/src/widgets/raised_button.dart index dffc87847..23a8e2512 100644 --- a/sky/packages/sky/lib/widgets/raised_button.dart +++ b/sky/packages/sky/lib/src/widgets/raised_button.dart @@ -3,10 +3,10 @@ // found in the LICENSE file. 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'; +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'; class RaisedButton extends MaterialButton { diff --git a/sky/packages/sky/lib/widgets/scaffold.dart b/sky/packages/sky/lib/src/widgets/scaffold.dart similarity index 98% rename from sky/packages/sky/lib/widgets/scaffold.dart rename to sky/packages/sky/lib/src/widgets/scaffold.dart index c87c79c1c..dc1928e4c 100644 --- a/sky/packages/sky/lib/widgets/scaffold.dart +++ b/sky/packages/sky/lib/src/widgets/scaffold.dart @@ -4,10 +4,10 @@ import 'dart:sky' as sky; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; import 'package:sky/theme/view_configuration.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; // Slots are painted in this order and hit tested in reverse of this order enum ScaffoldSlots { diff --git a/sky/packages/sky/lib/widgets/scrollable.dart b/sky/packages/sky/lib/src/widgets/scrollable.dart similarity index 97% rename from sky/packages/sky/lib/widgets/scrollable.dart rename to sky/packages/sky/lib/src/widgets/scrollable.dart index bdd8b8092..9c3238017 100644 --- a/sky/packages/sky/lib/widgets/scrollable.dart +++ b/sky/packages/sky/lib/src/widgets/scrollable.dart @@ -13,15 +13,15 @@ import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; import 'package:sky/animation/scroll_behavior.dart'; import 'package:sky/gestures/constants.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/viewport.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/widgets/gesture_detector.dart'; -import 'package:sky/widgets/homogeneous_viewport.dart'; -import 'package:sky/widgets/mixed_viewport.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/viewport.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'; -export 'package:sky/widgets/mixed_viewport.dart' show MixedViewportLayoutState; +export 'package:sky/src/widgets/mixed_viewport.dart' show MixedViewportLayoutState; // The GestureEvent velocity properties are pixels/second, config min,max limits are pixels/ms const double _kMillisecondsPerSecond = 1000.0; diff --git a/sky/packages/sky/lib/widgets/sizing.md b/sky/packages/sky/lib/src/widgets/sizing.md similarity index 100% rename from sky/packages/sky/lib/widgets/sizing.md rename to sky/packages/sky/lib/src/widgets/sizing.md diff --git a/sky/packages/sky/lib/widgets/snack_bar.dart b/sky/packages/sky/lib/src/widgets/snack_bar.dart similarity index 88% rename from sky/packages/sky/lib/widgets/snack_bar.dart rename to sky/packages/sky/lib/src/widgets/snack_bar.dart index 4603fc8f7..2e5a521a9 100644 --- a/sky/packages/sky/lib/widgets/snack_bar.dart +++ b/sky/packages/sky/lib/src/widgets/snack_bar.dart @@ -8,13 +8,13 @@ import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; 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'; -import 'package:sky/widgets/transitions.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.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/theme.dart'; +import 'package:sky/src/widgets/transitions.dart'; export 'package:sky/animation/animation_performance.dart' show AnimationStatus; diff --git a/sky/packages/sky/lib/widgets/switch.dart b/sky/packages/sky/lib/src/widgets/switch.dart similarity index 92% rename from sky/packages/sky/lib/widgets/switch.dart rename to sky/packages/sky/lib/src/widgets/switch.dart index 573716dc9..50614ddbb 100644 --- a/sky/packages/sky/lib/widgets/switch.dart +++ b/sky/packages/sky/lib/src/widgets/switch.dart @@ -7,15 +7,15 @@ import 'dart:sky' as sky; import 'package:sky/painting/radial_reaction.dart'; import 'package:sky/painting/shadows.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; import 'package:sky/theme/shadows.dart'; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/framework.dart'; -import 'package:sky/rendering/toggleable.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/rendering/toggleable.dart'; -export 'package:sky/rendering/toggleable.dart' show ValueChanged; +export 'package:sky/src/rendering/toggleable.dart' show ValueChanged; const sky.Color _kThumbOffColor = const sky.Color(0xFFFAFAFA); const sky.Color _kTrackOffColor = const sky.Color(0x42000000); diff --git a/sky/packages/sky/lib/widgets/tabs.dart b/sky/packages/sky/lib/src/widgets/tabs.dart similarity index 96% rename from sky/packages/sky/lib/widgets/tabs.dart rename to sky/packages/sky/lib/src/widgets/tabs.dart index 0b78f857e..804efe3ad 100644 --- a/sky/packages/sky/lib/widgets/tabs.dart +++ b/sky/packages/sky/lib/src/widgets/tabs.dart @@ -11,20 +11,20 @@ import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/curves.dart'; import 'package:sky/animation/scroll_behavior.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; -import 'package:sky/rendering/viewport.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/rendering/viewport.dart'; import 'package:sky/theme/colors.dart' as colors; 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/icon.dart'; -import 'package:sky/widgets/ink_well.dart'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/transitions.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/gesture_detector.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'; typedef void SelectedIndexChanged(int selectedIndex); typedef void LayoutChanged(Size size, List widths); diff --git a/sky/packages/sky/lib/widgets/theme.dart b/sky/packages/sky/lib/src/widgets/theme.dart similarity index 94% rename from sky/packages/sky/lib/widgets/theme.dart rename to sky/packages/sky/lib/src/widgets/theme.dart index eb568f9fe..36a1ac727 100644 --- a/sky/packages/sky/lib/widgets/theme.dart +++ b/sky/packages/sky/lib/src/widgets/theme.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:sky/theme/theme_data.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; export 'package:sky/theme/theme_data.dart' show ThemeData, ThemeBrightness; diff --git a/sky/packages/sky/lib/widgets/title.dart b/sky/packages/sky/lib/src/widgets/title.dart similarity index 82% rename from sky/packages/sky/lib/widgets/title.dart rename to sky/packages/sky/lib/src/widgets/title.dart index f77552948..be99b687c 100644 --- a/sky/packages/sky/lib/widgets/title.dart +++ b/sky/packages/sky/lib/src/widgets/title.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:sky/mojo/activity.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/theme.dart'; +import 'package:sky/src/widgets/framework.dart'; class Title extends Component { diff --git a/sky/packages/sky/lib/widgets/tool_bar.dart b/sky/packages/sky/lib/src/widgets/tool_bar.dart similarity index 89% rename from sky/packages/sky/lib/widgets/tool_bar.dart rename to sky/packages/sky/lib/src/widgets/tool_bar.dart index 9ac4821d5..8eff10e65 100644 --- a/sky/packages/sky/lib/widgets/tool_bar.dart +++ b/sky/packages/sky/lib/src/widgets/tool_bar.dart @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/widgets/theme.dart'; +import 'package:sky/src/widgets/theme.dart'; import 'package:sky/painting/text_style.dart'; -import 'package:sky/rendering/flex.dart'; +import 'package:sky/src/rendering/flex.dart'; import 'package:sky/theme/shadows.dart'; 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'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/default_text_style.dart'; +import 'package:sky/src/widgets/framework.dart'; +import 'package:sky/src/widgets/icon.dart'; class ToolBar extends Component { diff --git a/sky/packages/sky/lib/widgets/transitions.dart b/sky/packages/sky/lib/src/widgets/transitions.dart similarity index 98% rename from sky/packages/sky/lib/widgets/transitions.dart rename to sky/packages/sky/lib/src/widgets/transitions.dart index 8144f83fe..2a23e0504 100644 --- a/sky/packages/sky/lib/widgets/transitions.dart +++ b/sky/packages/sky/lib/src/widgets/transitions.dart @@ -4,9 +4,9 @@ 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:sky/src/widgets/animated_component.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/framework.dart'; import 'package:vector_math/vector_math.dart'; export 'package:sky/animation/direction.dart' show Direction; diff --git a/sky/packages/sky/lib/widgets/widgets.md b/sky/packages/sky/lib/src/widgets/widgets.md similarity index 100% rename from sky/packages/sky/lib/widgets/widgets.md rename to sky/packages/sky/lib/src/widgets/widgets.md diff --git a/sky/packages/sky/lib/widgets.dart b/sky/packages/sky/lib/widgets.dart index f38b6f91a..44f290e26 100644 --- a/sky/packages/sky/lib/widgets.dart +++ b/sky/packages/sky/lib/widgets.dart @@ -7,50 +7,50 @@ /// The Sky widget framework library widgets; -export 'package:sky/widgets/animated_component.dart'; -export 'package:sky/widgets/animated_container.dart'; -export 'package:sky/widgets/basic.dart'; -export 'package:sky/widgets/button_base.dart'; -export 'package:sky/widgets/card.dart'; -export 'package:sky/widgets/checkbox.dart'; -export 'package:sky/widgets/date_picker.dart'; -export 'package:sky/widgets/default_text_style.dart'; -export 'package:sky/widgets/dialog.dart'; -export 'package:sky/widgets/dismissable.dart'; -export 'package:sky/widgets/drag_target.dart'; -export 'package:sky/widgets/drawer.dart'; -export 'package:sky/widgets/drawer_divider.dart'; -export 'package:sky/widgets/drawer_header.dart'; -export 'package:sky/widgets/drawer_item.dart'; -export 'package:sky/widgets/flat_button.dart'; -export 'package:sky/widgets/floating_action_button.dart'; -export 'package:sky/widgets/focus.dart'; -export 'package:sky/widgets/framework.dart'; -export 'package:sky/widgets/gesture_detector.dart'; -export 'package:sky/widgets/homogeneous_viewport.dart'; -export 'package:sky/widgets/icon.dart'; -export 'package:sky/widgets/icon_button.dart'; -export 'package:sky/widgets/ink_well.dart'; -export 'package:sky/widgets/material.dart'; -export 'package:sky/widgets/material_button.dart'; -export 'package:sky/widgets/mimic.dart'; -export 'package:sky/widgets/mimic_overlay.dart'; -export 'package:sky/widgets/mixed_viewport.dart'; -export 'package:sky/widgets/modal_overlay.dart'; -export 'package:sky/widgets/navigator.dart'; -export 'package:sky/widgets/popup_menu.dart'; -export 'package:sky/widgets/popup_menu_item.dart'; -export 'package:sky/widgets/progress_indicator.dart'; -export 'package:sky/widgets/radio.dart'; -export 'package:sky/widgets/raised_button.dart'; -export 'package:sky/widgets/scaffold.dart'; -export 'package:sky/widgets/scrollable.dart'; -export 'package:sky/widgets/snack_bar.dart'; -export 'package:sky/widgets/switch.dart'; -export 'package:sky/widgets/tabs.dart'; -export 'package:sky/widgets/theme.dart'; -export 'package:sky/widgets/title.dart'; -export 'package:sky/widgets/tool_bar.dart'; -export 'package:sky/widgets/transitions.dart'; +export 'package:sky/src/widgets/animated_component.dart'; +export 'package:sky/src/widgets/animated_container.dart'; +export 'package:sky/src/widgets/basic.dart'; +export 'package:sky/src/widgets/button_base.dart'; +export 'package:sky/src/widgets/card.dart'; +export 'package:sky/src/widgets/checkbox.dart'; +export 'package:sky/src/widgets/date_picker.dart'; +export 'package:sky/src/widgets/default_text_style.dart'; +export 'package:sky/src/widgets/dialog.dart'; +export 'package:sky/src/widgets/dismissable.dart'; +export 'package:sky/src/widgets/drag_target.dart'; +export 'package:sky/src/widgets/drawer.dart'; +export 'package:sky/src/widgets/drawer_divider.dart'; +export 'package:sky/src/widgets/drawer_header.dart'; +export 'package:sky/src/widgets/drawer_item.dart'; +export 'package:sky/src/widgets/flat_button.dart'; +export 'package:sky/src/widgets/floating_action_button.dart'; +export 'package:sky/src/widgets/focus.dart'; +export 'package:sky/src/widgets/framework.dart'; +export 'package:sky/src/widgets/gesture_detector.dart'; +export 'package:sky/src/widgets/homogeneous_viewport.dart'; +export 'package:sky/src/widgets/icon.dart'; +export 'package:sky/src/widgets/icon_button.dart'; +export 'package:sky/src/widgets/ink_well.dart'; +export 'package:sky/src/widgets/material.dart'; +export 'package:sky/src/widgets/material_button.dart'; +export 'package:sky/src/widgets/mimic.dart'; +export 'package:sky/src/widgets/mimic_overlay.dart'; +export 'package:sky/src/widgets/mixed_viewport.dart'; +export 'package:sky/src/widgets/modal_overlay.dart'; +export 'package:sky/src/widgets/navigator.dart'; +export 'package:sky/src/widgets/popup_menu.dart'; +export 'package:sky/src/widgets/popup_menu_item.dart'; +export 'package:sky/src/widgets/progress_indicator.dart'; +export 'package:sky/src/widgets/radio.dart'; +export 'package:sky/src/widgets/raised_button.dart'; +export 'package:sky/src/widgets/scaffold.dart'; +export 'package:sky/src/widgets/scrollable.dart'; +export 'package:sky/src/widgets/snack_bar.dart'; +export 'package:sky/src/widgets/switch.dart'; +export 'package:sky/src/widgets/tabs.dart'; +export 'package:sky/src/widgets/theme.dart'; +export 'package:sky/src/widgets/title.dart'; +export 'package:sky/src/widgets/tool_bar.dart'; +export 'package:sky/src/widgets/transitions.dart'; export 'package:vector_math/vector_math.dart' show Matrix4; diff --git a/sky/tests/examples/card_collection.dart b/sky/tests/examples/card_collection.dart index 5e00d0fc2..fdb4481da 100644 --- a/sky/tests/examples/card_collection.dart +++ b/sky/tests/examples/card_collection.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; import '../../../examples/widgets/card_collection.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/examples/overlay_geometry.dart b/sky/tests/examples/overlay_geometry.dart index f88b11bd0..f0025e7b5 100644 --- a/sky/tests/examples/overlay_geometry.dart +++ b/sky/tests/examples/overlay_geometry.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; import '../../../examples/widgets/overlay_geometry.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/examples/sector.dart b/sky/tests/examples/sector.dart index 1c7af6019..caabef1bc 100644 --- a/sky/tests/examples/sector.dart +++ b/sky/tests/examples/sector.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; import '../../../examples/widgets/sector.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/examples/stocks.dart b/sky/tests/examples/stocks.dart index 1e83a022d..8af52f490 100644 --- a/sky/tests/examples/stocks.dart +++ b/sky/tests/examples/stocks.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; import '../../../examples/stocks/lib/main.dart'; import '../../../examples/stocks/lib/stock_data.dart'; diff --git a/sky/tests/examples/styled_text.dart b/sky/tests/examples/styled_text.dart index c0b0a3ec5..8d9f7444e 100644 --- a/sky/tests/examples/styled_text.dart +++ b/sky/tests/examples/styled_text.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; import '../../../examples/widgets/styled_text.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/examples/tabs.dart b/sky/tests/examples/tabs.dart index cdd122069..464bb06cc 100644 --- a/sky/tests/examples/tabs.dart +++ b/sky/tests/examples/tabs.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/widgets/framework.dart'; import '../../../examples/widgets/tabs.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/raw/render_flex.dart b/sky/tests/raw/render_flex.dart index 41091f2c7..c6c7dc330 100644 --- a/sky/tests/raw/render_flex.dart +++ b/sky/tests/raw/render_flex.dart @@ -4,7 +4,7 @@ import 'dart:sky' as sky; -import 'package:sky/rendering/box.dart'; +import 'package:sky/rendering.dart'; import '../../../examples/rendering/flex.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/widgets/buttons.dart b/sky/tests/widgets/buttons.dart index 767d6c179..7dde6d307 100644 --- a/sky/tests/widgets/buttons.dart +++ b/sky/tests/widgets/buttons.dart @@ -2,10 +2,10 @@ // 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/flat_button.dart'; -import 'package:sky/widgets/floating_action_button.dart'; -import 'package:sky/widgets/raised_button.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/flat_button.dart'; +import 'package:sky/src/widgets/floating_action_button.dart'; +import 'package:sky/src/widgets/raised_button.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/widgets/dialog.dart b/sky/tests/widgets/dialog.dart index 38f4dca30..8291b8591 100644 --- a/sky/tests/widgets/dialog.dart +++ b/sky/tests/widgets/dialog.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/widgets/basic.dart'; -import 'package:sky/widgets/dialog.dart'; +import 'package:sky/src/widgets/basic.dart'; +import 'package:sky/src/widgets/dialog.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/widgets/rounded_border.dart b/sky/tests/widgets/rounded_border.dart index c091d13eb..626129180 100644 --- a/sky/tests/widgets/rounded_border.dart +++ b/sky/tests/widgets/rounded_border.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/src/widgets/basic.dart'; import '../resources/display_list.dart'; diff --git a/sky/tests/widgets/stack_relayout_from_parent_data.dart b/sky/tests/widgets/stack_relayout_from_parent_data.dart index f680cdddf..eb72d4359 100644 --- a/sky/tests/widgets/stack_relayout_from_parent_data.dart +++ b/sky/tests/widgets/stack_relayout_from_parent_data.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/src/widgets/basic.dart'; import '../resources/display_list.dart'; diff --git a/skysprites/lib/skysprites.dart b/skysprites/lib/skysprites.dart index e079cdaff..3bb57b1d2 100644 --- a/skysprites/lib/skysprites.dart +++ b/skysprites/lib/skysprites.dart @@ -15,10 +15,10 @@ import 'package:sky/animation/curves.dart'; import 'package:sky/base/scheduler.dart' as scheduler; import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/mojo/shell.dart' as shell; -import 'package:sky/rendering/box.dart'; -import 'package:sky/rendering/object.dart'; import 'package:sky/painting/text_painter.dart'; -import 'package:sky/widgets/framework.dart'; +import 'package:sky/src/rendering/box.dart'; +import 'package:sky/src/rendering/object.dart'; +import 'package:sky/src/widgets/framework.dart'; import 'package:sky_services/media/media.mojom.dart'; import 'package:vector_math/vector_math.dart';