Move widgets and rendering inside src

Code outside of package:sky should import this code using

package:sky/rendering.dart
package:sky/widgets.dart

Moving this code into the "src" directory is a convention that signifies that
and it cleans up the generated dartdoc because the libraries in the src
directory aren't included in the generated documentation. Instead, the classes
are documented in the widgets.dart and rendering.dart libraries.

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';
 

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';

examples/game/test_drawatlas.dart

 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';
 

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';

packages/flutter/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;

packages/flutter/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;
 

packages/flutter/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;

packages/flutter/lib/rendering/README.md → packages/flutter/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((_) {

packages/flutter/lib/rendering/auto_layout.dart → packages/flutter/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

packages/flutter/lib/rendering/block.dart → packages/flutter/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<RenderBox> { }

packages/flutter/lib/rendering/box.dart → packages/flutter/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;

packages/flutter/lib/rendering/flex.dart → packages/flutter/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<RenderBox> {
   int flex;

packages/flutter/lib/rendering/grid.dart → packages/flutter/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<RenderBox> {}
 

packages/flutter/lib/rendering/image.dart → packages/flutter/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({

packages/flutter/lib/rendering/object.dart → packages/flutter/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;

packages/flutter/lib/rendering/paragraph.dart → packages/flutter/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';
 

packages/flutter/lib/rendering/proxy_box.dart → packages/flutter/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';

packages/flutter/lib/rendering/shifted_box.dart → packages/flutter/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<RenderBox> {
 

packages/flutter/lib/rendering/sky_binding.dart → packages/flutter/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)

packages/flutter/lib/rendering/stack.dart → packages/flutter/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<RenderBox> {
   double top;

packages/flutter/lib/rendering/toggleable.dart → packages/flutter/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);
 

packages/flutter/lib/rendering/view.dart → packages/flutter/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 {

packages/flutter/lib/rendering/viewport.dart → packages/flutter/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 }

packages/flutter/lib/widgets/animated_component.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/animated_container.dart → packages/flutter/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<BoxConstraints> {
   AnimatedBoxConstraintsValue(BoxConstraints begin, { BoxConstraints end, Curve curve: linear })

packages/flutter/lib/widgets/basic.dart → packages/flutter/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
 

packages/flutter/lib/widgets/button_base.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/card.dart → packages/flutter/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);
 

packages/flutter/lib/widgets/checkbox.dart → packages/flutter/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);

packages/flutter/lib/widgets/date_picker.dart → packages/flutter/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);
 

packages/flutter/lib/widgets/default_text_style.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/dialog.dart → packages/flutter/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);
 

packages/flutter/lib/widgets/dismissable.dart → packages/flutter/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);

packages/flutter/lib/widgets/drag_target.dart → packages/flutter/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>(T data);
 typedef void DragTargetAccept<T>(T data);

packages/flutter/lib/widgets/drawer.dart → packages/flutter/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;
 

packages/flutter/lib/widgets/drawer_divider.dart → packages/flutter/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);

packages/flutter/lib/widgets/drawer_header.dart → packages/flutter/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

packages/flutter/lib/widgets/drawer_item.dart → packages/flutter/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();
 

packages/flutter/lib/widgets/flat_button.dart → packages/flutter/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({

packages/flutter/lib/widgets/floating_action_button.dart → packages/flutter/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

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

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

packages/flutter/lib/widgets/framework.dart → packages/flutter/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()
 

packages/flutter/lib/widgets/gesture_detector.dart → packages/flutter/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({

packages/flutter/lib/widgets/homogeneous_viewport.dart → packages/flutter/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<Widget> ListBuilder(int startIndex, int count);
 

packages/flutter/lib/widgets/icon.dart → packages/flutter/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 }
 

packages/flutter/lib/widgets/icon_button.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/ink_well.dart → packages/flutter/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;

packages/flutter/lib/widgets/material.dart → packages/flutter/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 }
 

packages/flutter/lib/widgets/material_button.dart → packages/flutter/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 {

packages/flutter/lib/widgets/mimic.dart → packages/flutter/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({

packages/flutter/lib/widgets/mimic_overlay.dart → packages/flutter/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({

packages/flutter/lib/widgets/mixed_viewport.dart → packages/flutter/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);

packages/flutter/lib/widgets/modal_overlay.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/navigator.dart → packages/flutter/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);
 

packages/flutter/lib/widgets/popup_menu.dart → packages/flutter/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;
 

packages/flutter/lib/widgets/popup_menu_item.dart → packages/flutter/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;

packages/flutter/lib/widgets/progress_indicator.dart → packages/flutter/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;

packages/flutter/lib/widgets/radio.dart → packages/flutter/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);

packages/flutter/lib/widgets/raised_button.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/scaffold.dart → packages/flutter/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 {

packages/flutter/lib/widgets/scrollable.dart → packages/flutter/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';
-
-export 'package:sky/widgets/mixed_viewport.dart' show MixedViewportLayoutState;
+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/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;

packages/flutter/lib/widgets/snack_bar.dart → packages/flutter/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;
 

packages/flutter/lib/widgets/switch.dart → packages/flutter/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);

packages/flutter/lib/widgets/tabs.dart → packages/flutter/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<double> widths);

packages/flutter/lib/widgets/theme.dart → packages/flutter/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;
 

packages/flutter/lib/widgets/title.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/tool_bar.dart → packages/flutter/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 {
 

packages/flutter/lib/widgets/transitions.dart → packages/flutter/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;

packages/flutter/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;

packages/flutter_sprites/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';