From 219ead371874670edb6310083d68253be423ae47 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Sat, 13 Jun 2015 09:46:52 -0700 Subject: [PATCH] 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 | 2 +- examples/game/lib/sprites.dart | 6 +- examples/game/main.dart | 2 +- examples/lib/solid_color_box.dart | 4 +- examples/rendering/borders.dart | 7 +- examples/rendering/interactive_flex.dart | 12 +-- examples/rendering/justify_content.dart | 12 +-- examples/rendering/render_paragraph.dart | 10 +-- examples/rendering/sector_layout.dart | 6 +- examples/rendering/shadowed_box.dart | 10 +-- examples/rendering/spinning_flex.dart | 10 ++- examples/rendering/touch_demo.dart | 12 +-- examples/rendering/transform.dart | 6 +- examples/stocks2/lib/stock_app.dart | 38 ++++----- examples/stocks2/lib/stock_arrow.dart | 8 +- examples/stocks2/lib/stock_list.dart | 4 +- examples/stocks2/lib/stock_menu.dart | 6 +- examples/stocks2/lib/stock_row.dart | 10 +-- examples/widgets/container.dart | 8 +- examples/widgets/hello_widgets.dart | 2 +- examples/widgets/spinning_mixed.dart | 12 +-- home.dart | 16 ++-- sdk/BUILD.gn | 84 +++++++++---------- sdk/lib/{framework => app}/scheduler.dart | 0 sdk/lib/{framework/app.dart => app/view.dart} | 5 +- .../editing2/editable_string.dart | 0 .../editing2/editable_text.dart | 0 sdk/lib/{framework => }/editing2/input.dart | 0 .../{framework => }/editing2/keyboard.dart | 3 +- sdk/lib/framework/animation/generators.dart | 2 +- .../{framework => }/painting/box_painter.dart | 1 + sdk/lib/{framework => }/painting/shadows.dart | 0 sdk/lib/{framework => }/rendering/block.dart | 3 +- sdk/lib/{framework => }/rendering/box.dart | 4 +- sdk/lib/{framework => }/rendering/flex.dart | 1 + sdk/lib/{framework => }/rendering/object.dart | 4 +- .../{framework => }/rendering/paragraph.dart | 1 + sdk/lib/{framework => }/rendering/stack.dart | 0 sdk/lib/{framework => }/theme2/colors.dart | 0 sdk/lib/{framework => }/theme2/edges.dart | 0 sdk/lib/{framework => }/theme2/shadows.dart | 3 +- .../{framework => }/theme2/typography.dart | 0 .../theme2/view_configuration.dart | 0 .../widgets/animated_component.dart | 2 +- sdk/lib/{framework => }/widgets/basic.dart | 0 .../{framework => }/widgets/button_base.dart | 0 sdk/lib/{framework => }/widgets/checkbox.dart | 6 +- sdk/lib/{framework => }/widgets/drawer.dart | 4 +- .../widgets/drawer_header.dart | 0 .../widgets/fixed_height_scrollable.dart | 4 +- .../widgets/floating_action_button.dart | 2 +- sdk/lib/{framework => }/widgets/icon.dart | 0 .../{framework => }/widgets/icon_button.dart | 2 +- sdk/lib/{framework => }/widgets/ink_well.dart | 6 +- sdk/lib/{framework => }/widgets/material.dart | 0 .../{framework => }/widgets/menu_divider.dart | 0 .../{framework => }/widgets/menu_item.dart | 2 +- .../widgets/modal_overlay.dart | 2 +- .../{framework => }/widgets/popup_menu.dart | 4 +- .../widgets/popup_menu_item.dart | 0 sdk/lib/{framework => }/widgets/radio.dart | 5 +- .../widgets/raised_button.dart | 4 +- sdk/lib/{framework => }/widgets/scaffold.dart | 0 .../{framework => }/widgets/scrollable.dart | 8 +- sdk/lib/{framework => }/widgets/tool_bar.dart | 0 sdk/lib/{framework => }/widgets/ui_node.dart | 2 +- tests/framework/stocks.dart | 4 +- tests/raw/box_layout.dart | 8 +- tests/raw/padding_deflate.dart | 4 +- tests/raw/render_box.dart | 4 +- tests/raw/render_flex.dart | 8 +- tests/resources/display_list.dart | 4 +- 72 files changed, 203 insertions(+), 196 deletions(-) rename sdk/lib/{framework => app}/scheduler.dart (100%) rename sdk/lib/{framework/app.dart => app/view.dart} (98%) rename sdk/lib/{framework => }/editing2/editable_string.dart (100%) rename sdk/lib/{framework => }/editing2/editable_text.dart (100%) rename sdk/lib/{framework => }/editing2/input.dart (100%) rename sdk/lib/{framework => }/editing2/keyboard.dart (92%) rename sdk/lib/{framework => }/painting/box_painter.dart (99%) rename sdk/lib/{framework => }/painting/shadows.dart (100%) rename sdk/lib/{framework => }/rendering/block.dart (99%) rename sdk/lib/{framework => }/rendering/box.dart (99%) rename sdk/lib/{framework => }/rendering/flex.dart (99%) rename sdk/lib/{framework => }/rendering/object.dart (99%) rename sdk/lib/{framework => }/rendering/paragraph.dart (99%) rename sdk/lib/{framework => }/rendering/stack.dart (100%) rename sdk/lib/{framework => }/theme2/colors.dart (100%) rename sdk/lib/{framework => }/theme2/edges.dart (100%) rename sdk/lib/{framework => }/theme2/shadows.dart (99%) rename sdk/lib/{framework => }/theme2/typography.dart (100%) rename sdk/lib/{framework => }/theme2/view_configuration.dart (100%) rename sdk/lib/{framework => }/widgets/animated_component.dart (96%) rename sdk/lib/{framework => }/widgets/basic.dart (100%) rename sdk/lib/{framework => }/widgets/button_base.dart (100%) rename sdk/lib/{framework => }/widgets/checkbox.dart (96%) rename sdk/lib/{framework => }/widgets/drawer.dart (97%) rename sdk/lib/{framework => }/widgets/drawer_header.dart (100%) rename sdk/lib/{framework => }/widgets/fixed_height_scrollable.dart (97%) rename sdk/lib/{framework => }/widgets/floating_action_button.dart (100%) rename sdk/lib/{framework => }/widgets/icon.dart (100%) rename sdk/lib/{framework => }/widgets/icon_button.dart (100%) rename sdk/lib/{framework => }/widgets/ink_well.dart (97%) rename sdk/lib/{framework => }/widgets/material.dart (100%) rename sdk/lib/{framework => }/widgets/menu_divider.dart (100%) rename sdk/lib/{framework => }/widgets/menu_item.dart (100%) rename sdk/lib/{framework => }/widgets/modal_overlay.dart (100%) rename sdk/lib/{framework => }/widgets/popup_menu.dart (98%) rename sdk/lib/{framework => }/widgets/popup_menu_item.dart (100%) rename sdk/lib/{framework => }/widgets/radio.dart (96%) rename sdk/lib/{framework => }/widgets/raised_button.dart (100%) rename sdk/lib/{framework => }/widgets/scaffold.dart (100%) rename sdk/lib/{framework => }/widgets/scrollable.dart (96%) rename sdk/lib/{framework => }/widgets/tool_bar.dart (100%) rename sdk/lib/{framework => }/widgets/ui_node.dart (99%) diff --git a/examples/game/lib/game.dart b/examples/game/lib/game.dart index 37122f498..da51f45db 100644 --- a/examples/game/lib/game.dart +++ b/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'; diff --git a/examples/game/lib/sprites.dart b/examples/game/lib/sprites.dart index 79a6fd398..c85952a16 100644 --- a/examples/game/lib/sprites.dart +++ b/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'; diff --git a/examples/game/main.dart b/examples/game/main.dart index ebbe0d254..04312bb71 100644 --- a/examples/game/main.dart +++ b/examples/game/main.dart @@ -1,7 +1,7 @@ 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; diff --git a/examples/lib/solid_color_box.dart b/examples/lib/solid_color_box.dart index 6c598e769..b6624c666 100644 --- a/examples/lib/solid_color_box.dart +++ b/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; diff --git a/examples/rendering/borders.dart b/examples/rendering/borders.dart index 3c362ae59..7bc72f3c4 100644 --- a/examples/rendering/borders.dart +++ b/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; diff --git a/examples/rendering/interactive_flex.dart b/examples/rendering/interactive_flex.dart index 23582fc10..4aaed292c 100644 --- a/examples/rendering/interactive_flex.dart +++ b/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 { diff --git a/examples/rendering/justify_content.dart b/examples/rendering/justify_content.dart index 76e9b268e..f267a2f43 100644 --- a/examples/rendering/justify_content.dart +++ b/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; diff --git a/examples/rendering/render_paragraph.dart b/examples/rendering/render_paragraph.dart index 9f12c1867..7ed158ff4 100644 --- a/examples/rendering/render_paragraph.dart +++ b/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; diff --git a/examples/rendering/sector_layout.dart b/examples/rendering/sector_layout.dart index 875bbe8ef..d3d7c2591 100644 --- a/examples/rendering/sector_layout.dart +++ b/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; diff --git a/examples/rendering/shadowed_box.dart b/examples/rendering/shadowed_box.dart index 50c5acc4e..2cad052fe 100644 --- a/examples/rendering/shadowed_box.dart +++ b/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; diff --git a/examples/rendering/spinning_flex.dart b/examples/rendering/spinning_flex.dart index 24368b793..10a16795d 100644 --- a/examples/rendering/spinning_flex.dart +++ b/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; diff --git a/examples/rendering/touch_demo.dart b/examples/rendering/touch_demo.dart index 845ea5f3e..802ef5933 100644 --- a/examples/rendering/touch_demo.dart +++ b/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 colors = [ diff --git a/examples/rendering/transform.dart b/examples/rendering/transform.dart index ab53c81a5..3d5250e06 100644 --- a/examples/rendering/transform.dart +++ b/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; diff --git a/examples/stocks2/lib/stock_app.dart b/examples/stocks2/lib/stock_app.dart index 4853b16b8..6e13b0b4e 100644 --- a/examples/stocks2/lib/stock_app.dart +++ b/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'; diff --git a/examples/stocks2/lib/stock_arrow.dart b/examples/stocks2/lib/stock_arrow.dart index 722b50234..5d728c5c5 100644 --- a/examples/stocks2/lib/stock_arrow.dart +++ b/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 { diff --git a/examples/stocks2/lib/stock_list.dart b/examples/stocks2/lib/stock_list.dart index f92811544..0bf367361 100644 --- a/examples/stocks2/lib/stock_list.dart +++ b/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'; diff --git a/examples/stocks2/lib/stock_menu.dart b/examples/stocks2/lib/stock_menu.dart index 87783a1f6..3e5559612 100644 --- a/examples/stocks2/lib/stock_menu.dart +++ b/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 { diff --git a/examples/stocks2/lib/stock_row.dart b/examples/stocks2/lib/stock_row.dart index 28b955b9a..7c063582f 100644 --- a/examples/stocks2/lib/stock_row.dart +++ b/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'; diff --git a/examples/widgets/container.dart b/examples/widgets/container.dart index 0fc1fb718..14ba1de13 100644 --- a/examples/widgets/container.dart +++ b/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() { diff --git a/examples/widgets/hello_widgets.dart b/examples/widgets/hello_widgets.dart index 71916998f..59b6a230d 100644 --- a/examples/widgets/hello_widgets.dart +++ b/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() { diff --git a/examples/widgets/spinning_mixed.dart b/examples/widgets/spinning_mixed.dart index de9b97eb7..b76a09a0b 100644 --- a/examples/widgets/spinning_mixed.dart +++ b/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'; diff --git a/home.dart b/home.dart index e28b4431d..a4ce45b17 100644 --- a/home.dart +++ b/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); diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 2670ccab6..9a80bf2aa 100644 --- a/sdk/BUILD.gn +++ b/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", ] diff --git a/sdk/lib/framework/scheduler.dart b/sdk/lib/app/scheduler.dart similarity index 100% rename from sdk/lib/framework/scheduler.dart rename to sdk/lib/app/scheduler.dart diff --git a/sdk/lib/framework/app.dart b/sdk/lib/app/view.dart similarity index 98% rename from sdk/lib/framework/app.dart rename to sdk/lib/app/view.dart index 701821c24..4702ae4d0 100644 --- a/sdk/lib/framework/app.dart +++ b/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 { diff --git a/sdk/lib/framework/editing2/editable_string.dart b/sdk/lib/editing2/editable_string.dart similarity index 100% rename from sdk/lib/framework/editing2/editable_string.dart rename to sdk/lib/editing2/editable_string.dart diff --git a/sdk/lib/framework/editing2/editable_text.dart b/sdk/lib/editing2/editable_text.dart similarity index 100% rename from sdk/lib/framework/editing2/editable_text.dart rename to sdk/lib/editing2/editable_text.dart diff --git a/sdk/lib/framework/editing2/input.dart b/sdk/lib/editing2/input.dart similarity index 100% rename from sdk/lib/framework/editing2/input.dart rename to sdk/lib/editing2/input.dart diff --git a/sdk/lib/framework/editing2/keyboard.dart b/sdk/lib/editing2/keyboard.dart similarity index 92% rename from sdk/lib/framework/editing2/keyboard.dart rename to sdk/lib/editing2/keyboard.dart index cf0e0ab5d..f64e89f5d 100644 --- a/sdk/lib/framework/editing2/keyboard.dart +++ b/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; diff --git a/sdk/lib/framework/animation/generators.dart b/sdk/lib/framework/animation/generators.dart index 561bd6b87..b65706595 100644 --- a/sdk/lib/framework/animation/generators.dart +++ b/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; diff --git a/sdk/lib/framework/painting/box_painter.dart b/sdk/lib/painting/box_painter.dart similarity index 99% rename from sdk/lib/framework/painting/box_painter.dart rename to sdk/lib/painting/box_painter.dart index c1f3fba63..8348fc04f 100644 --- a/sdk/lib/framework/painting/box_painter.dart +++ b/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 { diff --git a/sdk/lib/framework/painting/shadows.dart b/sdk/lib/painting/shadows.dart similarity index 100% rename from sdk/lib/framework/painting/shadows.dart rename to sdk/lib/painting/shadows.dart diff --git a/sdk/lib/framework/rendering/block.dart b/sdk/lib/rendering/block.dart similarity index 99% rename from sdk/lib/framework/rendering/block.dart rename to sdk/lib/rendering/block.dart index 2e925e361..d66c1cd14 100644 --- a/sdk/lib/framework/rendering/block.dart +++ b/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 { } diff --git a/sdk/lib/framework/rendering/box.dart b/sdk/lib/rendering/box.dart similarity index 99% rename from sdk/lib/framework/rendering/box.dart rename to sdk/lib/rendering/box.dart index f53fd0bd3..96228fccf 100644 --- a/sdk/lib/framework/rendering/box.dart +++ b/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'; diff --git a/sdk/lib/framework/rendering/flex.dart b/sdk/lib/rendering/flex.dart similarity index 99% rename from sdk/lib/framework/rendering/flex.dart rename to sdk/lib/rendering/flex.dart index dc08cd73d..8b0c40981 100644 --- a/sdk/lib/framework/rendering/flex.dart +++ b/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'; diff --git a/sdk/lib/framework/rendering/object.dart b/sdk/lib/rendering/object.dart similarity index 99% rename from sdk/lib/framework/rendering/object.dart rename to sdk/lib/rendering/object.dart index 17682201a..0ccedd162 100644 --- a/sdk/lib/framework/rendering/object.dart +++ b/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; diff --git a/sdk/lib/framework/rendering/paragraph.dart b/sdk/lib/rendering/paragraph.dart similarity index 99% rename from sdk/lib/framework/rendering/paragraph.dart rename to sdk/lib/rendering/paragraph.dart index 3643ebb21..8ef6d4eeb 100644 --- a/sdk/lib/framework/rendering/paragraph.dart +++ b/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'; diff --git a/sdk/lib/framework/rendering/stack.dart b/sdk/lib/rendering/stack.dart similarity index 100% rename from sdk/lib/framework/rendering/stack.dart rename to sdk/lib/rendering/stack.dart diff --git a/sdk/lib/framework/theme2/colors.dart b/sdk/lib/theme2/colors.dart similarity index 100% rename from sdk/lib/framework/theme2/colors.dart rename to sdk/lib/theme2/colors.dart diff --git a/sdk/lib/framework/theme2/edges.dart b/sdk/lib/theme2/edges.dart similarity index 100% rename from sdk/lib/framework/theme2/edges.dart rename to sdk/lib/theme2/edges.dart diff --git a/sdk/lib/framework/theme2/shadows.dart b/sdk/lib/theme2/shadows.dart similarity index 99% rename from sdk/lib/framework/theme2/shadows.dart rename to sdk/lib/theme2/shadows.dart index 8662e51e6..4f5697fde 100644 --- a/sdk/lib/framework/theme2/shadows.dart +++ b/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> shadows = const { 1: const [ const BoxShadow( diff --git a/sdk/lib/framework/theme2/typography.dart b/sdk/lib/theme2/typography.dart similarity index 100% rename from sdk/lib/framework/theme2/typography.dart rename to sdk/lib/theme2/typography.dart diff --git a/sdk/lib/framework/theme2/view_configuration.dart b/sdk/lib/theme2/view_configuration.dart similarity index 100% rename from sdk/lib/framework/theme2/view_configuration.dart rename to sdk/lib/theme2/view_configuration.dart diff --git a/sdk/lib/framework/widgets/animated_component.dart b/sdk/lib/widgets/animated_component.dart similarity index 96% rename from sdk/lib/framework/widgets/animated_component.dart rename to sdk/lib/widgets/animated_component.dart index f6bda3e4c..1bd27107b 100644 --- a/sdk/lib/framework/widgets/animated_component.dart +++ b/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); diff --git a/sdk/lib/framework/widgets/basic.dart b/sdk/lib/widgets/basic.dart similarity index 100% rename from sdk/lib/framework/widgets/basic.dart rename to sdk/lib/widgets/basic.dart diff --git a/sdk/lib/framework/widgets/button_base.dart b/sdk/lib/widgets/button_base.dart similarity index 100% rename from sdk/lib/framework/widgets/button_base.dart rename to sdk/lib/widgets/button_base.dart diff --git a/sdk/lib/framework/widgets/checkbox.dart b/sdk/lib/widgets/checkbox.dart similarity index 96% rename from sdk/lib/framework/widgets/checkbox.dart rename to sdk/lib/widgets/checkbox.dart index 4f8f99aaa..9f709c024 100644 --- a/sdk/lib/framework/widgets/checkbox.dart +++ b/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'; diff --git a/sdk/lib/framework/widgets/drawer.dart b/sdk/lib/widgets/drawer.dart similarity index 97% rename from sdk/lib/framework/widgets/drawer.dart rename to sdk/lib/widgets/drawer.dart index 19faed8c0..58c843464 100644 --- a/sdk/lib/framework/widgets/drawer.dart +++ b/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'; diff --git a/sdk/lib/framework/widgets/drawer_header.dart b/sdk/lib/widgets/drawer_header.dart similarity index 100% rename from sdk/lib/framework/widgets/drawer_header.dart rename to sdk/lib/widgets/drawer_header.dart diff --git a/sdk/lib/framework/widgets/fixed_height_scrollable.dart b/sdk/lib/widgets/fixed_height_scrollable.dart similarity index 97% rename from sdk/lib/framework/widgets/fixed_height_scrollable.dart rename to sdk/lib/widgets/fixed_height_scrollable.dart index e03495937..e28c19079 100644 --- a/sdk/lib/framework/widgets/fixed_height_scrollable.dart +++ b/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 { diff --git a/sdk/lib/framework/widgets/floating_action_button.dart b/sdk/lib/widgets/floating_action_button.dart similarity index 100% rename from sdk/lib/framework/widgets/floating_action_button.dart rename to sdk/lib/widgets/floating_action_button.dart index 8e4a7db3b..65d805be5 100644 --- a/sdk/lib/framework/widgets/floating_action_button.dart +++ b/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 diff --git a/sdk/lib/framework/widgets/icon.dart b/sdk/lib/widgets/icon.dart similarity index 100% rename from sdk/lib/framework/widgets/icon.dart rename to sdk/lib/widgets/icon.dart diff --git a/sdk/lib/framework/widgets/icon_button.dart b/sdk/lib/widgets/icon_button.dart similarity index 100% rename from sdk/lib/framework/widgets/icon_button.dart rename to sdk/lib/widgets/icon_button.dart index 52cd4c523..a8e82e613 100644 --- a/sdk/lib/framework/widgets/icon_button.dart +++ b/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 { diff --git a/sdk/lib/framework/widgets/ink_well.dart b/sdk/lib/widgets/ink_well.dart similarity index 97% rename from sdk/lib/framework/widgets/ink_well.dart rename to sdk/lib/widgets/ink_well.dart index 785bde083..cc2b24743 100644 --- a/sdk/lib/framework/widgets/ink_well.dart +++ b/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 diff --git a/sdk/lib/framework/widgets/material.dart b/sdk/lib/widgets/material.dart similarity index 100% rename from sdk/lib/framework/widgets/material.dart rename to sdk/lib/widgets/material.dart diff --git a/sdk/lib/framework/widgets/menu_divider.dart b/sdk/lib/widgets/menu_divider.dart similarity index 100% rename from sdk/lib/framework/widgets/menu_divider.dart rename to sdk/lib/widgets/menu_divider.dart diff --git a/sdk/lib/framework/widgets/menu_item.dart b/sdk/lib/widgets/menu_item.dart similarity index 100% rename from sdk/lib/framework/widgets/menu_item.dart rename to sdk/lib/widgets/menu_item.dart index b835bfc64..ee61c4f84 100644 --- a/sdk/lib/framework/widgets/menu_item.dart +++ b/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) diff --git a/sdk/lib/framework/widgets/modal_overlay.dart b/sdk/lib/widgets/modal_overlay.dart similarity index 100% rename from sdk/lib/framework/widgets/modal_overlay.dart rename to sdk/lib/widgets/modal_overlay.dart index 56d560d08..d48ebc80b 100644 --- a/sdk/lib/framework/widgets/modal_overlay.dart +++ b/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 { diff --git a/sdk/lib/framework/widgets/popup_menu.dart b/sdk/lib/widgets/popup_menu.dart similarity index 98% rename from sdk/lib/framework/widgets/popup_menu.dart rename to sdk/lib/widgets/popup_menu.dart index caf0c8e2f..bdb45f558 100644 --- a/sdk/lib/framework/widgets/popup_menu.dart +++ b/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; diff --git a/sdk/lib/framework/widgets/popup_menu_item.dart b/sdk/lib/widgets/popup_menu_item.dart similarity index 100% rename from sdk/lib/framework/widgets/popup_menu_item.dart rename to sdk/lib/widgets/popup_menu_item.dart diff --git a/sdk/lib/framework/widgets/radio.dart b/sdk/lib/widgets/radio.dart similarity index 96% rename from sdk/lib/framework/widgets/radio.dart rename to sdk/lib/widgets/radio.dart index 40f9c5084..3f3d09472 100644 --- a/sdk/lib/framework/widgets/radio.dart +++ b/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); diff --git a/sdk/lib/framework/widgets/raised_button.dart b/sdk/lib/widgets/raised_button.dart similarity index 100% rename from sdk/lib/framework/widgets/raised_button.dart rename to sdk/lib/widgets/raised_button.dart index cf636bcc5..9489d7bd7 100644 --- a/sdk/lib/framework/widgets/raised_button.dart +++ b/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 } diff --git a/sdk/lib/framework/widgets/scaffold.dart b/sdk/lib/widgets/scaffold.dart similarity index 100% rename from sdk/lib/framework/widgets/scaffold.dart rename to sdk/lib/widgets/scaffold.dart diff --git a/sdk/lib/framework/widgets/scrollable.dart b/sdk/lib/widgets/scrollable.dart similarity index 96% rename from sdk/lib/framework/widgets/scrollable.dart rename to sdk/lib/widgets/scrollable.dart index 129abf9c7..4cc6a8cf1 100644 --- a/sdk/lib/framework/widgets/scrollable.dart +++ b/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; diff --git a/sdk/lib/framework/widgets/tool_bar.dart b/sdk/lib/widgets/tool_bar.dart similarity index 100% rename from sdk/lib/framework/widgets/tool_bar.dart rename to sdk/lib/widgets/tool_bar.dart diff --git a/sdk/lib/framework/widgets/ui_node.dart b/sdk/lib/widgets/ui_node.dart similarity index 99% rename from sdk/lib/framework/widgets/ui_node.dart rename to sdk/lib/widgets/ui_node.dart index ee154c145..cdaaf5405 100644 --- a/sdk/lib/framework/widgets/ui_node.dart +++ b/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'; diff --git a/tests/framework/stocks.dart b/tests/framework/stocks.dart index 401f12f7e..f5c02c590 100644 --- a/tests/framework/stocks.dart +++ b/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'; diff --git a/tests/raw/box_layout.dart b/tests/raw/box_layout.dart index 65e4213fb..9ef58a95c 100644 --- a/tests/raw/box_layout.dart +++ b/tests/raw/box_layout.dart @@ -1,10 +1,10 @@ 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'; diff --git a/tests/raw/padding_deflate.dart b/tests/raw/padding_deflate.dart index 80533cd16..b10222575 100644 --- a/tests/raw/padding_deflate.dart +++ b/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'; diff --git a/tests/raw/render_box.dart b/tests/raw/render_box.dart index e322213d5..b94b466c8 100644 --- a/tests/raw/render_box.dart +++ b/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'; diff --git a/tests/raw/render_flex.dart b/tests/raw/render_flex.dart index a19861aa0..5871ad33d 100644 --- a/tests/raw/render_flex.dart +++ b/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'; diff --git a/tests/resources/display_list.dart b/tests/resources/display_list.dart index 71f5202ac..d5497d3cb 100644 --- a/tests/resources/display_list.dart +++ b/tests/resources/display_list.dart @@ -1,8 +1,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'; typedef void Logger (String s); -- GitLab