diff --git a/packages/flutter/example/game/lib/game_demo.dart b/packages/flutter/example/game/lib/game_demo.dart index c660bf581f6..c0edc9c56c7 100644 --- a/packages/flutter/example/game/lib/game_demo.dart +++ b/packages/flutter/example/game/lib/game_demo.dart @@ -5,7 +5,7 @@ import 'dart:math' as Math; import 'sprites.dart'; import 'package:sky/rendering/object.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/navigator.dart'; import 'package:vector_math/vector_math_64.dart'; diff --git a/packages/flutter/example/game/lib/sprites.dart b/packages/flutter/example/game/lib/sprites.dart index c25eace8cdf..ee4cdd77ea3 100644 --- a/packages/flutter/example/game/lib/sprites.dart +++ b/packages/flutter/example/game/lib/sprites.dart @@ -15,7 +15,7 @@ import 'package:sky/base/scheduler.dart' as scheduler; import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/object.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:vector_math/vector_math.dart'; part 'action.dart'; diff --git a/packages/flutter/example/game/main.dart b/packages/flutter/example/game/main.dart index e1b591b430a..e8cb16cd2a0 100644 --- a/packages/flutter/example/game/main.dart +++ b/packages/flutter/example/game/main.dart @@ -9,7 +9,7 @@ import 'package:sky/painting/text_style.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/button_base.dart'; import 'package:sky/widgets/navigator.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/task_description.dart'; import 'package:sky/widgets/theme.dart'; diff --git a/packages/flutter/example/widgets/block_viewport.dart b/packages/flutter/example/widgets/block_viewport.dart index 54c5ea7f197..1e2e4da1002 100644 --- a/packages/flutter/example/widgets/block_viewport.dart +++ b/packages/flutter/example/widgets/block_viewport.dart @@ -11,7 +11,7 @@ import 'package:sky/widgets/raised_button.dart'; import 'package:sky/widgets/scaffold.dart'; import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class BlockViewportApp extends App { diff --git a/packages/flutter/example/widgets/card_collection.dart b/packages/flutter/example/widgets/card_collection.dart index b0565b7da51..b35b1ae4b81 100644 --- a/packages/flutter/example/widgets/card_collection.dart +++ b/packages/flutter/example/widgets/card_collection.dart @@ -15,7 +15,7 @@ import 'package:sky/widgets/scaffold.dart'; import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/tool_bar.dart'; import 'package:sky/theme/typography.dart' as typography; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/widgets/task_description.dart'; class CardModel { diff --git a/packages/flutter/example/widgets/sector.dart b/packages/flutter/example/widgets/sector.dart index 492e7430899..e023af8a628 100644 --- a/packages/flutter/example/widgets/sector.dart +++ b/packages/flutter/example/widgets/sector.dart @@ -13,7 +13,7 @@ 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/widget.dart'; +import 'package:sky/widgets/framework.dart'; import '../rendering/sector_layout.dart'; diff --git a/packages/flutter/example/widgets/spinning_mixed.dart b/packages/flutter/example/widgets/spinning_mixed.dart index 5d5866c95b3..2225f45871e 100644 --- a/packages/flutter/example/widgets/spinning_mixed.dart +++ b/packages/flutter/example/widgets/spinning_mixed.dart @@ -10,7 +10,7 @@ import 'package:sky/rendering/flex.dart'; import 'package:sky/rendering/sky_binding.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/raised_button.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:vector_math/vector_math.dart'; import '../rendering/solid_color_box.dart'; diff --git a/packages/flutter/example/widgets/styled_text.dart b/packages/flutter/example/widgets/styled_text.dart index 9892a2ebeef..2e1e4d42f65 100644 --- a/packages/flutter/example/widgets/styled_text.dart +++ b/packages/flutter/example/widgets/styled_text.dart @@ -11,7 +11,7 @@ import 'package:sky/widgets/material.dart'; import 'package:sky/widgets/scaffold.dart'; import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class StyledTextApp extends App { diff --git a/packages/flutter/example/widgets/tabs.dart b/packages/flutter/example/widgets/tabs.dart index f20f3c609b3..9403544de11 100644 --- a/packages/flutter/example/widgets/tabs.dart +++ b/packages/flutter/example/widgets/tabs.dart @@ -10,7 +10,7 @@ import 'package:sky/widgets/scaffold.dart'; import 'package:sky/widgets/tabs.dart'; import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/tool_bar.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class TabbedNavigatorApp extends App { // The index of the selected tab for each of the TabNavigators constructed below. diff --git a/packages/flutter/lib/widgets.dart b/packages/flutter/lib/widgets.dart index eb376ebbf61..fbd883613c5 100644 --- a/packages/flutter/lib/widgets.dart +++ b/packages/flutter/lib/widgets.dart @@ -39,4 +39,4 @@ export 'widgets/task_description.dart'; export 'widgets/theme.dart'; export 'widgets/tool_bar.dart'; export 'widgets/transitions.dart'; -export 'widgets/widget.dart'; +export 'widgets/framework.dart'; diff --git a/packages/flutter/lib/widgets/basic.dart b/packages/flutter/lib/widgets/basic.dart index 1cf1c11b672..c6ef866538a 100644 --- a/packages/flutter/lib/widgets/basic.dart +++ b/packages/flutter/lib/widgets/basic.dart @@ -17,14 +17,14 @@ import 'package:sky/rendering/object.dart'; import 'package:sky/rendering/paragraph.dart'; import 'package:sky/rendering/stack.dart'; import 'package:sky/widgets/default_text_style.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; export 'package:sky/base/hit_test.dart' show EventDisposition; export 'package:sky/rendering/box.dart' show BackgroundImage, BoxConstraints, BoxDecoration, Border, BorderSide, EdgeDims; export 'package:sky/rendering/flex.dart' show FlexDirection, FlexJustifyContent, FlexAlignItems; export 'package:sky/rendering/object.dart' show Point, Offset, Size, Rect, Color, Paint, Path; export 'package:sky/rendering/toggleable.dart' show ValueChanged; -export 'package:sky/widgets/widget.dart' show Key, GlobalKey, Widget, Component, StatefulComponent, App, runApp, Listener, ParentDataNode; +export 'package:sky/widgets/framework.dart' show Key, GlobalKey, Widget, Component, StatefulComponent, App, runApp, Listener, ParentDataNode; // PAINTING NODES diff --git a/packages/flutter/lib/widgets/block_viewport.dart b/packages/flutter/lib/widgets/block_viewport.dart index e397309beb9..8bc30c518c7 100644 --- a/packages/flutter/lib/widgets/block_viewport.dart +++ b/packages/flutter/lib/widgets/block_viewport.dart @@ -7,7 +7,7 @@ import 'dart:collection'; import 'package:sky/rendering/block.dart'; import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/object.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; // return null if index is greater than index of last entry typedef Widget IndexedBuilder(int index); diff --git a/packages/flutter/lib/widgets/checkbox.dart b/packages/flutter/lib/widgets/checkbox.dart index a340a2bb8dd..d560aafccc8 100644 --- a/packages/flutter/lib/widgets/checkbox.dart +++ b/packages/flutter/lib/widgets/checkbox.dart @@ -7,7 +7,7 @@ import 'dart:sky' as sky; import 'package:sky/rendering/object.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/rendering/toggleable.dart'; export 'package:sky/rendering/toggleable.dart' show ValueChanged; diff --git a/packages/flutter/lib/widgets/default_text_style.dart b/packages/flutter/lib/widgets/default_text_style.dart index 25f6b48cf6a..9d810bef224 100644 --- a/packages/flutter/lib/widgets/default_text_style.dart +++ b/packages/flutter/lib/widgets/default_text_style.dart @@ -4,7 +4,7 @@ import 'package:sky/painting/text_style.dart'; import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class DefaultTextStyle extends Inherited { diff --git a/packages/flutter/lib/widgets/dismissable.dart b/packages/flutter/lib/widgets/dismissable.dart index f3415ccd5f1..43951734d02 100644 --- a/packages/flutter/lib/widgets/dismissable.dart +++ b/packages/flutter/lib/widgets/dismissable.dart @@ -9,7 +9,7 @@ import 'package:sky/animation/animation_performance.dart'; import 'package:sky/animation/curves.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/transitions.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; const Duration _kCardDismissFadeout = const Duration(milliseconds: 200); const Duration _kCardDismissResize = const Duration(milliseconds: 300); diff --git a/packages/flutter/lib/widgets/drawer_item.dart b/packages/flutter/lib/widgets/drawer_item.dart index 4ac5b210640..eb04c0669e6 100644 --- a/packages/flutter/lib/widgets/drawer_item.dart +++ b/packages/flutter/lib/widgets/drawer_item.dart @@ -12,7 +12,7 @@ import 'package:sky/widgets/default_text_style.dart'; import 'package:sky/widgets/icon.dart'; import 'package:sky/widgets/ink_well.dart'; import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; typedef EventDisposition OnPressedFunction(); diff --git a/packages/flutter/lib/widgets/focus.dart b/packages/flutter/lib/widgets/focus.dart index 513fc16c4aa..ef683f2d80c 100644 --- a/packages/flutter/lib/widgets/focus.dart +++ b/packages/flutter/lib/widgets/focus.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/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; typedef void FocusChanged(GlobalKey key); diff --git a/packages/flutter/lib/widgets/widget.dart b/packages/flutter/lib/widgets/framework.dart similarity index 100% rename from packages/flutter/lib/widgets/widget.dart rename to packages/flutter/lib/widgets/framework.dart diff --git a/packages/flutter/lib/widgets/icon.dart b/packages/flutter/lib/widgets/icon.dart index 9955c4cc9ba..768cfc20b3a 100644 --- a/packages/flutter/lib/widgets/icon.dart +++ b/packages/flutter/lib/widgets/icon.dart @@ -7,7 +7,7 @@ import 'dart:sky' as sky; import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; enum IconThemeColor { white, black } diff --git a/packages/flutter/lib/widgets/icon_button.dart b/packages/flutter/lib/widgets/icon_button.dart index fefe4cc07c6..e88f2b46fe6 100644 --- a/packages/flutter/lib/widgets/icon_button.dart +++ b/packages/flutter/lib/widgets/icon_button.dart @@ -7,7 +7,7 @@ import 'dart:sky' as sky; import 'package:sky/rendering/box.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/icon.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class IconButton extends Component { diff --git a/packages/flutter/lib/widgets/ink_well.dart b/packages/flutter/lib/widgets/ink_well.dart index 6fc097f31e2..380732848a3 100644 --- a/packages/flutter/lib/widgets/ink_well.dart +++ b/packages/flutter/lib/widgets/ink_well.dart @@ -11,7 +11,7 @@ import 'package:sky/animation/curves.dart'; import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/object.dart'; import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; const int _kSplashInitialOpacity = 0x80; const double _kSplashCancelledVelocity = 0.3; diff --git a/packages/flutter/lib/widgets/modal_overlay.dart b/packages/flutter/lib/widgets/modal_overlay.dart index abfee7a5390..1669b49f509 100644 --- a/packages/flutter/lib/widgets/modal_overlay.dart +++ b/packages/flutter/lib/widgets/modal_overlay.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class ModalOverlay extends Component { diff --git a/packages/flutter/lib/widgets/scaffold.dart b/packages/flutter/lib/widgets/scaffold.dart index a5b99841291..cba929c4d50 100644 --- a/packages/flutter/lib/widgets/scaffold.dart +++ b/packages/flutter/lib/widgets/scaffold.dart @@ -7,7 +7,7 @@ import 'dart:sky' as sky; import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/object.dart'; import 'package:sky/theme/view_configuration.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; // Slots are painted in this order and hit tested in reverse of this order enum ScaffoldSlots { diff --git a/packages/flutter/lib/widgets/scrollable.dart b/packages/flutter/lib/widgets/scrollable.dart index 5f21205e030..b8c9d1fe2df 100644 --- a/packages/flutter/lib/widgets/scrollable.dart +++ b/packages/flutter/lib/widgets/scrollable.dart @@ -15,7 +15,7 @@ import 'package:sky/theme/view_configuration.dart' as config; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/block_viewport.dart'; import 'package:sky/widgets/scrollable.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; export 'package:sky/widgets/block_viewport.dart' show BlockViewportLayoutState; diff --git a/packages/flutter/lib/widgets/switch.dart b/packages/flutter/lib/widgets/switch.dart index fc917c9c039..53464188de1 100644 --- a/packages/flutter/lib/widgets/switch.dart +++ b/packages/flutter/lib/widgets/switch.dart @@ -10,7 +10,7 @@ import 'package:sky/rendering/object.dart'; import 'package:sky/theme/shadows.dart'; import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:sky/rendering/toggleable.dart'; export 'package:sky/rendering/toggleable.dart' show ValueChanged; diff --git a/packages/flutter/lib/widgets/tabs.dart b/packages/flutter/lib/widgets/tabs.dart index 71f94bb1ea7..e2a459b76d0 100644 --- a/packages/flutter/lib/widgets/tabs.dart +++ b/packages/flutter/lib/widgets/tabs.dart @@ -20,7 +20,7 @@ import 'package:sky/widgets/icon.dart'; import 'package:sky/widgets/ink_well.dart'; import 'package:sky/widgets/scrollable.dart'; import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; import 'package:vector_math/vector_math.dart'; typedef void SelectedIndexChanged(int selectedIndex); diff --git a/packages/flutter/lib/widgets/task_description.dart b/packages/flutter/lib/widgets/task_description.dart index f2ba4ff49ef..c5378c02d06 100644 --- a/packages/flutter/lib/widgets/task_description.dart +++ b/packages/flutter/lib/widgets/task_description.dart @@ -4,7 +4,7 @@ import 'package:sky/mojo/activity.dart' as activity; import 'package:sky/widgets/theme.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; class TaskDescription extends Component { diff --git a/packages/flutter/lib/widgets/theme.dart b/packages/flutter/lib/widgets/theme.dart index 9da448ac8d3..b84ff16a597 100644 --- a/packages/flutter/lib/widgets/theme.dart +++ b/packages/flutter/lib/widgets/theme.dart @@ -4,7 +4,7 @@ import 'package:sky/theme/theme_data.dart'; import 'package:sky/widgets/basic.dart'; -import 'package:sky/widgets/widget.dart'; +import 'package:sky/widgets/framework.dart'; export 'package:sky/theme/theme_data.dart' show ThemeData, ThemeBrightness;