Commit 054ebbf3 authored by Adam Barth's avatar Adam Barth

Rename widgets/widget.dart to widgets/framework.dart

It was confusing to have both widget.dart and widgets.dart
parent 2785db49
...@@ -5,7 +5,7 @@ import 'dart:math' as Math; ...@@ -5,7 +5,7 @@ import 'dart:math' as Math;
import 'sprites.dart'; import 'sprites.dart';
import 'package:sky/rendering/object.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:sky/widgets/navigator.dart';
import 'package:vector_math/vector_math_64.dart'; import 'package:vector_math/vector_math_64.dart';
......
...@@ -15,7 +15,7 @@ import 'package:sky/base/scheduler.dart' as scheduler; ...@@ -15,7 +15,7 @@ import 'package:sky/base/scheduler.dart' as scheduler;
import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/mojo/asset_bundle.dart';
import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.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'; import 'package:vector_math/vector_math.dart';
part 'action.dart'; part 'action.dart';
......
...@@ -9,7 +9,7 @@ import 'package:sky/painting/text_style.dart'; ...@@ -9,7 +9,7 @@ import 'package:sky/painting/text_style.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/button_base.dart'; import 'package:sky/widgets/button_base.dart';
import 'package:sky/widgets/navigator.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/task_description.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
......
...@@ -11,7 +11,7 @@ import 'package:sky/widgets/raised_button.dart'; ...@@ -11,7 +11,7 @@ import 'package:sky/widgets/raised_button.dart';
import 'package:sky/widgets/scaffold.dart'; import 'package:sky/widgets/scaffold.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/tool_bar.dart'; import 'package:sky/widgets/tool_bar.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class BlockViewportApp extends App { class BlockViewportApp extends App {
......
...@@ -15,7 +15,7 @@ import 'package:sky/widgets/scaffold.dart'; ...@@ -15,7 +15,7 @@ import 'package:sky/widgets/scaffold.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/tool_bar.dart'; import 'package:sky/widgets/tool_bar.dart';
import 'package:sky/theme/typography.dart' as typography; 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'; import 'package:sky/widgets/task_description.dart';
class CardModel { class CardModel {
......
...@@ -13,7 +13,7 @@ import 'package:sky/widgets/scaffold.dart'; ...@@ -13,7 +13,7 @@ import 'package:sky/widgets/scaffold.dart';
import 'package:sky/widgets/task_description.dart'; import 'package:sky/widgets/task_description.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/tool_bar.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'; import '../rendering/sector_layout.dart';
......
...@@ -10,7 +10,7 @@ import 'package:sky/rendering/flex.dart'; ...@@ -10,7 +10,7 @@ import 'package:sky/rendering/flex.dart';
import 'package:sky/rendering/sky_binding.dart'; import 'package:sky/rendering/sky_binding.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/raised_button.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 'package:vector_math/vector_math.dart';
import '../rendering/solid_color_box.dart'; import '../rendering/solid_color_box.dart';
......
...@@ -11,7 +11,7 @@ import 'package:sky/widgets/material.dart'; ...@@ -11,7 +11,7 @@ import 'package:sky/widgets/material.dart';
import 'package:sky/widgets/scaffold.dart'; import 'package:sky/widgets/scaffold.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/tool_bar.dart'; import 'package:sky/widgets/tool_bar.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class StyledTextApp extends App { class StyledTextApp extends App {
......
...@@ -10,7 +10,7 @@ import 'package:sky/widgets/scaffold.dart'; ...@@ -10,7 +10,7 @@ import 'package:sky/widgets/scaffold.dart';
import 'package:sky/widgets/tabs.dart'; import 'package:sky/widgets/tabs.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/tool_bar.dart'; import 'package:sky/widgets/tool_bar.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class TabbedNavigatorApp extends App { class TabbedNavigatorApp extends App {
// The index of the selected tab for each of the TabNavigators constructed below. // The index of the selected tab for each of the TabNavigators constructed below.
......
...@@ -39,4 +39,4 @@ export 'widgets/task_description.dart'; ...@@ -39,4 +39,4 @@ export 'widgets/task_description.dart';
export 'widgets/theme.dart'; export 'widgets/theme.dart';
export 'widgets/tool_bar.dart'; export 'widgets/tool_bar.dart';
export 'widgets/transitions.dart'; export 'widgets/transitions.dart';
export 'widgets/widget.dart'; export 'widgets/framework.dart';
...@@ -17,14 +17,14 @@ import 'package:sky/rendering/object.dart'; ...@@ -17,14 +17,14 @@ import 'package:sky/rendering/object.dart';
import 'package:sky/rendering/paragraph.dart'; import 'package:sky/rendering/paragraph.dart';
import 'package:sky/rendering/stack.dart'; import 'package:sky/rendering/stack.dart';
import 'package:sky/widgets/default_text_style.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/base/hit_test.dart' show EventDisposition;
export 'package:sky/rendering/box.dart' show BackgroundImage, BoxConstraints, BoxDecoration, Border, BorderSide, EdgeDims; 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/flex.dart' show FlexDirection, FlexJustifyContent, FlexAlignItems;
export 'package:sky/rendering/object.dart' show Point, Offset, Size, Rect, Color, Paint, Path; 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/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 // PAINTING NODES
......
...@@ -7,7 +7,7 @@ import 'dart:collection'; ...@@ -7,7 +7,7 @@ import 'dart:collection';
import 'package:sky/rendering/block.dart'; import 'package:sky/rendering/block.dart';
import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.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 // return null if index is greater than index of last entry
typedef Widget IndexedBuilder(int index); typedef Widget IndexedBuilder(int index);
......
...@@ -7,7 +7,7 @@ import 'dart:sky' as sky; ...@@ -7,7 +7,7 @@ import 'dart:sky' as sky;
import 'package:sky/rendering/object.dart'; import 'package:sky/rendering/object.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/theme.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'; import 'package:sky/rendering/toggleable.dart';
export 'package:sky/rendering/toggleable.dart' show ValueChanged; export 'package:sky/rendering/toggleable.dart' show ValueChanged;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'package:sky/painting/text_style.dart'; import 'package:sky/painting/text_style.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class DefaultTextStyle extends Inherited { class DefaultTextStyle extends Inherited {
......
...@@ -9,7 +9,7 @@ import 'package:sky/animation/animation_performance.dart'; ...@@ -9,7 +9,7 @@ import 'package:sky/animation/animation_performance.dart';
import 'package:sky/animation/curves.dart'; import 'package:sky/animation/curves.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/transitions.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 _kCardDismissFadeout = const Duration(milliseconds: 200);
const Duration _kCardDismissResize = const Duration(milliseconds: 300); const Duration _kCardDismissResize = const Duration(milliseconds: 300);
......
...@@ -12,7 +12,7 @@ import 'package:sky/widgets/default_text_style.dart'; ...@@ -12,7 +12,7 @@ import 'package:sky/widgets/default_text_style.dart';
import 'package:sky/widgets/icon.dart'; import 'package:sky/widgets/icon.dart';
import 'package:sky/widgets/ink_well.dart'; import 'package:sky/widgets/ink_well.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
typedef EventDisposition OnPressedFunction(); typedef EventDisposition OnPressedFunction();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
typedef void FocusChanged(GlobalKey key); typedef void FocusChanged(GlobalKey key);
......
...@@ -7,7 +7,7 @@ import 'dart:sky' as sky; ...@@ -7,7 +7,7 @@ import 'dart:sky' as sky;
import 'package:sky/mojo/asset_bundle.dart'; import 'package:sky/mojo/asset_bundle.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
enum IconThemeColor { white, black } enum IconThemeColor { white, black }
......
...@@ -7,7 +7,7 @@ import 'dart:sky' as sky; ...@@ -7,7 +7,7 @@ import 'dart:sky' as sky;
import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/box.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/icon.dart'; import 'package:sky/widgets/icon.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class IconButton extends Component { class IconButton extends Component {
......
...@@ -11,7 +11,7 @@ import 'package:sky/animation/curves.dart'; ...@@ -11,7 +11,7 @@ import 'package:sky/animation/curves.dart';
import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.dart'; import 'package:sky/rendering/object.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
const int _kSplashInitialOpacity = 0x80; const int _kSplashInitialOpacity = 0x80;
const double _kSplashCancelledVelocity = 0.3; const double _kSplashCancelledVelocity = 0.3;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class ModalOverlay extends Component { class ModalOverlay extends Component {
......
...@@ -7,7 +7,7 @@ import 'dart:sky' as sky; ...@@ -7,7 +7,7 @@ import 'dart:sky' as sky;
import 'package:sky/rendering/box.dart'; import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.dart'; import 'package:sky/rendering/object.dart';
import 'package:sky/theme/view_configuration.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 // Slots are painted in this order and hit tested in reverse of this order
enum ScaffoldSlots { enum ScaffoldSlots {
......
...@@ -15,7 +15,7 @@ import 'package:sky/theme/view_configuration.dart' as config; ...@@ -15,7 +15,7 @@ import 'package:sky/theme/view_configuration.dart' as config;
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/block_viewport.dart'; import 'package:sky/widgets/block_viewport.dart';
import 'package:sky/widgets/scrollable.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; export 'package:sky/widgets/block_viewport.dart' show BlockViewportLayoutState;
......
...@@ -10,7 +10,7 @@ import 'package:sky/rendering/object.dart'; ...@@ -10,7 +10,7 @@ import 'package:sky/rendering/object.dart';
import 'package:sky/theme/shadows.dart'; import 'package:sky/theme/shadows.dart';
import 'package:sky/widgets/basic.dart'; import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/theme.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'; import 'package:sky/rendering/toggleable.dart';
export 'package:sky/rendering/toggleable.dart' show ValueChanged; export 'package:sky/rendering/toggleable.dart' show ValueChanged;
......
...@@ -20,7 +20,7 @@ import 'package:sky/widgets/icon.dart'; ...@@ -20,7 +20,7 @@ import 'package:sky/widgets/icon.dart';
import 'package:sky/widgets/ink_well.dart'; import 'package:sky/widgets/ink_well.dart';
import 'package:sky/widgets/scrollable.dart'; import 'package:sky/widgets/scrollable.dart';
import 'package:sky/widgets/theme.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'; import 'package:vector_math/vector_math.dart';
typedef void SelectedIndexChanged(int selectedIndex); typedef void SelectedIndexChanged(int selectedIndex);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'package:sky/mojo/activity.dart' as activity; import 'package:sky/mojo/activity.dart' as activity;
import 'package:sky/widgets/theme.dart'; import 'package:sky/widgets/theme.dart';
import 'package:sky/widgets/widget.dart'; import 'package:sky/widgets/framework.dart';
class TaskDescription extends Component { class TaskDescription extends Component {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
import 'package:sky/theme/theme_data.dart'; import 'package:sky/theme/theme_data.dart';
import 'package:sky/widgets/basic.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; export 'package:sky/theme/theme_data.dart' show ThemeData, ThemeBrightness;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment