From 78379cf4aa4a9018cb16d780781145f6138c1ee6 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Mon, 3 Aug 2015 15:09:49 -0700 Subject: [PATCH] Add a widgets.dart uber library Now you can import 'package:sky/widgets.dart' to get all the widgets. --- .../sky/example/address_book/lib/main.dart | 18 +------- .../sky/example/demo_launcher/lib/main.dart | 12 +---- .../sky/example/fitness/lib/main.dart | 31 ++----------- .../sky/example/hello_world/lib/main.dart | 4 +- .../sky/example/mine_digger/lib/main.dart | 9 +--- sky/packages/sky/example/stocks/lib/main.dart | 32 +------------- sky/packages/sky/lib/widgets.dart | 44 +++++++++++++++++++ 7 files changed, 52 insertions(+), 98 deletions(-) create mode 100644 sky/packages/sky/lib/widgets.dart diff --git a/sky/packages/sky/example/address_book/lib/main.dart b/sky/packages/sky/example/address_book/lib/main.dart index 6a87bc6dd9..9de6b88fee 100644 --- a/sky/packages/sky/example/address_book/lib/main.dart +++ b/sky/packages/sky/example/address_book/lib/main.dart @@ -2,26 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -library address_book; - import 'package:sky/editing/input.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/dialog.dart'; -import 'package:sky/widgets/floating_action_button.dart'; -import 'package:sky/widgets/flat_button.dart'; -import 'package:sky/widgets/icon.dart'; -import 'package:sky/widgets/icon_button.dart'; -import 'package:sky/widgets/material.dart'; -import 'package:sky/widgets/navigator.dart'; -import 'package:sky/widgets/scaffold.dart'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/task_description.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets.dart'; class Field extends Component { Field({ diff --git a/sky/packages/sky/example/demo_launcher/lib/main.dart b/sky/packages/sky/example/demo_launcher/lib/main.dart index 2c64251b93..c1458a24f2 100644 --- a/sky/packages/sky/example/demo_launcher/lib/main.dart +++ b/sky/packages/sky/example/demo_launcher/lib/main.dart @@ -2,22 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -library demo_launcher; - import 'package:sky/mojo/activity.dart' as activity; import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/painting/box_painter.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/card.dart'; -import 'package:sky/widgets/material.dart'; -import 'package:sky/widgets/scaffold.dart'; -import 'package:sky/widgets/task_description.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/ink_well.dart'; +import 'package:sky/widgets.dart'; AssetBundle _initBundle() { if (rootBundle != null) diff --git a/sky/packages/sky/example/fitness/lib/main.dart b/sky/packages/sky/example/fitness/lib/main.dart index 405f57c162..ca7dfafbcf 100644 --- a/sky/packages/sky/example/fitness/lib/main.dart +++ b/sky/packages/sky/example/fitness/lib/main.dart @@ -4,35 +4,10 @@ library fitness; -import 'package:sky/theme/colors.dart' as colors; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/navigator.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; -import 'package:sky/widgets/task_description.dart'; -import 'package:sky/painting/text_style.dart'; -import 'package:sky/widgets/button_base.dart'; -import 'package:sky/widgets/dialog.dart'; -import 'package:sky/widgets/drawer.dart'; -import 'package:sky/widgets/drawer_divider.dart'; -import 'package:sky/widgets/drawer_header.dart'; -import 'package:sky/widgets/drawer_item.dart'; -import 'package:sky/widgets/flat_button.dart'; -import 'package:sky/widgets/floating_action_button.dart'; -import 'package:sky/widgets/icon_button.dart'; -import 'package:sky/widgets/icon.dart'; -import 'package:sky/widgets/ink_well.dart'; -import 'package:sky/widgets/material.dart'; -import 'package:sky/widgets/radio.dart'; -import 'package:sky/widgets/scaffold.dart'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/snack_bar.dart'; -import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/card.dart'; -import 'package:sky/widgets/dismissable.dart'; import 'package:sky/editing/input.dart'; -import 'package:sky/widgets/default_text_style.dart'; -import 'package:sky/widgets/switch.dart'; +import 'package:sky/painting/text_style.dart'; +import 'package:sky/theme/colors.dart' as colors; +import 'package:sky/widgets.dart'; part 'feed.dart'; part 'fitness_item.dart'; diff --git a/sky/packages/sky/example/hello_world/lib/main.dart b/sky/packages/sky/example/hello_world/lib/main.dart index f39a6aee87..c8c7acb24d 100644 --- a/sky/packages/sky/example/hello_world/lib/main.dart +++ b/sky/packages/sky/example/hello_world/lib/main.dart @@ -2,9 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -library hello_world; - -import 'package:sky/widgets/basic.dart'; +import 'package:sky/widgets.dart'; class HelloWorldApp extends App { Widget build() { diff --git a/sky/packages/sky/example/mine_digger/lib/main.dart b/sky/packages/sky/example/mine_digger/lib/main.dart index 7013276885..ccedf36097 100644 --- a/sky/packages/sky/example/mine_digger/lib/main.dart +++ b/sky/packages/sky/example/mine_digger/lib/main.dart @@ -1,20 +1,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -library mine_digger; - import 'dart:sky' as sky; import 'dart:math'; import 'package:sky/painting/text_style.dart'; import 'package:sky/rendering/flex.dart'; import 'package:sky/theme/colors.dart' as colors; -import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/widget.dart'; -import 'package:sky/widgets/scaffold.dart'; -import 'package:sky/widgets/task_description.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/tool_bar.dart'; +import 'package:sky/widgets.dart'; // Classic minesweeper-inspired game. The mouse controls are standard // except for left + right combo which is not implemented. For touch, diff --git a/sky/packages/sky/example/stocks/lib/main.dart b/sky/packages/sky/example/stocks/lib/main.dart index a197cfebb0..9111a7f85a 100644 --- a/sky/packages/sky/example/stocks/lib/main.dart +++ b/sky/packages/sky/example/stocks/lib/main.dart @@ -12,37 +12,7 @@ import 'package:sky/painting/text_style.dart'; import 'package:sky/rendering/box.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/checkbox.dart'; -import 'package:sky/widgets/default_text_style.dart'; -import 'package:sky/widgets/dialog.dart'; -import 'package:sky/widgets/drawer_divider.dart'; -import 'package:sky/widgets/drawer_header.dart'; -import 'package:sky/widgets/drawer_item.dart'; -import 'package:sky/widgets/drawer.dart'; -import 'package:sky/widgets/flat_button.dart'; -import 'package:sky/widgets/floating_action_button.dart'; -import 'package:sky/widgets/icon_button.dart'; -import 'package:sky/widgets/icon.dart'; -import 'package:sky/widgets/ink_well.dart'; -import 'package:sky/widgets/material.dart'; -import 'package:sky/widgets/modal_overlay.dart'; -import 'package:sky/widgets/navigator.dart'; -import 'package:sky/widgets/popup_menu_item.dart'; -import 'package:sky/widgets/popup_menu.dart'; -import 'package:sky/widgets/radio.dart'; -import 'package:sky/widgets/scaffold.dart'; -import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/snack_bar.dart'; -import 'package:sky/widgets/switch.dart'; -import 'package:sky/widgets/tabs.dart'; -import 'package:sky/widgets/task_description.dart'; -import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/widget.dart'; - -//TODO(jimsimon): Is this needed? -export 'package:sky/widgets/popup_menu.dart' show PopupMenuStatus; +import 'package:sky/widgets.dart'; import 'stock_data.dart'; diff --git a/sky/packages/sky/lib/widgets.dart b/sky/packages/sky/lib/widgets.dart new file mode 100644 index 0000000000..ac920e2f86 --- /dev/null +++ b/sky/packages/sky/lib/widgets.dart @@ -0,0 +1,44 @@ +// Copyright 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +export 'widgets/animated_component.dart'; +export 'widgets/animated_container.dart'; +export 'widgets/animation_intentions.dart'; +export 'widgets/basic.dart'; +export 'widgets/block_viewport.dart'; +export 'widgets/button_base.dart'; +export 'widgets/card.dart'; +export 'widgets/checkbox.dart'; +export 'widgets/default_text_style.dart'; +export 'widgets/dialog.dart'; +export 'widgets/dismissable.dart'; +export 'widgets/drawer.dart'; +export 'widgets/drawer_divider.dart'; +export 'widgets/drawer_header.dart'; +export 'widgets/drawer_item.dart'; +export 'widgets/flat_button.dart'; +export 'widgets/floating_action_button.dart'; +export 'widgets/focus.dart'; +export 'widgets/icon_button.dart'; +export 'widgets/icon.dart'; +export 'widgets/ink_well.dart'; +export 'widgets/material_button.dart'; +export 'widgets/material.dart'; +export 'widgets/modal_overlay.dart'; +export 'widgets/navigator.dart'; +export 'widgets/popup_menu.dart'; +export 'widgets/popup_menu_item.dart'; +export 'widgets/radio.dart'; +export 'widgets/raised_button.dart'; +export 'widgets/scaffold.dart'; +export 'widgets/scrollable.dart'; +export 'widgets/snack_bar.dart'; +export 'widgets/switch.dart'; +export 'widgets/tabs.dart'; +export 'widgets/task_description.dart'; +export 'widgets/theme.dart'; +export 'widgets/toggleable.dart'; +export 'widgets/tool_bar.dart'; +export 'widgets/transitions.dart'; +export 'widgets/widget.dart'; -- GitLab