From 2811c03484cd308968bf53ba10cfa945bc9bf487 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Fri, 12 Jun 2015 22:16:48 -0700
Subject: [PATCH] Rename widgets/wrappers.dart to widgets/basic.dart

Although the basic widgets are wrappers, that's an implementation detail and
shouldn't be encoded in the name of the library.

TBR=ianh@google.com

Review URL: https://codereview.chromium.org/1182983002.
---
 examples/stocks2/lib/stock_app.dart                     | 2 +-
 examples/stocks2/lib/stock_arrow.dart                   | 2 +-
 examples/stocks2/lib/stock_list.dart                    | 2 +-
 examples/stocks2/lib/stock_menu.dart                    | 2 +-
 examples/stocks2/lib/stock_row.dart                     | 2 +-
 examples/widgets/container.dart                         | 2 +-
 examples/widgets/hello_widgets.dart                     | 2 +-
 examples/widgets/spinning_mixed.dart                    | 2 +-
 home.dart                                               | 2 +-
 sdk/BUILD.gn                                            | 2 +-
 sdk/lib/framework/editing2/editable_text.dart           | 2 +-
 sdk/lib/framework/editing2/input.dart                   | 2 +-
 sdk/lib/framework/widgets/animated_component.dart       | 2 +-
 sdk/lib/framework/widgets/{wrappers.dart => basic.dart} | 0
 sdk/lib/framework/widgets/button_base.dart              | 2 +-
 sdk/lib/framework/widgets/checkbox.dart                 | 2 +-
 sdk/lib/framework/widgets/drawer.dart                   | 2 +-
 sdk/lib/framework/widgets/drawer_header.dart            | 2 +-
 sdk/lib/framework/widgets/fixed_height_scrollable.dart  | 2 +-
 sdk/lib/framework/widgets/floating_action_button.dart   | 2 +-
 sdk/lib/framework/widgets/icon.dart                     | 2 +-
 sdk/lib/framework/widgets/icon_button.dart              | 2 +-
 sdk/lib/framework/widgets/ink_well.dart                 | 2 +-
 sdk/lib/framework/widgets/material.dart                 | 2 +-
 sdk/lib/framework/widgets/menu_divider.dart             | 2 +-
 sdk/lib/framework/widgets/menu_item.dart                | 2 +-
 sdk/lib/framework/widgets/modal_overlay.dart            | 2 +-
 sdk/lib/framework/widgets/popup_menu.dart               | 2 +-
 sdk/lib/framework/widgets/popup_menu_item.dart          | 2 +-
 sdk/lib/framework/widgets/radio.dart                    | 2 +-
 sdk/lib/framework/widgets/raised_button.dart            | 2 +-
 sdk/lib/framework/widgets/scrollable.dart               | 2 +-
 sdk/lib/framework/widgets/tool_bar.dart                 | 2 +-
 33 files changed, 32 insertions(+), 32 deletions(-)
 rename sdk/lib/framework/widgets/{wrappers.dart => basic.dart} (100%)

