Rename all the things

This CL moves the bulk of the SkyView code out of the |framework| directory
because the |framework| directory was redundant in Dart package import
declarations.

TBR=ianh@google.com

Review URL: https://codereview.chromium.org/1177383006.

examples/game/lib/game.dart

@@ -5,7 +5,7 @@ import 'dart:math' as Math;
 import 'package:vector_math/vector_math_64.dart';
 import 'sprites.dart';
 import 'package:box2d/box2d.dart';
-import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/rendering/box.dart';
 
 part 'game_world.dart';
 part 'game_box.dart';

examples/game/lib/sprites.dart

@@ -4,9 +4,9 @@ import 'dart:sky';
 import 'dart:math' as Math;
 import 'package:vector_math/vector_math_64.dart';
 import 'dart:typed_data';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/scheduler.dart' as scheduler;
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/app/scheduler.dart' as scheduler;
 import 'package:sky/framework/net/image_cache.dart' as image_cache;
 
 part 'sprite_box.dart';

examples/game/main.dart

 import 'dart:sky';
 import 'lib/game.dart';
 import 'lib/sprites.dart';
-import 'package:sky/framework/app.dart';
+import 'package:sky/app/view.dart';
 
 AppView app;
 

examples/lib/solid_color_box.dart

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/rendering/box.dart';
 
 class RenderSolidColorBox extends RenderDecoratedBox {
   final Size desiredSize;

examples/rendering/borders.dart

@@ -4,10 +4,9 @@
 
 import 'dart:math' as math;
 import 'dart:sky' as sky;
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/block.dart';
-import 'package:sky/framework/rendering/node.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/block.dart';
 
 AppView app;
 

examples/rendering/interactive_flex.dart

@@ -5,12 +5,12 @@
 import 'dart:sky';
 import 'dart:math' as math;
 import 'package:sky/framework/net/image_cache.dart' as image_cache;
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/block.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/rendering/paragraph.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/block.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/rendering/paragraph.dart';
 import '../lib/solid_color_box.dart';
 
 class Touch {

examples/rendering/justify_content.dart

@@ -4,12 +4,12 @@
 
 import 'dart:sky';
 import 'dart:math' as math;
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/block.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/rendering/paragraph.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/block.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/rendering/paragraph.dart';
 import '../lib/solid_color_box.dart';
 
 AppView app;

examples/rendering/render_paragraph.dart

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 import 'dart:sky';
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/rendering/paragraph.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/rendering/paragraph.dart';
 import '../lib/solid_color_box.dart';
 
 AppView app;

examples/rendering/sector_layout.dart

@@ -4,9 +4,9 @@
 
 import 'dart:math' as math;
 import 'dart:sky' as sky;
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
 
 const double kTwoPi = 2 * math.PI;
 

examples/rendering/shadowed_box.dart

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 import 'dart:sky';
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/theme2/colors.dart';
-import 'package:sky/framework/theme2/shadows.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/theme2/colors.dart';
+import 'package:sky/theme2/shadows.dart';
 
 AppView app;
 

examples/rendering/spinning_flex.dart

@@ -4,11 +4,13 @@
 
 import 'dart:sky' as sky;
 import 'dart:math' as math;
+
+import 'package:sky/app/scheduler.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/flex.dart';
 import 'package:vector_math/vector_math.dart';
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/scheduler.dart';
+
 import '../lib/solid_color_box.dart';
 
 AppView app;

examples/rendering/touch_demo.dart

@@ -5,12 +5,12 @@
 import 'dart:math';
 import 'dart:sky';
 
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/rendering/paragraph.dart';
-import 'package:sky/framework/rendering/stack.dart';
-import 'package:sky/framework/theme2/colors.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/rendering/paragraph.dart';
+import 'package:sky/rendering/stack.dart';
+import 'package:sky/theme2/colors.dart';
 
 // Material design colors. :p
 List<Color> colors = [

examples/rendering/transform.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/rendering/box.dart';
 import 'package:vector_math/vector_math.dart';
 
 AppView app;

examples/stocks2/lib/stock_app.dart

@@ -2,25 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/framework/editing2/input.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/paragraph.dart';
-import 'package:sky/framework/theme2/colors.dart' as colors;
-import 'package:sky/framework/theme2/typography.dart' as typography;
-import 'package:sky/framework/widgets/drawer.dart';
-import 'package:sky/framework/widgets/drawer_header.dart';
-import 'package:sky/framework/widgets/floating_action_button.dart';
-import 'package:sky/framework/widgets/icon.dart';
-import 'package:sky/framework/widgets/icon_button.dart';
-import 'package:sky/framework/widgets/menu_divider.dart';
-import 'package:sky/framework/widgets/menu_item.dart';
-import 'package:sky/framework/widgets/modal_overlay.dart';
-import 'package:sky/framework/widgets/popup_menu.dart';
-import 'package:sky/framework/widgets/radio.dart';
-import 'package:sky/framework/widgets/scaffold.dart';
-import 'package:sky/framework/widgets/tool_bar.dart';
-import 'package:sky/framework/widgets/ui_node.dart';
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/editing2/input.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/paragraph.dart';
+import 'package:sky/theme2/colors.dart' as colors;
+import 'package:sky/theme2/typography.dart' as typography;
+import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/drawer.dart';
+import 'package:sky/widgets/drawer_header.dart';
+import 'package:sky/widgets/floating_action_button.dart';
+import 'package:sky/widgets/icon.dart';
+import 'package:sky/widgets/icon_button.dart';
+import 'package:sky/widgets/menu_divider.dart';
+import 'package:sky/widgets/menu_item.dart';
+import 'package:sky/widgets/modal_overlay.dart';
+import 'package:sky/widgets/popup_menu.dart';
+import 'package:sky/widgets/radio.dart';
+import 'package:sky/widgets/scaffold.dart';
+import 'package:sky/widgets/tool_bar.dart';
+import 'package:sky/widgets/ui_node.dart';
 
 import 'stock_data.dart';
 import 'stock_list.dart';

examples/stocks2/lib/stock_arrow.dart

@@ -5,10 +5,10 @@
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
-import 'package:sky/framework/theme2/colors.dart' as colors;
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
+import 'package:sky/theme2/colors.dart' as colors;
+import 'package:sky/widgets/basic.dart';
 
 class StockArrow extends Component {
 

examples/stocks2/lib/stock_list.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/framework/widgets/fixed_height_scrollable.dart';
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/widgets/fixed_height_scrollable.dart';
+import 'package:sky/widgets/basic.dart';
 
 import 'stock_data.dart';
 import 'stock_row.dart';

examples/stocks2/lib/stock_menu.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/framework/widgets/checkbox.dart';
-import 'package:sky/framework/widgets/popup_menu.dart';
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/widgets/checkbox.dart';
+import 'package:sky/widgets/popup_menu.dart';
+import 'package:sky/widgets/basic.dart';
 import 'package:sky/framework/theme/view_configuration.dart';
 
 class StockMenu extends Component {

examples/stocks2/lib/stock_row.dart

@@ -4,11 +4,11 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/theme2/typography.dart' as typography;
-import 'package:sky/framework/widgets/ink_well.dart';
-import 'package:sky/framework/widgets/basic.dart';
-import 'package:sky/framework/rendering/paragraph.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/theme2/typography.dart' as typography;
+import 'package:sky/widgets/ink_well.dart';
+import 'package:sky/widgets/basic.dart';
+import 'package:sky/rendering/paragraph.dart';
 
 import 'stock_arrow.dart';
 import 'stock_data.dart';

examples/widgets/container.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/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/widgets/raised_button.dart';
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/widgets/raised_button.dart';
+import 'package:sky/widgets/basic.dart';
 
 class ContainerApp extends App {
   UINode build() {

examples/widgets/hello_widgets.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/framework/widgets/basic.dart';
+import 'package:sky/widgets/basic.dart';
 
 class HelloWorldApp extends App {
   UINode build() {

examples/widgets/spinning_mixed.dart

@@ -4,12 +4,12 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/flex.dart';
-import 'package:sky/framework/scheduler.dart';
-import 'package:sky/framework/widgets/raised_button.dart';
-import 'package:sky/framework/widgets/ui_node.dart';
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/app/scheduler.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/flex.dart';
+import 'package:sky/widgets/basic.dart';
+import 'package:sky/widgets/raised_button.dart';
+import 'package:sky/widgets/ui_node.dart';
 import 'package:vector_math/vector_math.dart';
 
 import '../lib/solid_color_box.dart';

home.dart

@@ -6,14 +6,14 @@ import 'dart:sky';
 
 import 'package:mojom/intents/intents.mojom.dart';
 import 'package:sky/framework/shell.dart' as shell;
-import 'package:sky/framework/theme2/colors.dart' as colors;
-import 'package:sky/framework/theme2/edges.dart';
-import 'package:sky/framework/theme2/typography.dart' as typography;
-import 'package:sky/framework/widgets/material.dart';
-import 'package:sky/framework/widgets/raised_button.dart';
-import 'package:sky/framework/widgets/scaffold.dart';
-import 'package:sky/framework/widgets/tool_bar.dart';
-import 'package:sky/framework/widgets/basic.dart';
+import 'package:sky/theme2/colors.dart' as colors;
+import 'package:sky/theme2/edges.dart';
+import 'package:sky/theme2/typography.dart' as typography;
+import 'package:sky/widgets/material.dart';
+import 'package:sky/widgets/raised_button.dart';
+import 'package:sky/widgets/scaffold.dart';
+import 'package:sky/widgets/tool_bar.dart';
+import 'package:sky/widgets/basic.dart';
 
 void launch(String relativeUrl) {
   Uri url = Uri.base.resolve(relativeUrl);

sdk/BUILD.gn

@@ -9,9 +9,15 @@ dart_pkg("sdk") {
     "CHANGELOG.md",
     "README.md",
     "bin/init.dart",
+    "lib/app/scheduler.dart",
+    "lib/app/view.dart",
     "lib/assets/.gitignore",
     "lib/assets/material-design-icons.sha1",
     "lib/download_material_design_icons",
+    "lib/editing2/editable_string.dart",
+    "lib/editing2/editable_text.dart",
+    "lib/editing2/input.dart",
+    "lib/editing2/keyboard.dart",
     "lib/framework/README.md",
     "lib/framework/animation/animated_value.dart",
     "lib/framework/animation/curves.dart",
@@ -19,7 +25,6 @@ dart_pkg("sdk") {
     "lib/framework/animation/generators.dart",
     "lib/framework/animation/mechanics.dart",
     "lib/framework/animation/scroll_behavior.dart",
-    "lib/framework/app.dart",
     "lib/framework/components/animated_component.dart",
     "lib/framework/components/button.dart",
     "lib/framework/components/button_base.dart",
@@ -49,10 +54,6 @@ dart_pkg("sdk") {
     "lib/framework/editing/editable_string.dart",
     "lib/framework/editing/editable_text.dart",
     "lib/framework/editing/keyboard.dart",
-    "lib/framework/editing2/editable_string.dart",
-    "lib/framework/editing2/editable_text.dart",
-    "lib/framework/editing2/input.dart",
-    "lib/framework/editing2/keyboard.dart",
     "lib/framework/elements/animation/controller.dart",
     "lib/framework/elements/animation/timer.dart",
     "lib/framework/elements/material-element.sky",
@@ -77,50 +78,49 @@ dart_pkg("sdk") {
     "lib/framework/net/fetch.dart",
     "lib/framework/net/image_cache.dart",
     "lib/framework/node.dart",
-    "lib/framework/painting/box_painter.dart",
-    "lib/framework/painting/shadows.dart",
     "lib/framework/reflect.dart",
-    "lib/framework/rendering/block.dart",
-    "lib/framework/rendering/box.dart",
-    "lib/framework/rendering/flex.dart",
-    "lib/framework/rendering/object.dart",
-    "lib/framework/rendering/paragraph.dart",
-    "lib/framework/rendering/stack.dart",
-    "lib/framework/scheduler.dart",
     "lib/framework/shell.dart",
     "lib/framework/theme/colors.dart",
     "lib/framework/theme/shadows.dart",
     "lib/framework/theme/typography.dart",
     "lib/framework/theme/view_configuration.dart",
-    "lib/framework/theme2/colors.dart",
-    "lib/framework/theme2/edges.dart",
-    "lib/framework/theme2/shadows.dart",
-    "lib/framework/theme2/typography.dart",
-    "lib/framework/theme2/view_configuration.dart",
-    "lib/framework/widgets/animated_component.dart",
-    "lib/framework/widgets/basic.dart",
-    "lib/framework/widgets/button_base.dart",
-    "lib/framework/widgets/checkbox.dart",
-    "lib/framework/widgets/drawer.dart",
-    "lib/framework/widgets/drawer_header.dart",
-    "lib/framework/widgets/fixed_height_scrollable.dart",
-    "lib/framework/widgets/floating_action_button.dart",
-    "lib/framework/widgets/icon.dart",
-    "lib/framework/widgets/icon_button.dart",
-    "lib/framework/widgets/ink_well.dart",
-    "lib/framework/widgets/material.dart",
-    "lib/framework/widgets/menu_divider.dart",
-    "lib/framework/widgets/menu_item.dart",
-    "lib/framework/widgets/modal_overlay.dart",
-    "lib/framework/widgets/popup_menu.dart",
-    "lib/framework/widgets/popup_menu_item.dart",
-    "lib/framework/widgets/radio.dart",
-    "lib/framework/widgets/raised_button.dart",
-    "lib/framework/widgets/scaffold.dart",
-    "lib/framework/widgets/scrollable.dart",
-    "lib/framework/widgets/tool_bar.dart",
-    "lib/framework/widgets/ui_node.dart",
+    "lib/painting/box_painter.dart",
+    "lib/painting/shadows.dart",
+    "lib/rendering/block.dart",
+    "lib/rendering/box.dart",
+    "lib/rendering/flex.dart",
+    "lib/rendering/object.dart",
+    "lib/rendering/paragraph.dart",
+    "lib/rendering/stack.dart",
     "lib/sky_tool",
+    "lib/theme2/colors.dart",
+    "lib/theme2/edges.dart",
+    "lib/theme2/shadows.dart",
+    "lib/theme2/typography.dart",
+    "lib/theme2/view_configuration.dart",
+    "lib/widgets/animated_component.dart",
+    "lib/widgets/basic.dart",
+    "lib/widgets/button_base.dart",
+    "lib/widgets/checkbox.dart",
+    "lib/widgets/drawer.dart",
+    "lib/widgets/drawer_header.dart",
+    "lib/widgets/fixed_height_scrollable.dart",
+    "lib/widgets/floating_action_button.dart",
+    "lib/widgets/icon.dart",
+    "lib/widgets/icon_button.dart",
+    "lib/widgets/ink_well.dart",
+    "lib/widgets/material.dart",
+    "lib/widgets/menu_divider.dart",
+    "lib/widgets/menu_item.dart",
+    "lib/widgets/modal_overlay.dart",
+    "lib/widgets/popup_menu.dart",
+    "lib/widgets/popup_menu_item.dart",
+    "lib/widgets/radio.dart",
+    "lib/widgets/raised_button.dart",
+    "lib/widgets/scaffold.dart",
+    "lib/widgets/scrollable.dart",
+    "lib/widgets/tool_bar.dart",
+    "lib/widgets/ui_node.dart",
     "pubspec.yaml",
   ]
 

sdk/lib/framework/app.dart → sdk/lib/app/view.dart

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'rendering/box.dart';
-import 'rendering/object.dart';
+
+import '../rendering/box.dart';
+import '../rendering/object.dart';
 import 'scheduler.dart' as scheduler;
 
 class PointerState {

sdk/lib/framework/editing2/keyboard.dart → sdk/lib/editing2/keyboard.dart

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../shell.dart' as shell;
 import 'package:mojom/keyboard/keyboard.mojom.dart';
 
+import '../framework/shell.dart' as shell;
+
 class _KeyboardConnection {
   KeyboardServiceProxy proxy;
 

sdk/lib/framework/animation/generators.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 '../scheduler.dart' as scheduler;
+import '../app/scheduler.dart' as scheduler;
 import 'curves.dart';
 import 'dart:async';
 import 'dart:math' as math;

sdk/lib/framework/painting/box_painter.dart → sdk/lib/painting/box_painter.dart

@@ -5,6 +5,7 @@
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 import 'dart:sky' show Point, Size, Rect, Color, Paint, Path;
+
 import 'shadows.dart';
 
 class BorderSide {

sdk/lib/framework/rendering/block.dart → sdk/lib/rendering/block.dart

@@ -2,8 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'box.dart';
 import 'dart:math' as math;
+
+import 'box.dart';
 import 'object.dart';
 
 class BlockParentData extends BoxParentData with ContainerParentDataMixin<RenderBox> { }

sdk/lib/framework/rendering/box.dart → sdk/lib/rendering/box.dart

@@ -5,10 +5,10 @@
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/net/image_cache.dart' as image_cache;
 import 'package:vector_math/vector_math.dart';
 
-import '../debug/utils.dart';
+import '../framework/debug/utils.dart';
+import '../framework/net/image_cache.dart' as image_cache;
 import '../painting/box_painter.dart';
 import 'object.dart';
 

sdk/lib/framework/rendering/flex.dart → sdk/lib/rendering/flex.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:math' as math;
+
 import 'box.dart';
 import 'object.dart';
 

sdk/lib/framework/rendering/object.dart → sdk/lib/rendering/object.dart

@@ -6,8 +6,8 @@ import 'dart:math' as math;
 import 'dart:sky' as sky;
 import 'dart:sky' show Point, Size, Rect, Color, Paint, Path;
 
-import '../node.dart';
-import '../scheduler.dart' as scheduler;
+import '../app/scheduler.dart' as scheduler;
+import '../framework/node.dart';
 
 export 'dart:sky' show Point, Size, Rect, Color, Paint, Path;
 

sdk/lib/framework/rendering/paragraph.dart → sdk/lib/rendering/paragraph.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
+
 import 'box.dart';
 import 'object.dart';
 

sdk/lib/framework/theme2/shadows.dart → sdk/lib/theme2/shadows.dart

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../painting/box_painter.dart';
 import 'dart:sky' show Color, Size;
 
+import '../painting/box_painter.dart';
+
 const Map<int, List<BoxShadow>> shadows = const {
   1: const [
     const BoxShadow(

sdk/lib/framework/widgets/animated_component.dart → sdk/lib/widgets/animated_component.dart

@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import '../animation/animated_value.dart';
+import '../framework/animation/animated_value.dart';
 import 'basic.dart';
 
 typedef void SetterFunction(double value);

sdk/lib/framework/widgets/checkbox.dart → sdk/lib/widgets/checkbox.dart

@@ -4,10 +4,10 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/theme2/colors.dart' as colors;
+import 'package:sky/theme2/colors.dart' as colors;
 
-import '../animation/animated_value.dart';
-import '../animation/curves.dart';
+import '../framework/animation/animated_value.dart';
+import '../framework/animation/curves.dart';
 import '../rendering/box.dart';
 import 'animated_component.dart';
 import 'basic.dart';

sdk/lib/framework/widgets/drawer.dart → sdk/lib/widgets/drawer.dart

@@ -7,8 +7,8 @@ import 'dart:sky' as sky;
 
 import 'package:vector_math/vector_math.dart';
 
-import '../animation/animated_value.dart';
-import '../animation/curves.dart';
+import '../framework/animation/animated_value.dart';
+import '../framework/animation/curves.dart';
 import '../theme2/colors.dart';
 import '../theme2/shadows.dart';
 import 'animated_component.dart';

sdk/lib/framework/widgets/fixed_height_scrollable.dart → sdk/lib/widgets/fixed_height_scrollable.dart

@@ -6,9 +6,9 @@ import 'dart:math' as math;
 
 import 'package:vector_math/vector_math.dart';
 
-import '../animation/scroll_behavior.dart';
-import 'scrollable.dart';
+import '../framework/animation/scroll_behavior.dart';
 import 'basic.dart';
+import 'scrollable.dart';
 
 abstract class FixedHeightScrollable extends Scrollable {
 

sdk/lib/framework/widgets/floating_action_button.dart → sdk/lib/widgets/floating_action_button.dart

@@ -4,10 +4,10 @@
 
 import '../theme2/colors.dart';
 import '../theme2/edges.dart';
+import 'basic.dart';
 import 'button_base.dart';
 import 'ink_well.dart';
 import 'material.dart';
-import 'basic.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

sdk/lib/framework/widgets/icon_button.dart → sdk/lib/widgets/icon_button.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import '../rendering/box.dart';
+import 'basic.dart';
 import 'icon.dart';
 import 'ui_node.dart';
-import 'basic.dart';
 
 class IconButton extends Component {
 

sdk/lib/framework/widgets/ink_well.dart → sdk/lib/widgets/ink_well.dart

@@ -5,12 +5,12 @@
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
-import '../animation/animated_value.dart';
-import '../animation/curves.dart';
+import '../framework/animation/animated_value.dart';
+import '../framework/animation/curves.dart';
 import '../rendering/box.dart';
 import '../rendering/object.dart';
-import 'ui_node.dart';
 import 'basic.dart';
+import 'ui_node.dart';
 
 const int _kSplashInitialOpacity = 0x80;
 const double _kSplashInitialDelay = 0.0; // we could delay initially in case the user scrolls

sdk/lib/framework/widgets/menu_item.dart → sdk/lib/widgets/menu_item.dart

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'basic.dart';
 import 'button_base.dart';
 import 'icon.dart';
 import 'ink_well.dart';
 import 'ui_node.dart';
-import 'basic.dart';
 
 const BoxDecoration _kHighlightDecoration = const BoxDecoration(
   backgroundColor: const Color.fromARGB(102, 153, 153, 153)

sdk/lib/framework/widgets/modal_overlay.dart → sdk/lib/widgets/modal_overlay.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 'ui_node.dart';
 import 'basic.dart';
+import 'ui_node.dart';
 
 class ModalOverlay extends Component {
 

sdk/lib/framework/widgets/popup_menu.dart → sdk/lib/widgets/popup_menu.dart

@@ -6,13 +6,13 @@ import 'dart:async';
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
-import '../animation/animated_value.dart';
+import '../framework/animation/animated_value.dart';
 import '../painting/box_painter.dart';
 import '../theme2/colors.dart';
 import '../theme2/shadows.dart';
 import 'animated_component.dart';
-import 'popup_menu_item.dart';
 import 'basic.dart';
+import 'popup_menu_item.dart';
 
 const double _kMenuOpenDuration = 300.0;
 const double _kMenuCloseDuration = 200.0;

sdk/lib/framework/widgets/radio.dart → sdk/lib/widgets/radio.dart

@@ -4,11 +4,10 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/theme2/colors.dart' as colors;
-
 import '../rendering/object.dart';
-import 'button_base.dart';
+import '../theme2/colors.dart' as colors;
 import 'basic.dart';
+import 'button_base.dart';
 
 typedef void ValueChanged(value);
 

sdk/lib/framework/widgets/raised_button.dart → sdk/lib/widgets/raised_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 '../theme2/edges.dart';
 import '../theme2/colors.dart';
+import '../theme2/edges.dart';
+import 'basic.dart';
 import 'button_base.dart';
 import 'ink_well.dart';
 import 'material.dart';
-import 'basic.dart';
 
 enum RaisedButtonTheme { light, dark }
 

sdk/lib/framework/widgets/scrollable.dart → sdk/lib/widgets/scrollable.dart

@@ -5,13 +5,13 @@
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
-import '../animation/generators.dart';
-import '../animation/mechanics.dart';
-import '../animation/scroll_behavior.dart';
+import '../framework/animation/generators.dart';
+import '../framework/animation/mechanics.dart';
+import '../framework/animation/scroll_behavior.dart';
 import '../theme2/edges.dart';
 import '../theme2/view_configuration.dart' as config;
-import 'material.dart';
 import 'basic.dart';
+import 'material.dart';
 
 const double _kMillisecondsPerSecond = 1000.0;
 

sdk/lib/framework/widgets/ui_node.dart → sdk/lib/widgets/ui_node.dart

@@ -7,7 +7,7 @@ import 'dart:collection';
 import 'dart:mirrors';
 import 'dart:sky' as sky;
 
-import '../app.dart';
+import '../app/view.dart';
 import '../rendering/box.dart';
 import '../rendering/object.dart';
 

tests/framework/stocks.dart

@@ -4,8 +4,8 @@
 
 import 'dart:async';
 
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/widgets/ui_node.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/widgets/ui_node.dart';
 
 import '../../examples/stocks2/lib/stock_app.dart';
 import '../resources/display_list.dart';

tests/raw/box_layout.dart

 import 'dart:math' as math;
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/block.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/block.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
 
 import '../resources/display_list.dart';
 import '../resources/third_party/unittest/unittest.dart';

tests/raw/padding_deflate.dart

@@ -4,8 +4,8 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
 
 import '../resources/display_list.dart';
 import '../resources/third_party/unittest/unittest.dart';

tests/raw/render_box.dart

@@ -4,8 +4,8 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
 
 import '../resources/display_list.dart';
 import '../resources/third_party/unittest/unittest.dart';

tests/raw/render_flex.dart

@@ -4,10 +4,10 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/block.dart';
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/flex.dart';
+import 'package:sky/app/view.dart';
+import 'package:sky/rendering/block.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/flex.dart';
 
 import '../resources/display_list.dart';
 import '../resources/third_party/unittest/unittest.dart';

tests/resources/display_list.dart

 
 import 'dart:sky' as sky;
 
-import 'package:sky/framework/rendering/box.dart';
-import 'package:sky/framework/rendering/object.dart';
+import 'package:sky/rendering/box.dart';
+import 'package:sky/rendering/object.dart';
 
 typedef void Logger (String s);