From 5d676f854936acbc92fa8aa503cf259695c4649f Mon Sep 17 00:00:00 2001 From: Hixie Date: Thu, 11 Jun 2015 10:26:11 -0700 Subject: [PATCH] Refactor fn2.dart, since it breached our 1000-line threshold. This moves input.dart to editing2/, since that way we can define the layering as strictly unidirectional. It also reorders a bunch of imports to fit the style guide. I removed the old remnants of the widgets example, and put the fn2 examples into the examples/widgets/ directory, to parallel the framework directory names. R=abarth@chromium.org Review URL: https://codereview.chromium.org/1177243002. --- examples/stocks2/lib/stock_app.dart | 34 ++++++++----------- examples/stocks2/lib/stock_arrow.dart | 9 +++-- examples/stocks2/lib/stock_data.dart | 1 + examples/stocks2/lib/stock_list.dart | 5 +-- examples/stocks2/lib/stock_menu.dart | 6 ++-- examples/stocks2/lib/stock_row.dart | 8 ++--- examples/{fn2 => widgets}/container.dart | 7 ++-- .../hello_widgets.dart} | 4 +-- examples/widgets/main.sky | 15 -------- examples/widgets/pubspec.yaml | 3 -- 10 files changed, 37 insertions(+), 55 deletions(-) rename examples/{fn2 => widgets}/container.dart (91%) rename examples/{fn2/hello_fn2.dart => widgets/hello_widgets.dart} (84%) delete mode 100644 examples/widgets/main.sky delete mode 100644 examples/widgets/pubspec.yaml diff --git a/examples/stocks2/lib/stock_app.dart b/examples/stocks2/lib/stock_app.dart index fcd95d663f..4e29072c87 100644 --- a/examples/stocks2/lib/stock_app.dart +++ b/examples/stocks2/lib/stock_app.dart @@ -2,30 +2,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/framework/components2/tool_bar.dart'; -import 'package:sky/framework/components2/drawer.dart'; -import 'package:sky/framework/components2/drawer_header.dart'; -import 'package:sky/framework/components2/floating_action_button.dart'; -import 'package:sky/framework/components2/icon.dart'; -import 'package:sky/framework/components2/icon_button.dart'; -import 'package:sky/framework/components2/menu_divider.dart'; -import 'package:sky/framework/components2/menu_item.dart'; -import 'package:sky/framework/components2/input.dart'; -import 'package:sky/framework/components2/modal_overlay.dart'; -import 'package:sky/framework/components2/popup_menu.dart'; -import 'package:sky/framework/components2/radio.dart'; -import 'package:sky/framework/components2/scaffold.dart'; -import 'package:sky/framework/fn2.dart'; -import 'package:sky/framework/theme2/typography.dart' as typography; +import 'package:sky/framework/editing2/input.dart'; import 'package:sky/framework/theme2/colors.dart' as colors; +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/wrappers.dart'; + import 'stock_data.dart'; -import 'package:sky/framework/rendering/box.dart'; import 'stock_list.dart'; import 'stock_menu.dart'; -import 'dart:async'; -import 'dart:sky' as sky; - enum StockMode { optimistic, pessimistic } class StocksApp extends App { diff --git a/examples/stocks2/lib/stock_arrow.dart b/examples/stocks2/lib/stock_arrow.dart index f78b253dc6..da585fd1b4 100644 --- a/examples/stocks2/lib/stock_arrow.dart +++ b/examples/stocks2/lib/stock_arrow.dart @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:sky/framework/fn2.dart'; -import 'package:vector_math/vector_math.dart'; +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 'dart:math' as math; -import 'dart:sky' as sky; +import 'package:sky/framework/widgets/wrappers.dart'; class StockArrow extends Component { diff --git a/examples/stocks2/lib/stock_data.dart b/examples/stocks2/lib/stock_data.dart index a77ca50a67..075add2675 100644 --- a/examples/stocks2/lib/stock_data.dart +++ b/examples/stocks2/lib/stock_data.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'dart:math'; + import 'package:sky/framework/net/fetch.dart'; // Snapshot from http://www.nasdaq.com/screening/company-list.aspx diff --git a/examples/stocks2/lib/stock_list.dart b/examples/stocks2/lib/stock_list.dart index 7ff6fe8cb7..1c3ac12a02 100644 --- a/examples/stocks2/lib/stock_list.dart +++ b/examples/stocks2/lib/stock_list.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 'package:sky/framework/components2/fixed_height_scrollable.dart'; -import 'package:sky/framework/fn2.dart'; +import 'package:sky/framework/widgets/fixed_height_scrollable.dart'; +import 'package:sky/framework/widgets/wrappers.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 1ac20ccc20..6312b1e32a 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/fn2.dart'; -import 'package:sky/framework/components2/popup_menu.dart'; -import 'package:sky/framework/components2/checkbox.dart'; +import 'package:sky/framework/widgets/checkbox.dart'; +import 'package:sky/framework/widgets/popup_menu.dart'; +import 'package:sky/framework/widgets/wrappers.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 1ecb068469..fc0555bce7 100644 --- a/examples/stocks2/lib/stock_row.dart +++ b/examples/stocks2/lib/stock_row.dart @@ -3,11 +3,11 @@ // found in the LICENSE file. import 'dart:sky' as sky; -import 'package:sky/framework/components2/ink_well.dart'; -import 'package:sky/framework/fn2.dart'; -import 'package:sky/framework/rendering/flex.dart'; + import 'package:sky/framework/rendering/box.dart'; -import 'package:sky/framework/theme/typography.dart' as typography; +import 'package:sky/framework/widgets/wrappers.dart'; +import 'package:sky/framework/widgets/ink_well.dart'; + import 'stock_arrow.dart'; import 'stock_data.dart'; diff --git a/examples/fn2/container.dart b/examples/widgets/container.dart similarity index 91% rename from examples/fn2/container.dart rename to examples/widgets/container.dart index f1eec6bbea..437784078a 100644 --- a/examples/fn2/container.dart +++ b/examples/widgets/container.dart @@ -3,8 +3,11 @@ // found in the LICENSE file. import 'dart:sky' as sky; -import 'package:sky/framework/fn2.dart'; + import 'package:sky/framework/rendering/box.dart'; +import 'package:sky/framework/widgets/ui_node.dart'; +import 'package:sky/framework/widgets/wrappers.dart'; + import '../lib/solid_color_box.dart'; class Rectangle extends RenderObjectWrapper { @@ -29,7 +32,7 @@ class ContainerApp extends App { child: new Block([ new Container( decoration: new BoxDecoration(backgroundColor: const sky.Color(0xFFFFFF00)), - height: 20.0, + height: 20.0 ), new Image(src: "https://www.dartlang.org/logos/dart-logo.png", size: new sky.Size(300.0, 300.0), diff --git a/examples/fn2/hello_fn2.dart b/examples/widgets/hello_widgets.dart similarity index 84% rename from examples/fn2/hello_fn2.dart rename to examples/widgets/hello_widgets.dart index 1aeda5d2eb..127e26fa9e 100644 --- a/examples/fn2/hello_fn2.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/fn2.dart'; +import 'package:sky/framework/widgets/wrappers.dart'; class HelloWorldApp extends App { UINode build() { @@ -12,4 +12,4 @@ class HelloWorldApp extends App { void main() { new HelloWorldApp(); -} \ No newline at end of file +} diff --git a/examples/widgets/main.sky b/examples/widgets/main.sky deleted file mode 100644 index 506b0ff837..0000000000 --- a/examples/widgets/main.sky +++ /dev/null @@ -1,15 +0,0 @@ -#!mojo mojo:sky_viewer - - - - - diff --git a/examples/widgets/pubspec.yaml b/examples/widgets/pubspec.yaml deleted file mode 100644 index 1f45fe870a..0000000000 --- a/examples/widgets/pubspec.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: widgets -dependencies: - sky: any