diff --git a/examples/stocks2/lib/stock_app.dart b/examples/stocks2/lib/stock_app.dart
index ce92ba924..4853b16b8 100644
--- a/examples/stocks2/lib/stock_app.dart
+++ b/examples/stocks2/lib/stock_app.dart
@@ -20,7 +20,7 @@ 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.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 da585fd1b..722b50234 100644
--- a/examples/stocks2/lib/stock_arrow.dart
+++ b/examples/stocks2/lib/stock_arrow.dart
@@ -8,7 +8,7 @@ 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.dart';
 
 class StockArrow extends Component {
 
diff --git a/examples/stocks2/lib/stock_list.dart b/examples/stocks2/lib/stock_list.dart
index 1c3ac12a0..f92811544 100644
--- a/examples/stocks2/lib/stock_list.dart
+++ b/examples/stocks2/lib/stock_list.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/framework/widgets/fixed_height_scrollable.dart';
-import 'package:sky/framework/widgets/wrappers.dart';
+import 'package:sky/framework/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 6312b1e32..87783a1f6 100644
--- a/examples/stocks2/lib/stock_menu.dart
+++ b/examples/stocks2/lib/stock_menu.dart
@@ -4,7 +4,7 @@
 
 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/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 b1db6f0be..28b955b9a 100644
--- a/examples/stocks2/lib/stock_row.dart
+++ b/examples/stocks2/lib/stock_row.dart
@@ -7,7 +7,7 @@ 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.dart';
 import 'package:sky/framework/rendering/paragraph.dart';
 
 import 'stock_arrow.dart';
diff --git a/examples/widgets/container.dart b/examples/widgets/container.dart
index 8c842be0b..0fc1fb718 100644
--- a/examples/widgets/container.dart
+++ b/examples/widgets/container.dart
@@ -5,7 +5,7 @@
 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.dart';
 
 class ContainerApp extends App {
   UINode build() {
diff --git a/examples/widgets/hello_widgets.dart b/examples/widgets/hello_widgets.dart
index 127e26fa9..71916998f 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.dart';
 
 class HelloWorldApp extends App {
   UINode build() {
diff --git a/examples/widgets/spinning_mixed.dart b/examples/widgets/spinning_mixed.dart
index e75b36c91..de9b97eb7 100644
--- a/examples/widgets/spinning_mixed.dart
+++ b/examples/widgets/spinning_mixed.dart
@@ -9,7 +9,7 @@ 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.dart';
 import 'package:vector_math/vector_math.dart';
 
 import '../lib/solid_color_box.dart';
diff --git a/home.dart b/home.dart
index d41cb237c..e28b4431d 100644
--- a/home.dart
+++ b/home.dart
@@ -13,7 +13,7 @@ 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/wrappers.dart';
+import 'package:sky/framework/widgets/basic.dart';
 
 void launch(String relativeUrl) {
   Uri url = Uri.base.resolve(relativeUrl);
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index d4fd71259..2670ccab6 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -98,6 +98,7 @@ dart_pkg("sdk") {
     "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",
@@ -119,7 +120,6 @@ dart_pkg("sdk") {
     "lib/framework/widgets/scrollable.dart",
     "lib/framework/widgets/tool_bar.dart",
     "lib/framework/widgets/ui_node.dart",
-    "lib/framework/widgets/wrappers.dart",
     "lib/sky_tool",
     "pubspec.yaml",
   ]
diff --git a/sdk/lib/framework/editing2/editable_text.dart b/sdk/lib/framework/editing2/editable_text.dart
index 59f2bcba1..1f1dab398 100644
--- a/sdk/lib/framework/editing2/editable_text.dart
+++ b/sdk/lib/framework/editing2/editable_text.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import '../widgets/wrappers.dart';
+import '../widgets/basic.dart';
 import 'editable_string.dart';
 
 class EditableText extends Component {
diff --git a/sdk/lib/framework/editing2/input.dart b/sdk/lib/framework/editing2/input.dart
index 9ed9132a1..7421b1e45 100644
--- a/sdk/lib/framework/editing2/input.dart
+++ b/sdk/lib/framework/editing2/input.dart
@@ -4,7 +4,7 @@
 
 import 'dart:sky' as sky;
 
-import '../widgets/wrappers.dart';
+import '../widgets/basic.dart';
 import 'editable_string.dart';
 import 'editable_text.dart';
 import 'keyboard.dart';
diff --git a/sdk/lib/framework/widgets/animated_component.dart b/sdk/lib/framework/widgets/animated_component.dart
index b4727da03..f6bda3e4c 100644
--- a/sdk/lib/framework/widgets/animated_component.dart
+++ b/sdk/lib/framework/widgets/animated_component.dart
@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import '../animation/animated_value.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 typedef void SetterFunction(double value);
 
diff --git a/sdk/lib/framework/widgets/wrappers.dart b/sdk/lib/framework/widgets/basic.dart
similarity index 100%
rename from sdk/lib/framework/widgets/wrappers.dart
rename to sdk/lib/framework/widgets/basic.dart
diff --git a/sdk/lib/framework/widgets/button_base.dart b/sdk/lib/framework/widgets/button_base.dart
index 5ae273c1a..31ce0009f 100644
--- a/sdk/lib/framework/widgets/button_base.dart
+++ b/sdk/lib/framework/widgets/button_base.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'wrappers.dart';
+import 'basic.dart';
 
 abstract class ButtonBase extends Component {
 
diff --git a/sdk/lib/framework/widgets/checkbox.dart b/sdk/lib/framework/widgets/checkbox.dart
index a6b341844..4f8f99aaa 100644
--- a/sdk/lib/framework/widgets/checkbox.dart
+++ b/sdk/lib/framework/widgets/checkbox.dart
@@ -10,7 +10,7 @@ import '../animation/animated_value.dart';
 import '../animation/curves.dart';
 import '../rendering/box.dart';
 import 'animated_component.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 typedef void ValueChanged(value);
 
diff --git a/sdk/lib/framework/widgets/drawer.dart b/sdk/lib/framework/widgets/drawer.dart
index 9a16a450a..19faed8c0 100644
--- a/sdk/lib/framework/widgets/drawer.dart
+++ b/sdk/lib/framework/widgets/drawer.dart
@@ -12,7 +12,7 @@ import '../animation/curves.dart';
 import '../theme2/colors.dart';
 import '../theme2/shadows.dart';
 import 'animated_component.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 // TODO(eseidel): Draw width should vary based on device size:
 // http://www.google.com/design/spec/layout/structure.html#structure-side-nav
diff --git a/sdk/lib/framework/widgets/drawer_header.dart b/sdk/lib/framework/widgets/drawer_header.dart
index 88fb88170..a596b17b3 100644
--- a/sdk/lib/framework/widgets/drawer_header.dart
+++ b/sdk/lib/framework/widgets/drawer_header.dart
@@ -4,7 +4,7 @@
 
 import '../theme2/colors.dart';
 import '../theme2/view_configuration.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 class DrawerHeader extends Component {
 
diff --git a/sdk/lib/framework/widgets/fixed_height_scrollable.dart b/sdk/lib/framework/widgets/fixed_height_scrollable.dart
index a12b2c96e..e03495937 100644
--- a/sdk/lib/framework/widgets/fixed_height_scrollable.dart
+++ b/sdk/lib/framework/widgets/fixed_height_scrollable.dart
@@ -8,7 +8,7 @@ import 'package:vector_math/vector_math.dart';
 
 import '../animation/scroll_behavior.dart';
 import 'scrollable.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 abstract class FixedHeightScrollable extends Scrollable {
 
diff --git a/sdk/lib/framework/widgets/floating_action_button.dart b/sdk/lib/framework/widgets/floating_action_button.dart
index dc3da829d..8e4a7db3b 100644
--- a/sdk/lib/framework/widgets/floating_action_button.dart
+++ b/sdk/lib/framework/widgets/floating_action_button.dart
@@ -7,7 +7,7 @@ import '../theme2/edges.dart';
 import 'button_base.dart';
 import 'ink_well.dart';
 import 'material.dart';
-import 'wrappers.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/framework/widgets/icon.dart
index 35f01938b..330d8a2c4 100644
--- a/sdk/lib/framework/widgets/icon.dart
+++ b/sdk/lib/framework/widgets/icon.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 'wrappers.dart';
+import 'basic.dart';
 
 // TODO(eseidel): This should use package:.
 const String kAssetBase = '/packages/sky/assets/material-design-icons';
diff --git a/sdk/lib/framework/widgets/icon_button.dart b/sdk/lib/framework/widgets/icon_button.dart
index 56af188b6..52cd4c523 100644
--- a/sdk/lib/framework/widgets/icon_button.dart
+++ b/sdk/lib/framework/widgets/icon_button.dart
@@ -5,7 +5,7 @@
 import '../rendering/box.dart';
 import 'icon.dart';
 import 'ui_node.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 class IconButton extends Component {
 
diff --git a/sdk/lib/framework/widgets/ink_well.dart b/sdk/lib/framework/widgets/ink_well.dart
index 5b28a7ff7..785bde083 100644
--- a/sdk/lib/framework/widgets/ink_well.dart
+++ b/sdk/lib/framework/widgets/ink_well.dart
@@ -10,7 +10,7 @@ import '../animation/curves.dart';
 import '../rendering/box.dart';
 import '../rendering/object.dart';
 import 'ui_node.dart';
-import 'wrappers.dart';
+import 'basic.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/framework/widgets/material.dart
index 3f53c1b45..2f76fcc95 100644
--- a/sdk/lib/framework/widgets/material.dart
+++ b/sdk/lib/framework/widgets/material.dart
@@ -6,7 +6,7 @@ import '../painting/box_painter.dart';
 import '../theme2/colors.dart';
 import '../theme2/edges.dart';
 import '../theme2/shadows.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 class Material extends Component {
 
diff --git a/sdk/lib/framework/widgets/menu_divider.dart b/sdk/lib/framework/widgets/menu_divider.dart
index 89faa11dd..d403f0f35 100644
--- a/sdk/lib/framework/widgets/menu_divider.dart
+++ b/sdk/lib/framework/widgets/menu_divider.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 'wrappers.dart';
+import 'basic.dart';
 
 class MenuDivider extends Component {
   MenuDivider({ Object key }) : super(key: key);
diff --git a/sdk/lib/framework/widgets/menu_item.dart b/sdk/lib/framework/widgets/menu_item.dart
index b06134a70..b835bfc64 100644
--- a/sdk/lib/framework/widgets/menu_item.dart
+++ b/sdk/lib/framework/widgets/menu_item.dart
@@ -6,7 +6,7 @@ import 'button_base.dart';
 import 'icon.dart';
 import 'ink_well.dart';
 import 'ui_node.dart';
-import 'wrappers.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/framework/widgets/modal_overlay.dart
index e53891be5..56d560d08 100644
--- a/sdk/lib/framework/widgets/modal_overlay.dart
+++ b/sdk/lib/framework/widgets/modal_overlay.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'ui_node.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 class ModalOverlay extends Component {
 
diff --git a/sdk/lib/framework/widgets/popup_menu.dart b/sdk/lib/framework/widgets/popup_menu.dart
index e8f8fcaf8..caf0c8e2f 100644
--- a/sdk/lib/framework/widgets/popup_menu.dart
+++ b/sdk/lib/framework/widgets/popup_menu.dart
@@ -12,7 +12,7 @@ import '../theme2/colors.dart';
 import '../theme2/shadows.dart';
 import 'animated_component.dart';
 import 'popup_menu_item.dart';
-import 'wrappers.dart';
+import 'basic.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/framework/widgets/popup_menu_item.dart
index ed9610a48..5cebac754 100644
--- a/sdk/lib/framework/widgets/popup_menu_item.dart
+++ b/sdk/lib/framework/widgets/popup_menu_item.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 'wrappers.dart';
+import 'basic.dart';
 import 'ink_well.dart';
 
 class PopupMenuItem extends Component {
diff --git a/sdk/lib/framework/widgets/radio.dart b/sdk/lib/framework/widgets/radio.dart
index b119d7fe4..40f9c5084 100644
--- a/sdk/lib/framework/widgets/radio.dart
+++ b/sdk/lib/framework/widgets/radio.dart
@@ -8,7 +8,7 @@ import 'package:sky/framework/theme2/colors.dart' as colors;
 
 import '../rendering/object.dart';
 import 'button_base.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 typedef void ValueChanged(value);
 
diff --git a/sdk/lib/framework/widgets/raised_button.dart b/sdk/lib/framework/widgets/raised_button.dart
index c1d3c62a8..cf636bcc5 100644
--- a/sdk/lib/framework/widgets/raised_button.dart
+++ b/sdk/lib/framework/widgets/raised_button.dart
@@ -7,7 +7,7 @@ import '../theme2/colors.dart';
 import 'button_base.dart';
 import 'ink_well.dart';
 import 'material.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 enum RaisedButtonTheme { light, dark }
 
diff --git a/sdk/lib/framework/widgets/scrollable.dart b/sdk/lib/framework/widgets/scrollable.dart
index 09c33c7bf..129abf9c7 100644
--- a/sdk/lib/framework/widgets/scrollable.dart
+++ b/sdk/lib/framework/widgets/scrollable.dart
@@ -11,7 +11,7 @@ import '../animation/scroll_behavior.dart';
 import '../theme2/edges.dart';
 import '../theme2/view_configuration.dart' as config;
 import 'material.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 const double _kMillisecondsPerSecond = 1000.0;
 
diff --git a/sdk/lib/framework/widgets/tool_bar.dart b/sdk/lib/framework/widgets/tool_bar.dart
index d90df06c4..525153d42 100644
--- a/sdk/lib/framework/widgets/tool_bar.dart
+++ b/sdk/lib/framework/widgets/tool_bar.dart
@@ -5,7 +5,7 @@
 import '../rendering/flex.dart';
 import '../theme2/shadows.dart';
 import '../theme2/view_configuration.dart';
-import 'wrappers.dart';
+import 'basic.dart';
 
 class ToolBar extends Component {
 
-- 
GitLab