Make fn3 the default widget framework

examples/address_book/lib/main.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class Field extends StatelessComponent {
   Field({

examples/demo_launcher/lib/main.dart

@@ -5,7 +5,7 @@
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 
 AssetBundle _initBundle() {
   if (rootBundle != null)

examples/fitness/lib/main.dart

@@ -8,7 +8,7 @@ import 'package:playfair/playfair.dart' as playfair;
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 import 'user_data.dart';
 import 'date_utils.dart';

examples/game/example_effect_line.dart

 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:skysprites/skysprites.dart';
 
 AssetBundle _initBundle() {

examples/game/lib/main.dart

@@ -8,7 +8,7 @@ import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:skysprites/skysprites.dart';
 
 import 'game_demo.dart';

examples/game/test_drawatlas.dart

@@ -3,7 +3,7 @@ import 'dart:sky';
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:skysprites/skysprites.dart';
 
 AssetBundle _initBundle() {

examples/game/test_performance.dart

@@ -4,7 +4,7 @@ import 'dart:math' as math;
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/widgets_next.dart';
+import 'package:sky/widgets.dart';
 import 'package:skysprites/skysprites.dart';
 
 AssetBundle _initBundle() {

examples/hello_world/lib/main.dart

@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 void main() => runApp(new Center(child: new Text('Hello, world!')));

examples/mine_digger/lib/main.dart

@@ -8,7 +8,7 @@ import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/src/fn3.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,

examples/stocks/lib/main.dart

@@ -12,7 +12,7 @@ import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 import 'stock_data.dart';
 

examples/widgets/big_switch.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class BigSwitch extends StatefulComponent {
   BigSwitch({ this.scale });

examples/widgets/card_collection.dart

@@ -5,7 +5,7 @@
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class CardModel {
   CardModel(this.value, this.height, this.color);

examples/widgets/container.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/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class ContainerApp extends StatelessComponent {
   Widget build(BuildContext context) {

examples/widgets/date_picker.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/src/fn3.dart';
+import 'package:sky/widgets.dart';
 import 'package:sky/material.dart';
 
 void main() => runApp(new DatePickerDemo());

examples/widgets/drag_and_drop.dart

@@ -5,7 +5,7 @@
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class DragData {
   DragData(this.text);

examples/widgets/horizontal_scrolling.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/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class Circle extends StatelessComponent {
   Circle({ this.margin: EdgeDims.zero });

examples/widgets/navigation.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:sky/material.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 final Map<String, RouteBuilder> routes = <String, RouteBuilder>{
   '/': (NavigatorState navigator, Route route) => new Container(

examples/widgets/pageable_list.dart

@@ -5,7 +5,7 @@
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class CardModel {
   CardModel(this.value, this.size, this.color);

examples/widgets/piano.dart

@@ -7,7 +7,7 @@ import 'package:sky_services/media/media.mojom.dart';
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/services.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 // All of these sounds are marked as public domain at soundbible.
 const String chimes = "http://soundbible.com/grab.php?id=2030&type=wav";

examples/widgets/progress_indicator.dart

@@ -4,7 +4,7 @@
 
 import 'package:sky/animation.dart';
 import 'package:sky/material.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class ProgressIndicatorApp extends StatefulComponent {
   ProgressIndicatorAppState createState() => new ProgressIndicatorAppState();

examples/widgets/scale.dart

@@ -4,7 +4,7 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class ScaleApp extends StatefulComponent {
   ScaleAppState createState() => new ScaleAppState();

examples/widgets/styled_text.dart

@@ -4,7 +4,7 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class StyledTextApp extends StatefulComponent {
   StyledTextAppState createState() => new StyledTextAppState();

examples/widgets/tabs.dart

@@ -4,7 +4,7 @@
 
 import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/src/fn3.dart';
+import 'package:sky/widgets.dart';
 
 class TabbedNavigatorApp extends StatefulComponent {
   TabbedNavigatorAppState createState() => new TabbedNavigatorAppState();

packages/flutter/lib/src/fn3.dart

-// 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.
-
-library fn3;
-
-export 'fn3/animated_component.dart';
-export 'fn3/app.dart';
-export 'fn3/basic.dart';
-export 'fn3/binding.dart';
-export 'fn3/button_state.dart';
-export 'fn3/card.dart';
-export 'fn3/checkbox.dart';
-export 'fn3/date_picker.dart';
-export 'fn3/dialog.dart';
-export 'fn3/dismissable.dart';
-export 'fn3/drag_target.dart';
-export 'fn3/drawer.dart';
-export 'fn3/drawer_divider.dart';
-export 'fn3/drawer_header.dart';
-export 'fn3/drawer_item.dart';
-export 'fn3/editable_text.dart';
-export 'fn3/flat_button.dart';
-export 'fn3/floating_action_button.dart';
-export 'fn3/focus.dart';
-export 'fn3/framework.dart';
-export 'fn3/gesture_detector.dart';
-export 'fn3/homogeneous_viewport.dart';
-export 'fn3/icon.dart';
-export 'fn3/icon_button.dart';
-export 'fn3/ink_well.dart';
-export 'fn3/input.dart';
-export 'fn3/material.dart';
-export 'fn3/material_button.dart';
-export 'fn3/mimic.dart';
-export 'fn3/mixed_viewport.dart';
-export 'fn3/navigator.dart';
-export 'fn3/popup_menu.dart';
-export 'fn3/popup_menu_item.dart';
-export 'fn3/progress_indicator.dart';
-export 'fn3/radio.dart';
-export 'fn3/raised_button.dart';
-export 'fn3/scaffold.dart';
-export 'fn3/scrollable.dart';
-export 'fn3/snack_bar.dart';
-export 'fn3/switch.dart';
-export 'fn3/tabs.dart';
-export 'fn3/theme.dart';
-export 'fn3/title.dart';
-export 'fn3/tool_bar.dart';
-export 'fn3/transitions.dart';
-export 'fn3/unique_component.dart';
-
-export 'package:vector_math/vector_math.dart' show Matrix4;

packages/flutter/lib/src/fn3/animated_component.dart

-// 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.
-
-import 'package:sky/animation.dart';
-import 'package:sky/src/fn3/framework.dart';
-
-abstract class AnimatedComponent extends StatefulComponent {
-  const AnimatedComponent({ Key key, this.direction, this.duration }) : super(key: key);
-
-  final Duration duration;
-  final Direction direction;
-}
-
-abstract class AnimatedState<T extends AnimatedComponent> extends State<T> {
-  void initState() {
-    super.initState();
-    _performance = new AnimationPerformance(duration: config.duration);
-    performance.addStatusListener(_handleAnimationStatusChanged);
-    if (buildDependsOnPerformance) {
-      performance.addListener(() {
-        setState(() {
-          // We don't actually have any state to change, per se,
-          // we just know that we have in fact changed state.
-        });
-      });
-    }
-    performance.play(config.direction);
-  }
-
-  void didUpdateConfig(T oldConfig) {
-    performance.duration = config.duration;
-    if (config.duration != oldConfig.duration || config.direction != oldConfig.direction)
-      performance.play(config.direction);
-  }
-
-  AnimationPerformance get performance => _performance;
-  AnimationPerformance _performance;
-
-  void _handleAnimationStatusChanged(AnimationStatus status) {
-    if (status == AnimationStatus.completed)
-      handleCompleted();
-    else if (status == AnimationStatus.dismissed)
-      handleDismissed();
-  }
-
-  bool get buildDependsOnPerformance => false;
-  void handleCompleted() { }
-  void handleDismissed() { }
-}

packages/flutter/lib/src/fn3/card.dart

-// 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.
-
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/material.dart';
-
-const EdgeDims _kCardMargins = const EdgeDims.all(4.0);
-
-/// A material design card
-///
-/// <https://www.google.com/design/spec/components/cards.html>
-class Card extends StatelessComponent {
-  const Card({ Key key, this.child, this.color }) : super(key: key);
-
-  final Widget child;
-  final Color color;
-
-  Widget build(BuildContext context) {
-    return new Container(
-      margin: _kCardMargins,
-      child: new Material(
-        color: color,
-        type: MaterialType.card,
-        level: 2,
-        child: child
-      )
-    );
-  }
-}

packages/flutter/lib/src/fn3/checkbox.dart

-// 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.
-
-import 'dart:sky' as sky;
-
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/theme.dart';
-import 'package:sky/src/rendering/object.dart';
-import 'package:sky/src/rendering/toggleable.dart';
-
-export 'package:sky/src/rendering/toggleable.dart' show ValueChanged;
-
-const double _kMidpoint = 0.5;
-const sky.Color _kLightUncheckedColor = const sky.Color(0x8A000000);
-const sky.Color _kDarkUncheckedColor = const sky.Color(0xB2FFFFFF);
-const double _kEdgeSize = 20.0;
-const double _kEdgeRadius = 1.0;
-
-/// A material design checkbox
-///
-/// The checkbox itself does not maintain any state. Instead, when the state of
-/// the checkbox changes, the component calls the `onChange` callback. Most
-/// components that use a checkbox will listen for the `onChange` callback and
-/// rebuild the checkbox with a new `value` to update the visual appearance of
-/// the checkbox.
-///
-/// <https://www.google.com/design/spec/components/lists-controls.html#lists-controls-types-of-list-controls>
-class Checkbox extends StatelessComponent {
-  /// Constructs a checkbox
-  ///
-  /// * `value` determines whether the checkbox is checked.
-  /// * `onChanged` is called whenever the state of the checkbox should change.
-  const Checkbox({Key key, this.value, this.onChanged}) : super(key: key);
-
-  final bool value;
-  final ValueChanged onChanged;
-
-  Widget build(BuildContext context) {
-    ThemeData themeData = Theme.of(context);
-    Color uncheckedColor = themeData.brightness == ThemeBrightness.light
-        ? _kLightUncheckedColor
-        : _kDarkUncheckedColor;
-    return new _CheckboxWrapper(
-      value: value,
-      onChanged: onChanged,
-      uncheckedColor: uncheckedColor,
-      accentColor: themeData.accentColor
-    );
-  }
-}
-
-// This wrapper class exists only because Switch needs to be a Component in
-// order to get an accent color from a Theme but Components do not know how to
-// host RenderObjects.
-class _CheckboxWrapper extends LeafRenderObjectWidget {
-  _CheckboxWrapper({
-    Key key,
-    this.value,
-    this.onChanged,
-    this.uncheckedColor,
-    this.accentColor
-  }): super(key: key) {
-    assert(uncheckedColor != null);
-    assert(accentColor != null);
-  }
-
-  final bool value;
-  final ValueChanged onChanged;
-  final Color uncheckedColor;
-  final Color accentColor;
-
-  _RenderCheckbox createRenderObject() => new _RenderCheckbox(
-    value: value,
-    accentColor: accentColor,
-    uncheckedColor: uncheckedColor,
-    onChanged: onChanged
-  );
-
-  void updateRenderObject(_RenderCheckbox renderObject, _CheckboxWrapper oldWidget) {
-    renderObject.value = value;
-    renderObject.onChanged = onChanged;
-    renderObject.uncheckedColor = uncheckedColor;
-    renderObject.accentColor = accentColor;
-  }
-}
-
-class _RenderCheckbox extends RenderToggleable {
-  _RenderCheckbox({
-    bool value,
-    Color uncheckedColor,
-    Color accentColor,
-    ValueChanged onChanged
-  }): _uncheckedColor = uncheckedColor,
-      _accentColor = accentColor,
-      super(
-        value: value,
-        onChanged: onChanged,
-        size: new Size(_kEdgeSize, _kEdgeSize)
-      ) {
-    assert(uncheckedColor != null);
-    assert(accentColor != null);
-  }
-
-  Color _uncheckedColor;
-  Color get uncheckedColor => _uncheckedColor;
-
-  void set uncheckedColor(Color value) {
-    assert(value != null);
-    if (value == _uncheckedColor)
-      return;
-    _uncheckedColor = value;
-    markNeedsPaint();
-  }
-
-  Color _accentColor;
-  void set accentColor(Color value) {
-    assert(value != null);
-    if (value == _accentColor)
-      return;
-    _accentColor = value;
-    markNeedsPaint();
-  }
-
-  void paint(PaintingContext context, Offset offset) {
-    final PaintingCanvas canvas = context.canvas;
-    // Choose a color between grey and the theme color
-    sky.Paint paint = new sky.Paint()
-      ..strokeWidth = 2.0
-      ..color = uncheckedColor;
-
-    // The rrect contracts slightly during the animation
-    double inset = 2.0 - (position - _kMidpoint).abs() * 2.0;
-    sky.Rect rect = new sky.Rect.fromLTWH(offset.dx + inset, offset.dy + inset,
-        _kEdgeSize - inset, _kEdgeSize - inset);
-    sky.RRect rrect = new sky.RRect()
-      ..setRectXY(rect, _kEdgeRadius, _kEdgeRadius);
-
-    // Outline of the empty rrect
-    paint.setStyle(sky.PaintingStyle.stroke);
-    canvas.drawRRect(rrect, paint);
-
-    // Radial gradient that changes size
-    if (position > 0) {
-      paint.setStyle(sky.PaintingStyle.fill);
-      paint.setShader(new sky.Gradient.radial(
-          new Point(_kEdgeSize / 2.0, _kEdgeSize / 2.0),
-          _kEdgeSize * (_kMidpoint - position) * 8.0, [
-        const sky.Color(0x00000000),
-        uncheckedColor
-      ]));
-      canvas.drawRRect(rrect, paint);
-    }
-
-    if (position > _kMidpoint) {
-      double t = (position - _kMidpoint) / (1.0 - _kMidpoint);
-
-      // Solid filled rrect
-      paint.setStyle(sky.PaintingStyle.strokeAndFill);
-      paint.color = new Color.fromARGB((t * 255).floor(), _accentColor.red,
-          _accentColor.green, _accentColor.blue);
-      canvas.drawRRect(rrect, paint);
-
-      // White inner check
-      paint.color = const sky.Color(0xFFFFFFFF);
-      paint.setStyle(sky.PaintingStyle.stroke);
-      sky.Path path = new sky.Path();
-      sky.Point start = new sky.Point(_kEdgeSize * 0.2, _kEdgeSize * 0.5);
-      sky.Point mid = new sky.Point(_kEdgeSize * 0.4, _kEdgeSize * 0.7);
-      sky.Point end = new sky.Point(_kEdgeSize * 0.8, _kEdgeSize * 0.3);
-      Point lerp(Point p1, Point p2, double t) =>
-          new Point(p1.x * (1.0 - t) + p2.x * t, p1.y * (1.0 - t) + p2.y * t);
-      sky.Point drawStart = lerp(start, mid, 1.0 - t);
-      sky.Point drawEnd = lerp(mid, end, t);
-      path.moveTo(offset.dx + drawStart.x, offset.dy + drawStart.y);
-      path.lineTo(offset.dx + mid.x, offset.dy + mid.y);
-      path.lineTo(offset.dx + drawEnd.x, offset.dy + drawEnd.y);
-      canvas.drawPath(path, paint);
-    }
-  }
-}

packages/flutter/lib/src/fn3/dialog.dart

-// 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.
-
-import 'dart:async';
-
-import 'package:sky/animation.dart';
-import 'package:sky/material.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/focus.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/gesture_detector.dart';
-import 'package:sky/src/fn3/material.dart';
-import 'package:sky/src/fn3/navigator.dart';
-import 'package:sky/src/fn3/scrollable.dart';
-import 'package:sky/src/fn3/theme.dart';
-import 'package:sky/src/fn3/transitions.dart';
-
-typedef Widget DialogBuilder(NavigatorState navigator);
-
-/// A material design dialog
-///
-/// <https://www.google.com/design/spec/components/dialogs.html>
-class Dialog extends StatelessComponent {
-  Dialog({
-    Key key,
-    this.title,
-    this.titlePadding,
-    this.content,
-    this.contentPadding,
-    this.actions,
-    this.onDismiss
-  }): super(key: key);
-
-  /// The (optional) title of the dialog is displayed in a large font at the top
-  /// of the dialog.
-  final Widget title;
-
-  // Padding around the title; uses material design default if none is supplied
-  // If there is no title, no padding will be provided
-  final EdgeDims titlePadding;
-
-  /// The (optional) content of the dialog is displayed in the center of the
-  /// dialog in a lighter font.
-  final Widget content;
-
-  // Padding around the content; uses material design default if none is supplied
-  final EdgeDims contentPadding;
-
-  /// The (optional) set of actions that are displayed at the bottom of the
-  /// dialog.
-  final List<Widget> actions;
-
-  /// An (optional) callback that is called when the dialog is dismissed.
-  final Function onDismiss;
-
-  Color _getColor(BuildContext context) {
-    switch (Theme.of(context).brightness) {
-      case ThemeBrightness.light:
-        return Colors.white;
-      case ThemeBrightness.dark:
-        return Colors.grey[800];
-    }
-  }
-
-  Widget build(BuildContext context) {
-
-    List<Widget> dialogBody = new List<Widget>();
-
-    if (title != null) {
-      EdgeDims padding = titlePadding;
-      if (padding == null)
-        padding = new EdgeDims(24.0, 24.0, content == null ? 20.0 : 0.0, 24.0);
-      dialogBody.add(new Padding(
-        padding: padding,
-        child: new DefaultTextStyle(
-          style: Theme.of(context).text.title,
-          child: title
-        )
-      ));
-    }
-
-    if (content != null) {
-      EdgeDims padding = contentPadding;
-      if (padding == null)
-        padding = const EdgeDims(20.0, 24.0, 24.0, 24.0);
-      dialogBody.add(new Padding(
-        padding: padding,
-        child: new DefaultTextStyle(
-          style: Theme.of(context).text.subhead,
-          child: content
-        )
-      ));
-    }
-
-    if (actions != null) {
-      dialogBody.add(new Container(
-        child: new Row(actions,
-          justifyContent: FlexJustifyContent.end
-        )
-      ));
-    }
-
-    return new Stack([
-      new GestureDetector(
-        onTap: onDismiss,
-        child: new Container(
-          decoration: const BoxDecoration(
-            backgroundColor: const Color(0x7F000000)
-          )
-        )
-      ),
-      new Center(
-        child: new Container(
-          margin: new EdgeDims.symmetric(horizontal: 40.0, vertical: 24.0),
-          child: new ConstrainedBox(
-            constraints: new BoxConstraints(minWidth: 280.0),
-            child: new Material(
-              level: 4,
-              color: _getColor(context),
-              child: new IntrinsicWidth(
-                child: new Block(dialogBody)
-              )
-            )
-          )
-        )
-      )
-    ]);
-
-  }
-}
-
-const Duration _kTransitionDuration = const Duration(milliseconds: 150);
-
-class DialogRoute extends Route {
-  DialogRoute({ this.completer, this.builder });
-
-  final Completer completer;
-  final RouteBuilder builder;
-
-  Duration get transitionDuration => _kTransitionDuration;
-  bool get opaque => false;
-  Widget build(Key key, NavigatorState navigator) {
-    return new FadeTransition(
-      performance: performance,
-      opacity: new AnimatedValue<double>(0.0, end: 1.0, curve: easeOut),
-      child: builder(navigator, this)
-    );
-  }
-
-  void didPop([dynamic result]) {
-    completer.complete(result);
-    super.didPop(result);
-  }
-}
-
-Future showDialog(NavigatorState navigator, DialogBuilder builder) {
-  Completer completer = new Completer();
-  navigator.push(new DialogRoute(
-    completer: completer,
-    builder: (navigator, route) {
-      return new Focus(
-        key: new GlobalObjectKey(route),
-        autofocus: true,
-        child: builder(navigator)
-      );
-    }
-  ));
-  return completer.future;
-}

packages/flutter/lib/src/fn3/dismissable.dart

-// 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.
-
-import 'dart:sky' as sky;
-
-import 'package:sky/animation.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/transitions.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/gesture_detector.dart';
-
-const Duration _kCardDismissFadeout = const Duration(milliseconds: 200);
-const Duration _kCardDismissResize = const Duration(milliseconds: 300);
-final Interval _kCardDismissResizeInterval = new Interval(0.4, 1.0);
-const double _kMinFlingVelocity = 700.0;
-const double _kMinFlingVelocityDelta = 400.0;
-const double _kFlingVelocityScale = 1.0 / 300.0;
-const double _kDismissCardThreshold = 0.4;
-
-enum DismissDirection {
-  vertical,
-  horizontal,
-  left,
-  right,
-  up,
-  down
-}
-
-typedef void ResizedCallback();
-typedef void DismissedCallback();
-
-class Dismissable extends StatefulComponent {
-  Dismissable({
-    Key key,
-    this.child,
-    this.onResized,
-    this.onDismissed,
-    this.direction: DismissDirection.horizontal
-  }) : super(key: key);
-
-  Widget child;
-  ResizedCallback onResized;
-  DismissedCallback onDismissed;
-  DismissDirection direction;
-
-  DismissableState createState() => new DismissableState();
-}
-
-class DismissableState extends State<Dismissable> {
-  void initState() {
-    super.initState();
-    _fadePerformance = new AnimationPerformance(duration: _kCardDismissFadeout);
-    _fadePerformance.addStatusListener((AnimationStatus status) {
-      if (status == AnimationStatus.completed)
-        _handleFadeCompleted();
-    });
-  }
-
-  AnimationPerformance _fadePerformance;
-  AnimationPerformance _resizePerformance;
-
-  Size _size;
-  double _dragExtent = 0.0;
-  bool _dragUnderway = false;
-
-  bool get _directionIsYAxis {
-    return
-      config.direction == DismissDirection.vertical ||
-      config.direction == DismissDirection.up ||
-      config.direction == DismissDirection.down;
-  }
-
-  void _handleFadeCompleted() {
-    if (!_dragUnderway)
-      _startResizePerformance();
-  }
-
-  bool get _isActive {
-    return _size != null && (_dragUnderway || _fadePerformance.isAnimating);
-  }
-
-  void _maybeCallOnResized() {
-    if (config.onResized != null)
-      config.onResized();
-  }
-
-  void _maybeCallOnDismissed() {
-    if (config.onDismissed != null)
-      config.onDismissed();
-  }
-
-  void _startResizePerformance() {
-    assert(_size != null);
-    assert(_fadePerformance != null);
-    assert(_fadePerformance.isCompleted);
-    assert(_resizePerformance == null);
-
-    setState(() {
-      _resizePerformance = new AnimationPerformance()
-        ..duration = _kCardDismissResize
-        ..addListener(_handleResizeProgressChanged);
-      _resizePerformance.play();
-    });
-    // Our squash curve (ease) does not return v=0.0 for t=0.0, so we
-    // technically resize on the first frame. To make sure this doesn't confuse
-    // any other widgets (like MixedViewport, which checks for this kind of
-    // thing), we report a resize straight away.
-    _maybeCallOnResized();
-  }
-
-  void _handleResizeProgressChanged() {
-    if (_resizePerformance.isCompleted)
-      _maybeCallOnDismissed();
-    else
-      _maybeCallOnResized();
-  }
-
-  void _handleDragStart() {
-    if (_fadePerformance.isAnimating)
-      return;
-    setState(() {
-      _dragUnderway = true;
-      _dragExtent = 0.0;
-      _fadePerformance.progress = 0.0;
-    });
-  }
-
-  void _handleDragUpdate(double delta) {
-    if (!_isActive || _fadePerformance.isAnimating)
-      return;
-
-    double oldDragExtent = _dragExtent;
-    switch(config.direction) {
-      case DismissDirection.horizontal:
-      case DismissDirection.vertical:
-        _dragExtent += delta;
-        break;
-
-      case DismissDirection.up:
-      case DismissDirection.left:
-        if (_dragExtent + delta < 0)
-          _dragExtent += delta;
-        break;
-
-      case DismissDirection.down:
-      case DismissDirection.right:
-        if (_dragExtent + delta > 0)
-          _dragExtent += delta;
-        break;
-    }
-
-    if (oldDragExtent.sign != _dragExtent.sign) {
-      setState(() {
-        // Rebuild to update the new drag endpoint.
-        // The sign of _dragExtent is part of our build state;
-        // the actual value is not, it's just used to configure
-        // the performances.
-      });
-    }
-    if (!_fadePerformance.isAnimating)
-      _fadePerformance.progress = _dragExtent.abs() / (_size.width * _kDismissCardThreshold);
-  }
-
-  bool _isFlingGesture(sky.Offset velocity) {
-    double vx = velocity.dx;
-    double vy = velocity.dy;
-    if (_directionIsYAxis) {
-      if (vy.abs() - vx.abs() < _kMinFlingVelocityDelta)
-        return false;
-      switch(config.direction) {
-        case DismissDirection.vertical:
-          return vy.abs() > _kMinFlingVelocity;
-        case DismissDirection.up:
-          return -vy > _kMinFlingVelocity;
-        default:
-          return vy > _kMinFlingVelocity;
-      }
-    } else {
-      if (vx.abs() - vy.abs() < _kMinFlingVelocityDelta)
-        return false;
-      switch(config.direction) {
-        case DismissDirection.horizontal:
-          return vx.abs() > _kMinFlingVelocity;
-        case DismissDirection.left:
-          return -vx > _kMinFlingVelocity;
-        default:
-          return vx > _kMinFlingVelocity;
-      }
-    }
-    return false;
-  }
-
-  void _handleDragEnd(sky.Offset velocity) {
-    if (!_isActive || _fadePerformance.isAnimating)
-      return;
-
-    setState(() {
-      _dragUnderway = false;
-      if (_fadePerformance.isCompleted) {
-        _startResizePerformance();
-      } else if (_isFlingGesture(velocity)) {
-        double flingVelocity = _directionIsYAxis ? velocity.dy : velocity.dx;
-        _dragExtent = flingVelocity.sign;
-        _fadePerformance.fling(velocity: flingVelocity.abs() * _kFlingVelocityScale);
-      } else {
-        _fadePerformance.reverse();
-      }
-    });
-  }
-
-  void _handleSizeChanged(Size newSize) {
-    setState(() {
-      _size = new Size.copy(newSize);
-    });
-  }
-
-  Point get _activeCardDragEndPoint {
-    if (!_isActive)
-      return Point.origin;
-    assert(_size != null);
-    double extent = _directionIsYAxis ? _size.height : _size.width;
-    return new Point(_dragExtent.sign * extent * _kDismissCardThreshold, 0.0);
-  }
-
-  Widget build(BuildContext context) {
-    if (_resizePerformance != null) {
-      // make sure you remove this widget once it's been dismissed!
-      assert(_resizePerformance.status == AnimationStatus.forward);
-
-      AnimatedValue<double> squashAxisExtent = new AnimatedValue<double>(
-        _directionIsYAxis ? _size.width : _size.height,
-        end: 0.0,
-        curve: ease,
-        interval: _kCardDismissResizeInterval
-      );
-
-      return new SquashTransition(
-        performance: _resizePerformance.view,
-        width: _directionIsYAxis ? squashAxisExtent : null,
-        height: !_directionIsYAxis ? squashAxisExtent : null
-      );
-    }
-
-    return new GestureDetector(
-      onHorizontalDragStart: _directionIsYAxis ? null : _handleDragStart,
-      onHorizontalDragUpdate: _directionIsYAxis ? null : _handleDragUpdate,
-      onHorizontalDragEnd: _directionIsYAxis ? null : _handleDragEnd,
-      onVerticalDragStart: _directionIsYAxis ? _handleDragStart : null,
-      onVerticalDragUpdate: _directionIsYAxis ? _handleDragUpdate : null,
-      onVerticalDragEnd: _directionIsYAxis ? _handleDragEnd : null,
-      child: new SizeObserver(
-        callback: _handleSizeChanged,
-        child: new FadeTransition(
-          performance: _fadePerformance.view,
-          opacity: new AnimatedValue<double>(1.0, end: 0.0),
-          child: new SlideTransition(
-            performance: _fadePerformance.view,
-            position: new AnimatedValue<Point>(Point.origin, end: _activeCardDragEndPoint),
-            child: config.child
-          )
-        )
-      )
-    );
-  }
-}

packages/flutter/lib/src/fn3/drag_target.dart

-// 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.
-
-import 'dart:collection';
-import 'dart:sky' as sky;
-
-import 'package:sky/rendering.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/binding.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/navigator.dart';
-
-typedef bool DragTargetWillAccept<T>(T data);
-typedef void DragTargetAccept<T>(T data);
-typedef Widget DragTargetBuilder<T>(BuildContext context, List<T> candidateData, List<dynamic> rejectedData);
-typedef void DragFinishedNotification();
-
-class Draggable extends StatefulComponent {
-  Draggable({ Key key, this.navigator, this.data, this.child, this.feedback }): super(key: key) {
-    assert(navigator != null);
-  }
-
-  final NavigatorState navigator;
-  final dynamic data;
-  final Widget child;
-  final Widget feedback;
-
-  DraggableState createState() => new DraggableState();
-}
-
-class DraggableState extends State<Draggable> {
-  DragRoute _route;
-
-  void _startDrag(sky.PointerEvent event) {
-    if (_route != null)
-      return; // TODO(ianh): once we switch to using gestures, just hand the gesture to the route so it can do everything itself. then we can have multiple drags at the same time.
-    Point point = new Point(event.x, event.y);
-    RenderBox renderObject = context.findRenderObject();
-    _route = new DragRoute(
-      data: config.data,
-      dragStartPoint: renderObject.globalToLocal(point),
-      feedback: config.feedback,
-      onDragFinished: () {
-        _route = null;
-      }
-    );
-    _route.update(point);
-    config.navigator.push(_route);
-  }
-
-  void _updateDrag(sky.PointerEvent event) {
-    if (_route != null) {
-      config.navigator.setState(() {
-        _route.update(new Point(event.x, event.y));
-      });
-    }
-  }
-
-  void _cancelDrag(sky.PointerEvent event) {
-    if (_route != null) {
-      config.navigator.popRoute(_route, DragEndKind.canceled);
-      assert(_route == null);
-    }
-  }
-
-  void _drop(sky.PointerEvent event) {
-    if (_route != null) {
-      _route.update(new Point(event.x, event.y));
-      config.navigator.popRoute(_route, DragEndKind.dropped);
-      assert(_route == null);
-    }
-  }
-
-  Widget build(BuildContext context) {
-    // TODO(abarth): We should be using a GestureDetector
-    return new Listener(
-      onPointerDown: _startDrag,
-      onPointerMove: _updateDrag,
-      onPointerCancel: _cancelDrag,
-      onPointerUp: _drop,
-      child: config.child
-    );
-  }
-}
-
-
-class DragTarget<T> extends StatefulComponent {
-  const DragTarget({
-    Key key,
-    this.builder,
-    this.onWillAccept,
-    this.onAccept
-  }) : super(key: key);
-
-  final DragTargetBuilder<T> builder;
-  final DragTargetWillAccept<T> onWillAccept;
-  final DragTargetAccept<T> onAccept;
-
-  DragTargetState<T> createState() => new DragTargetState<T>();
-}
-
-class DragTargetState<T> extends State<DragTarget<T>> {
-  final List<T> _candidateData = new List<T>();
-  final List<dynamic> _rejectedData = new List<dynamic>();
-
-  bool didEnter(dynamic data) {
-    assert(!_candidateData.contains(data));
-    assert(!_rejectedData.contains(data));
-    if (data is T && (config.onWillAccept == null || config.onWillAccept(data))) {
-      setState(() {
-        _candidateData.add(data);
-      });
-      return true;
-    }
-    _rejectedData.add(data);
-    return false;
-  }
-
-  void didLeave(dynamic data) {
-    assert(_candidateData.contains(data) || _rejectedData.contains(data));
-    setState(() {
-      _candidateData.remove(data);
-      _rejectedData.remove(data);
-    });
-  }
-
-  void didDrop(dynamic data) {
-    assert(_candidateData.contains(data));
-    setState(() {
-      _candidateData.remove(data);
-    });
-    if (config.onAccept != null)
-      config.onAccept(data);
-  }
-
-  Widget build(BuildContext context) {
-    return new MetaData(
-      metaData: this,
-      child: config.builder(context,
-                            new UnmodifiableListView<T>(_candidateData),
-                            new UnmodifiableListView<dynamic>(_rejectedData))
-    );
-  }
-}
-
-
-enum DragEndKind { dropped, canceled }
-
-class DragRoute extends Route {
-  DragRoute({ this.data, this.dragStartPoint: Point.origin, this.feedback, this.onDragFinished });
-
-  final dynamic data;
-  final Point dragStartPoint;
-  final Widget feedback;
-  final DragFinishedNotification onDragFinished;
-
-  DragTargetState _activeTarget;
-  bool _activeTargetWillAcceptDrop = false;
-  Offset _lastOffset;
-
-  void update(Point globalPosition) {
-    _lastOffset = globalPosition - dragStartPoint;
-    HitTestResult result = WidgetFlutterBinding.instance.hitTest(globalPosition);
-    DragTargetState target = _getDragTarget(result.path);
-    if (target == _activeTarget)
-      return;
-    if (_activeTarget != null)
-      _activeTarget.didLeave(data);
-    _activeTarget = target;
-    _activeTargetWillAcceptDrop = _activeTarget != null && _activeTarget.didEnter(data);
-  }
-
-  DragTargetState _getDragTarget(List<HitTestEntry> path) {
-    // TODO(abarth): Why do we reverse the path here?
-    for (HitTestEntry entry in path.reversed) {
-      if (entry.target is RenderMetaData) {
-        RenderMetaData renderMetaData = entry.target;
-        if (renderMetaData.metaData is DragTargetState)
-          return renderMetaData.metaData;
-      }
-    }
-    return null;
-  }
-
-  void didPop([DragEndKind endKind]) {
-    if (_activeTarget != null) {
-      if (endKind == DragEndKind.dropped && _activeTargetWillAcceptDrop)
-        _activeTarget.didDrop(data);
-      else
-        _activeTarget.didLeave(data);
-    }
-    _activeTarget = null;
-    _activeTargetWillAcceptDrop = false;
-    if (onDragFinished != null)
-      onDragFinished();
-    super.didPop(endKind);
-  }
-
-  bool get ephemeral => true;
-  bool get modal => false;
-
-  Duration get transitionDuration => const Duration();
-  bool get opaque => false;
-  Widget build(Key key, NavigatorState navigator) {
-    return new Positioned(
-      left: _lastOffset.dx,
-      top: _lastOffset.dy,
-      child: new IgnorePointer(
-        child: new Opacity(
-          opacity: 0.5,
-          child: feedback
-        )
-      )
-    );
-  }
-}

packages/flutter/lib/src/fn3/drawer.dart

-// 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.
-
-import 'dart:async';
-
-import 'package:sky/animation.dart';
-import 'package:sky/material.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/gesture_detector.dart';
-import 'package:sky/src/fn3/navigator.dart';
-import 'package:sky/src/fn3/scrollable.dart';
-import 'package:sky/src/fn3/theme.dart';
-import 'package:sky/src/fn3/transitions.dart';
-
-// TODO(eseidel): Draw width should vary based on device size:
-// http://www.google.com/design/spec/layout/structure.html#structure-side-nav
-
-// Mobile:
-// Width = Screen width − 56 dp
-// Maximum width: 320dp
-// Maximum width applies only when using a left nav. When using a right nav,
-// the panel can cover the full width of the screen.
-
-// Desktop/Tablet:
-// Maximum width for a left nav is 400dp.
-// The right nav can vary depending on content.
-
-const double _kWidth = 304.0;
-const double _kMinFlingVelocity = 365.0;
-const double _kFlingVelocityScale = 1.0 / 300.0;
-const Duration _kBaseSettleDuration = const Duration(milliseconds: 246);
-const Duration _kThemeChangeDuration = const Duration(milliseconds: 200);
-const Point _kOpenPosition = Point.origin;
-const Point _kClosedPosition = const Point(-_kWidth, 0.0);
-
-typedef void DrawerDismissedCallback();
-
-class Drawer extends StatefulComponent {
-  Drawer({
-    Key key,
-    this.children,
-    this.showing: false,
-    this.level: 0,
-    this.onDismissed,
-    this.navigator
-  }) : super(key: key);
-
-  final List<Widget> children;
-  final bool showing;
-  final int level;
-  final DrawerDismissedCallback onDismissed;
-  final NavigatorState navigator;
-
-  DrawerState createState() => new DrawerState();
-}
-
-class DrawerState extends State<Drawer> {
-  void initState() {
-    super.initState();
-    _performance = new AnimationPerformance(duration: _kBaseSettleDuration);
-    _performance.addStatusListener((AnimationStatus status) {
-      if (status == AnimationStatus.dismissed)
-        _handleDismissed();
-    });
-    // Use a spring force for animating the drawer. We can't use curves for
-    // this because we need a linear curve in order to track the user's finger
-    // while dragging.
-    _performance.attachedForce = kDefaultSpringForce;
-    if (config.navigator != null) {
-      // TODO(ianh): This is crazy. We should convert drawer to use a pattern like openDialog().
-      // https://github.com/domokit/sky_engine/pull/1186
-      scheduleMicrotask(() {
-        config.navigator.pushState(this, (_) => _performance.reverse());
-      });
-    }
-    _performance.play(_direction);
-  }
-
-  AnimationPerformance _performance;
-
-  Direction get _direction => config.showing ? Direction.forward : Direction.reverse;
-
-  void didUpdateConfig(Drawer oldConfig) {
-    if (config.showing != oldConfig.showing)
-      _performance.play(_direction);
-  }
-
-  Widget build(BuildContext context) {
-    var mask = new GestureDetector(
-      child: new ColorTransition(
-        performance: _performance.view,
-        color: new AnimatedColorValue(Colors.transparent, end: const Color(0x7F000000)),
-        child: new Container()
-      ),
-      onTap: () {
-        _performance.reverse();
-      }
-    );
-
-    Widget content = new SlideTransition(
-      performance: _performance.view,
-      position: new AnimatedValue<Point>(_kClosedPosition, end: _kOpenPosition),
-      // TODO(abarth): Use AnimatedContainer
-      child: new Container(
-        // behavior: implicitlyAnimate(const Duration(milliseconds: 200)),
-        decoration: new BoxDecoration(
-          backgroundColor: Theme.of(context).canvasColor,
-          boxShadow: shadows[config.level]),
-        width: _kWidth,
-        child: new Block(config.children)
-      )
-    );
-
-    return new GestureDetector(
-      onHorizontalDragStart: _performance.stop,
-      onHorizontalDragUpdate: _handleDragUpdate,
-      onHorizontalDragEnd: _handleDragEnd,
-      child: new Stack([ mask, content ])
-    );
-  }
-
-  void _handleDismissed() {
-    if (config.navigator != null &&
-        config.navigator.currentRoute is RouteState &&
-        (config.navigator.currentRoute as RouteState).owner == this) // TODO(ianh): remove cast once analyzer is cleverer
-      config.navigator.pop();
-    if (config.onDismissed != null)
-      config.onDismissed();
-  }
-
-  bool get _isMostlyClosed => _performance.progress < 0.5;
-
-  void _settle() { _isMostlyClosed ? _performance.reverse() : _performance.play(); }
-
-  void _handleDragUpdate(double delta) {
-    _performance.progress += delta / _kWidth;
-  }
-
-  void _handleDragEnd(Offset velocity) {
-    if (velocity.dx.abs() >= _kMinFlingVelocity) {
-      _performance.fling(velocity: velocity.dx * _kFlingVelocityScale);
-    } else {
-      _settle();
-    }
-  }
-
-}

packages/flutter/lib/src/fn3/drawer_divider.dart

-// 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.
-
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/theme.dart';
-
-class DrawerDivider extends StatelessComponent {
-  const DrawerDivider({ Key key }) : super(key: key);
-
-  Widget build(BuildContext context) {
-    return new Container(
-      height: 0.0,
-      decoration: new BoxDecoration(
-        border: new Border(
-          bottom: new BorderSide(
-            color: Theme.of(context).dividerColor
-          )
-        )
-      ),
-      margin: const EdgeDims.symmetric(vertical: 8.0)
-    );
-  }
-}

packages/flutter/lib/src/fn3/drawer_header.dart

-// 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.
-
-import 'package:sky/material.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/theme.dart';
-
-// TODO(jackson): This class should usually render the user's
-// preferred banner image rather than a solid background
-
-class DrawerHeader extends StatelessComponent {
-  const DrawerHeader({ Key key, this.child }) : super(key: key);
-
-  final Widget child;
-
-  Widget build(BuildContext context) {
-    return new Container(
-      height: kStatusBarHeight + kMaterialDrawerHeight,
-      decoration: new BoxDecoration(
-        backgroundColor: Theme.of(context).cardColor,
-        border: const Border(
-          bottom: const BorderSide(
-            color: const Color(0xFFD1D9E1),
-            width: 1.0
-          )
-        )
-      ),
-      padding: const EdgeDims.only(bottom: 7.0),
-      margin: const EdgeDims.only(bottom: 8.0),
-      child: new Column([
-        new Flexible(child: new Container()),
-        new Container(
-          padding: const EdgeDims.symmetric(horizontal: 16.0),
-          child: new DefaultTextStyle(
-            style: Theme.of(context).text.body2,
-            child: child
-          )
-        )]
-      )
-    );
-  }
-}

packages/flutter/lib/src/fn3/drawer_item.dart

-// 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.
-
-import 'dart:sky' as sky;
-
-import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
-import 'package:sky/painting.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/button_state.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/gesture_detector.dart';
-import 'package:sky/src/fn3/icon.dart';
-import 'package:sky/src/fn3/ink_well.dart';
-import 'package:sky/src/fn3/theme.dart';
-
-class DrawerItem extends StatefulComponent {
-  const DrawerItem({ Key key, this.icon, this.child, this.onPressed, this.selected: false })
-    : super(key: key);
-
-  final String icon;
-  final Widget child;
-  final GestureTapListener onPressed;
-  final bool selected;
-
-  DrawerItemState createState() => new DrawerItemState();
-}
-
-class DrawerItemState extends ButtonState<DrawerItem> {
-  TextStyle _getTextStyle(ThemeData themeData) {
-    TextStyle result = themeData.text.body2;
-    if (config.selected)
-      result = result.copyWith(color: themeData.primaryColor);
-    return result;
-  }
-
-  Color _getBackgroundColor(ThemeData themeData) {
-    if (highlight)
-      return themeData.highlightColor;
-    if (config.selected)
-      return themeData.selectedColor;
-    return Colors.transparent;
-  }
-
-  sky.ColorFilter _getColorFilter(ThemeData themeData) {
-    if (config.selected)
-      return new sky.ColorFilter.mode(themeData.primaryColor, sky.TransferMode.srcATop);
-    return new sky.ColorFilter.mode(const Color(0x73000000), sky.TransferMode.dstIn);
-  }
-
-  Widget buildContent(BuildContext context) {
-    ThemeData themeData = Theme.of(context);
-
-    List<Widget> flexChildren = new List<Widget>();
-    if (config.icon != null) {
-      flexChildren.add(
-        new Padding(
-          padding: const EdgeDims.symmetric(horizontal: 16.0),
-          child: new Icon(
-            type: config.icon,
-            size: 24,
-            colorFilter: _getColorFilter(themeData))
-        )
-      );
-    }
-    flexChildren.add(
-      new Flexible(
-        child: new Padding(
-          padding: const EdgeDims.symmetric(horizontal: 16.0),
-          child: new DefaultTextStyle(
-            style: _getTextStyle(themeData),
-            child: config.child
-          )
-        )
-      )
-    );
-
-    return new GestureDetector(
-      onTap: config.onPressed,
-      child: new Container(
-        height: 48.0,
-        decoration: new BoxDecoration(backgroundColor: _getBackgroundColor(themeData)),
-        child: new InkWell(
-          child: new Row(flexChildren)
-        )
-      )
-    );
-  }
-}

packages/flutter/lib/src/fn3/editable_text.dart

-// 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.
-
-import 'dart:async';
-
-import 'package:mojo_services/keyboard/keyboard.mojom.dart';
-import 'package:sky/painting.dart';
-import 'package:sky/rendering.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-
-const _kCursorBlinkPeriod = 500; // milliseconds
-
-typedef void StringUpdated();
-
-class TextRange {
-  final int start;
-  final int end;
-
-  TextRange({this.start, this.end});
-  TextRange.collapsed(int position)
-      : start = position,
-        end = position;
-  const TextRange.empty()
-      : start = -1,
-        end = -1;
-
-  bool get isValid => start >= 0 && end >= 0;
-  bool get isCollapsed => start == end;
-}
-
-class EditableString implements KeyboardClient {
-  String text;
-  TextRange composing = const TextRange.empty();
-  TextRange selection = const TextRange.empty();
-
-  final StringUpdated onUpdated;
-
-  KeyboardClientStub stub;
-
-  EditableString({this.text: '', this.onUpdated}) {
-    stub = new KeyboardClientStub.unbound()..impl = this;
-  }
-
-  String textBefore(TextRange range) {
-    return text.substring(0, range.start);
-  }
-
-  String textAfter(TextRange range) {
-    return text.substring(range.end);
-  }
-
-  String textInside(TextRange range) {
-    return text.substring(range.start, range.end);
-  }
-
-  void _delete(TextRange range) {
-    if (range.isCollapsed || !range.isValid) return;
-    text = textBefore(range) + textAfter(range);
-  }
-
-  TextRange _append(String newText) {
-    int start = text.length;
-    text += newText;
-    return new TextRange(start: start, end: start + newText.length);
-  }
-
-  TextRange _replace(TextRange range, String newText) {
-    assert(range.isValid);
-
-    String before = textBefore(range);
-    String after = textAfter(range);
-
-    text = before + newText + after;
-    return new TextRange(
-        start: before.length, end: before.length + newText.length);
-  }
-
-  TextRange _replaceOrAppend(TextRange range, String newText) {
-    if (!range.isValid) return _append(newText);
-    return _replace(range, newText);
-  }
-
-  void commitCompletion(CompletionData completion) {
-    // TODO(abarth): Not implemented.
-  }
-
-  void commitCorrection(CorrectionData correction) {
-    // TODO(abarth): Not implemented.
-  }
-
-  void commitText(String text, int newCursorPosition) {
-    // TODO(abarth): Why is |newCursorPosition| always 1?
-    TextRange committedRange = _replaceOrAppend(composing, text);
-    selection = new TextRange.collapsed(committedRange.end);
-    composing = const TextRange.empty();
-    onUpdated();
-  }
-
-  void deleteSurroundingText(int beforeLength, int afterLength) {
-    TextRange beforeRange = new TextRange(
-        start: selection.start - beforeLength, end: selection.start);
-    TextRange afterRange =
-        new TextRange(start: selection.end, end: selection.end + afterLength);
-    _delete(afterRange);
-    _delete(beforeRange);
-    selection = new TextRange(
-        start: selection.start - beforeLength,
-        end: selection.end - beforeLength);
-    onUpdated();
-  }
-
-  void setComposingRegion(int start, int end) {
-    composing = new TextRange(start: start, end: end);
-    onUpdated();
-  }
-
-  void setComposingText(String text, int newCursorPosition) {
-    // TODO(abarth): Why is |newCursorPosition| always 1?
-    composing = _replaceOrAppend(composing, text);
-    selection = new TextRange.collapsed(composing.end);
-    onUpdated();
-  }
-
-  void setSelection(int start, int end) {
-    selection = new TextRange(start: start, end: end);
-    onUpdated();
-  }
-}
-
-class EditableText extends StatefulComponent {
-  EditableText({
-    Key key,
-    this.value,
-    this.focused: false,
-    this.style,
-    this.cursorColor,
-    this.onContentSizeChanged,
-    this.scrollOffset
-  }) : super(key: key);
-
-  final EditableString value;
-  final bool focused;
-  final TextStyle style;
-  final Color cursorColor;
-  final SizeChangedCallback onContentSizeChanged;
-  final Offset scrollOffset;
-
-  EditableTextState createState() => new EditableTextState();
-}
-
-class EditableTextState extends State<EditableText> {
-  Timer _cursorTimer;
-  bool _showCursor = false;
-
-  /// Whether the blinking cursor is visible (exposed for testing).
-  bool get test_showCursor => _showCursor;
-
-  /// The cursor blink interval (exposed for testing).
-  Duration get test_cursorBlinkPeriod =>
-      new Duration(milliseconds: _kCursorBlinkPeriod);
-
-  void _cursorTick(Timer timer) {
-    setState(() {
-      _showCursor = !_showCursor;
-    });
-  }
-
-  void _startCursorTimer() {
-    _showCursor = true;
-    _cursorTimer = new Timer.periodic(
-      new Duration(milliseconds: _kCursorBlinkPeriod), _cursorTick);
-  }
-
-  void dispose() {
-    if (_cursorTimer != null)
-      _stopCursorTimer();
-    super.dispose();
-  }
-
-  void _stopCursorTimer() {
-    _cursorTimer.cancel();
-    _cursorTimer = null;
-    _showCursor = false;
-  }
-
-  Widget build(BuildContext context) {
-    assert(config.style != null);
-    assert(config.focused != null);
-    assert(config.cursorColor != null);
-
-    if (config.focused && _cursorTimer == null)
-      _startCursorTimer();
-    else if (!config.focused && _cursorTimer != null)
-      _stopCursorTimer();
-
-    return new SizedBox(
-      width: double.INFINITY,
-      child: new _EditableTextWidget(
-        value: config.value,
-        style: config.style,
-        cursorColor: config.cursorColor,
-        showCursor: _showCursor,
-        onContentSizeChanged: config.onContentSizeChanged,
-        scrollOffset: config.scrollOffset
-      )
-    );
-  }
-}
-
-class _EditableTextWidget extends LeafRenderObjectWidget {
-  _EditableTextWidget({
-    Key key,
-    this.value,
-    this.style,
-    this.cursorColor,
-    this.showCursor,
-    this.onContentSizeChanged,
-    this.scrollOffset
-  }) : super(key: key);
-
-  final EditableString value;
-  final TextStyle style;
-  final Color cursorColor;
-  final bool showCursor;
-  final SizeChangedCallback onContentSizeChanged;
-  final Offset scrollOffset;
-
-  RenderEditableParagraph createRenderObject() {
-    return new RenderEditableParagraph(
-      text: _buildTextSpan(),
-      cursorColor: cursorColor,
-      showCursor: showCursor,
-      onContentSizeChanged: onContentSizeChanged,
-      scrollOffset: scrollOffset
-    );
-  }
-
-  void updateRenderObject(RenderEditableParagraph renderObject,
-                          _EditableTextWidget oldWidget) {
-    renderObject.text = _buildTextSpan();
-    renderObject.cursorColor = cursorColor;
-    renderObject.showCursor = showCursor;
-    renderObject.onContentSizeChanged = onContentSizeChanged;
-    renderObject.scrollOffset = scrollOffset;
-  }
-
-  // Construct a TextSpan that renders the EditableString using the chosen style.
-  TextSpan _buildTextSpan() {
-    if (value.composing.isValid) {
-      TextStyle composingStyle = style.merge(
-        const TextStyle(decoration: underline)
-      );
-
-      return new StyledTextSpan(style, [
-        new PlainTextSpan(value.textBefore(value.composing)),
-        new StyledTextSpan(composingStyle, [
-          new PlainTextSpan(value.textInside(value.composing))
-        ]),
-        new PlainTextSpan(value.textAfter(value.composing))
-      ]);
-    }
-
-    return new StyledTextSpan(style, [
-      new PlainTextSpan(value.text)
-    ]);
-  }
-}

packages/flutter/lib/src/fn3/flat_button.dart

-// 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.
-
-import 'package:sky/material.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/material_button.dart';
-import 'package:sky/src/fn3/theme.dart';
-
-class FlatButton extends MaterialButton {
-  FlatButton({
-    Key key,
-    Widget child,
-    bool enabled: true,
-    Function onPressed
-  }) : super(key: key,
-             child: child,
-             enabled: enabled,
-             onPressed: onPressed);
-
-  FlatButtonState createState() => new FlatButtonState();
-}
-
-class FlatButtonState extends MaterialButtonState<FlatButton> {
-  Color getColor(BuildContext context) {
-    if (!config.enabled || !highlight)
-      return null;
-    switch (Theme.of(context).brightness) {
-      case ThemeBrightness.light:
-        return Colors.grey[400];
-      case ThemeBrightness.dark:
-        return Colors.grey[200];
-    }
-  }
-
-  int get level => 0;
-}

packages/flutter/lib/src/fn3/floating_action_button.dart

-// 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.
-
-import 'package:sky/gestures.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/button_state.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/gesture_detector.dart';
-import 'package:sky/src/fn3/icon.dart';
-import 'package:sky/src/fn3/ink_well.dart';
-import 'package:sky/src/fn3/material.dart';
-import 'package:sky/src/fn3/theme.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
-const double _kSize = 56.0;
-
-class FloatingActionButton extends StatefulComponent {
-  const FloatingActionButton({
-    Key key,
-    this.child,
-    this.backgroundColor,
-    this.onPressed
-  }) : super(key: key);
-
-  final Widget child;
-  final Color backgroundColor;
-  final GestureTapListener onPressed;
-
-  FloatingActionButtonState createState() => new FloatingActionButtonState();
-}
-
-class FloatingActionButtonState extends ButtonState<FloatingActionButton> {
-  Widget buildContent(BuildContext context) {
-    IconThemeColor iconThemeColor = IconThemeColor.white;
-    Color materialColor = config.backgroundColor;
-    if (materialColor == null) {
-      ThemeData themeData = Theme.of(context);
-      materialColor = themeData.accentColor;
-      iconThemeColor = themeData.accentColorBrightness == ThemeBrightness.dark ? IconThemeColor.white : IconThemeColor.black;
-    }
-
-    return new Material(
-      color: materialColor,
-      type: MaterialType.circle,
-      level: highlight ? 3 : 2,
-      child: new ClipOval(
-        child: new GestureDetector(
-          onTap: config.onPressed,
-          child: new Container(
-            width: _kSize,
-            height: _kSize,
-            child: new InkWell(
-              child: new Center(
-                child: new IconTheme(
-                  data: new IconThemeData(color: iconThemeColor),
-                  child: config.child
-                )
-              )
-            )
-          )
-        )
-      )
-    );
-  }
-}

packages/flutter/lib/src/fn3/focus.dart

-// 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.
-
-import 'package:sky/src/fn3/framework.dart';
-
-typedef void FocusChanged(GlobalKey key);
-
-// _noFocusedScope is used by Focus to track the case where none of the Focus
-// component's subscopes (e.g. dialogs) are focused. This is distinct from the
-// focused scope being null, which means that we haven't yet decided which scope
-// is focused and whichever is the first scope to ask for focus will get it.
-final GlobalKey _noFocusedScope = new GlobalKey();
-
-class _FocusScope extends InheritedWidget {
-  _FocusScope({
-    Key key,
-    this.focusState,
-    this.scopeFocused: true, // are we focused in our ancestor scope?
-    this.focusedScope, // which of our descendant scopes is focused, if any?
-    this.focusedWidget,
-    Widget child
-  }) : super(key: key, child: child);
-
-  final bool scopeFocused;
-  final FocusState focusState;
-
-  // These are mutable because we implicitly change them when they're null in
-  // certain cases, basically pretending retroactively that we were constructed
-  // with the right keys.
-  GlobalKey focusedScope;
-  GlobalKey focusedWidget;
-
-  // The ...IfUnset() methods don't need to notify descendants because by
-  // definition they are only going to make a change the very first time that
-  // our state is checked.
-
-  void _setFocusedWidgetIfUnset(GlobalKey key) {
-    focusState._setFocusedWidgetIfUnset(key);
-    focusedWidget = focusState._focusedWidget;
-    focusedScope = focusState._focusedScope == _noFocusedScope ? null : focusState._focusedScope;
-  }
-
-  void _setFocusedScopeIfUnset(GlobalKey key) {
-    focusState._setFocusedScopeIfUnset(key);
-    assert(focusedWidget == focusState._focusedWidget);
-    focusedScope = focusState._focusedScope == _noFocusedScope ? null : focusState._focusedScope;
-  }
-
-  bool updateShouldNotify(_FocusScope oldWidget) {
-    if (scopeFocused != oldWidget.scopeFocused)
-      return true;
-    if (!scopeFocused)
-      return false;
-    if (focusedScope != oldWidget.focusedScope)
-      return true;
-    if (focusedScope != null)
-      return false;
-    if (focusedWidget != oldWidget.focusedWidget)
-      return true;
-    return false;
-  }
-
-}
-
-class Focus extends StatefulComponent {
-  Focus({
-    GlobalKey key, // key is required if this is a nested Focus scope
-    this.autofocus: false,
-    this.child
-  }) : super(key: key) {
-    assert(!autofocus || key != null);
-  }
-
-  final bool autofocus;
-  final Widget child;
-
-  FocusState createState() => new FocusState();
-}
-
-class FocusState extends State<Focus> {
-  GlobalKey _focusedWidget; // when null, the first component to ask if it's focused will get the focus
-  GlobalKey _currentlyRegisteredWidgetRemovalListenerKey;
-
-  void _setFocusedWidget(GlobalKey key) {
-    setState(() {
-      _focusedWidget = key;
-      if (_focusedScope == null)
-        _focusedScope = _noFocusedScope;
-    });
-    _updateWidgetRemovalListener(key);
-  }
-
-  void _setFocusedWidgetIfUnset(GlobalKey key) {
-    if (_focusedWidget == null && (_focusedScope == null || _focusedScope == _noFocusedScope)) {
-      _focusedWidget = key;
-      _focusedScope = _noFocusedScope;
-      _updateWidgetRemovalListener(key);
-    }
-  }
-
-  void _handleWidgetRemoved(GlobalKey key) {
-    assert(_focusedWidget == key);
-    _updateWidgetRemovalListener(null);
-    setState(() {
-      _focusedWidget = null;
-    });
-  }
-
-  void _updateWidgetRemovalListener(GlobalKey key) {
-    if (_currentlyRegisteredWidgetRemovalListenerKey != key) {
-      if (_currentlyRegisteredWidgetRemovalListenerKey != null)
-        GlobalKey.unregisterRemoveListener(_currentlyRegisteredWidgetRemovalListenerKey, _handleWidgetRemoved);
-      if (key != null)
-        GlobalKey.registerRemoveListener(key, _handleWidgetRemoved);
-      _currentlyRegisteredWidgetRemovalListenerKey = key;
-    }
-  }
-
-  GlobalKey _focusedScope; // when null, the first scope to ask if it's focused will get the focus
-  GlobalKey _currentlyRegisteredScopeRemovalListenerKey;
-
-  void _setFocusedScope(GlobalKey key) {
-    setState(() {
-      _focusedScope = key;
-    });
-    _updateScopeRemovalListener(key);
-  }
-
-  void _setFocusedScopeIfUnset(GlobalKey key) {
-    if (_focusedScope == null) {
-      _focusedScope = key;
-      _updateScopeRemovalListener(key);
-    }
-  }
-
-  void _scopeRemoved(GlobalKey key) {
-    assert(_focusedScope == key);
-    _currentlyRegisteredScopeRemovalListenerKey = null;
-    setState(() {
-      _focusedScope = null;
-    });
-  }
-
-  void _updateScopeRemovalListener(GlobalKey key) {
-    if (_currentlyRegisteredScopeRemovalListenerKey != key) {
-      if (_currentlyRegisteredScopeRemovalListenerKey != null)
-        GlobalKey.unregisterRemoveListener(_currentlyRegisteredScopeRemovalListenerKey, _scopeRemoved);
-      if (key != null)
-        GlobalKey.registerRemoveListener(key, _scopeRemoved);
-      _currentlyRegisteredScopeRemovalListenerKey = key;
-    }
-  }
-
-  void initState() {
-    super.initState();
-    if (config.autofocus)
-      FocusState._moveScopeTo(context, config);
-    _updateWidgetRemovalListener(_focusedWidget);
-    _updateScopeRemovalListener(_focusedScope);
-  }
-
-  void dispose() {
-    _updateWidgetRemovalListener(null);
-    _updateScopeRemovalListener(null);
-    super.dispose();
-  }
-
-  Widget build(BuildContext context) {
-    return new _FocusScope(
-      focusState: this,
-      scopeFocused: FocusState._atScope(context, config),
-      focusedScope: _focusedScope == _noFocusedScope ? null : _focusedScope,
-      focusedWidget: _focusedWidget,
-      child: config.child
-    );
-  }
-
-  static bool at(BuildContext context, Widget widget, { bool autofocus: true }) {
-    assert(widget != null);
-    assert(widget.key is GlobalKey);
-    _FocusScope focusScope = context.inheritedWidgetOfType(_FocusScope);
-    if (focusScope != null) {
-      if (autofocus)
-        focusScope._setFocusedWidgetIfUnset(widget.key);
-      return focusScope.scopeFocused &&
-             focusScope.focusedScope == null &&
-             focusScope.focusedWidget == widget.key;
-    }
-    return true;
-  }
-
-  static bool _atScope(BuildContext context, Widget widget, { bool autofocus: true }) {
-    assert(widget != null);
-    _FocusScope focusScope = context.inheritedWidgetOfType(_FocusScope);
-    if (focusScope != null) {
-      if (autofocus)
-        focusScope._setFocusedScopeIfUnset(widget.key);
-      assert(widget.key != null);
-      return focusScope.scopeFocused &&
-             focusScope.focusedScope == widget.key;
-    }
-    return true;
-  }
-
-  // Don't call moveTo() from your build() function, it's intended to be called
-  // from event listeners, e.g. in response to a finger tap or tab key.
-
-  static void moveTo(BuildContext context, Widget widget) {
-    assert(widget != null);
-    assert(widget.key is GlobalKey);
-    _FocusScope focusScope = context.inheritedWidgetOfType(_FocusScope);
-    if (focusScope != null)
-      focusScope.focusState._setFocusedWidget(widget.key);
-  }
-
-  static void _moveScopeTo(BuildContext context, Focus component) {
-    assert(component != null);
-    assert(component.key != null);
-    _FocusScope focusScope = context.inheritedWidgetOfType(_FocusScope);
-    if (focusScope != null)
-      focusScope.focusState._setFocusedScope(component.key);
-  }
-}

packages/flutter/lib/src/fn3/gesture_detector.dart

-// 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.
-
-import 'dart:sky' as sky;
-
-import 'package:sky/gestures.dart';
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/rendering/binding.dart';
-
-class GestureDetector extends StatefulComponent {
-  const GestureDetector({
-    Key key,
-    this.child,
-    this.onTap,
-    this.onShowPress,
-    this.onLongPress,
-    this.onVerticalDragStart,
-    this.onVerticalDragUpdate,
-    this.onVerticalDragEnd,
-    this.onHorizontalDragStart,
-    this.onHorizontalDragUpdate,
-    this.onHorizontalDragEnd,
-    this.onPanStart,
-    this.onPanUpdate,
-    this.onPanEnd,
-    this.onScaleStart,
-    this.onScaleUpdate,
-    this.onScaleEnd
-  }) : super(key: key);
-
-  final Widget child;
-  final GestureTapListener onTap;
-  final GestureShowPressListener onShowPress;
-  final GestureLongPressListener onLongPress;
-
-  final GestureDragStartCallback onVerticalDragStart;
-  final GestureDragUpdateCallback onVerticalDragUpdate;
-  final GestureDragEndCallback onVerticalDragEnd;
-
-  final GestureDragStartCallback onHorizontalDragStart;
-  final GestureDragUpdateCallback onHorizontalDragUpdate;
-  final GestureDragEndCallback onHorizontalDragEnd;
-
-  final GesturePanStartCallback onPanStart;
-  final GesturePanUpdateCallback onPanUpdate;
-  final GesturePanEndCallback onPanEnd;
-
-  final GestureScaleStartCallback onScaleStart;
-  final GestureScaleUpdateCallback onScaleUpdate;
-  final GestureScaleEndCallback onScaleEnd;
-
-  GestureDetectorState createState() => new GestureDetectorState();
-}
-
-class GestureDetectorState extends State<GestureDetector> {
-  void initState() {
-    super.initState();
-    didUpdateConfig(null);
-  }
-
-  final PointerRouter _router = FlutterBinding.instance.pointerRouter;
-
-  TapGestureRecognizer _tap;
-  TapGestureRecognizer _ensureTap() {
-    if (_tap == null)
-      _tap = new TapGestureRecognizer(router: _router);
-    return _tap;
-  }
-
-  ShowPressGestureRecognizer _showPress;
-  ShowPressGestureRecognizer _ensureShowPress() {
-    if (_showPress == null)
-      _showPress = new ShowPressGestureRecognizer(router: _router);
-    return _showPress;
-  }
-
-  LongPressGestureRecognizer _longPress;
-  LongPressGestureRecognizer _ensureLongPress() {
-    if (_longPress == null)
-      _longPress = new LongPressGestureRecognizer(router: _router);
-    return _longPress;
-  }
-
-  VerticalDragGestureRecognizer _verticalDrag;
-  VerticalDragGestureRecognizer _ensureVerticalDrag() {
-    if (_verticalDrag == null)
-      _verticalDrag = new VerticalDragGestureRecognizer(router: _router);
-    return _verticalDrag;
-  }
-
-  HorizontalDragGestureRecognizer _horizontalDrag;
-  HorizontalDragGestureRecognizer _ensureHorizontalDrag() {
-    if (_horizontalDrag == null)
-      _horizontalDrag = new HorizontalDragGestureRecognizer(router: _router);
-    return _horizontalDrag;
-  }
-
-  PanGestureRecognizer _pan;
-  PanGestureRecognizer _ensurePan() {
-    assert(_scale == null);  // Scale is a superset of pan; just use scale
-    if (_pan == null)
-      _pan = new PanGestureRecognizer(router: _router);
-    return _pan;
-  }
-
-  ScaleGestureRecognizer _scale;
-  ScaleGestureRecognizer _ensureScale() {
-    assert(_pan == null);  // Scale is a superset of pan; just use scale
-    if (_scale == null)
-      _scale = new ScaleGestureRecognizer(router: _router);
-    return _scale;
-  }
-
-  void dispose() {
-    _tap = _ensureDisposed(_tap);
-    _showPress = _ensureDisposed(_showPress);
-    _longPress = _ensureDisposed(_longPress);
-    _verticalDrag = _ensureDisposed(_verticalDrag);
-    _horizontalDrag = _ensureDisposed(_horizontalDrag);
-    _pan = _ensureDisposed(_pan);
-    _scale = _ensureDisposed(_scale);
-    super.dispose();
-  }
-
-  void didUpdateConfig(GestureDetector oldConfig) {
-    _syncTap();
-    _syncShowPress();
-    _syncLongPress();
-    _syncVerticalDrag();
-    _syncHorizontalDrag();
-    _syncPan();
-    _syncScale();
-  }
-
-  void _syncTap() {
-    if (config.onTap == null)
-      _tap = _ensureDisposed(_tap);
-    else
-      _ensureTap().onTap = config.onTap;
-  }
-
-  void _syncShowPress() {
-    if (config.onShowPress == null)
-      _showPress = _ensureDisposed(_showPress);
-    else
-      _ensureShowPress().onShowPress = config.onShowPress;
-  }
-
-  void _syncLongPress() {
-    if (config.onLongPress == null)
-      _longPress = _ensureDisposed(_longPress);
-    else
-      _ensureLongPress().onLongPress = config.onLongPress;
-  }
-
-  void _syncVerticalDrag() {
-    if (config.onVerticalDragStart == null && config.onVerticalDragUpdate == null && config.onVerticalDragEnd == null) {
-      _verticalDrag = _ensureDisposed(_verticalDrag);
-    } else {
-      _ensureVerticalDrag()
-        ..onStart = config.onVerticalDragStart
-        ..onUpdate = config.onVerticalDragUpdate
-        ..onEnd = config.onVerticalDragEnd;
-    }
-  }
-
-  void _syncHorizontalDrag() {
-    if (config.onHorizontalDragStart == null && config.onHorizontalDragUpdate == null && config.onHorizontalDragEnd == null) {
-      _horizontalDrag = _ensureDisposed(_horizontalDrag);
-    } else {
-      _ensureHorizontalDrag()
-        ..onStart = config.onHorizontalDragStart
-        ..onUpdate = config.onHorizontalDragUpdate
-        ..onEnd = config.onHorizontalDragEnd;
-    }
-  }
-
-  void _syncPan() {
-    if (config.onPanStart == null && config.onPanUpdate == null && config.onPanEnd == null) {
-      _pan = _ensureDisposed(_pan);
-    } else {
-      _ensurePan()
-        ..onStart = config.onPanStart
-        ..onUpdate = config.onPanUpdate
-        ..onEnd = config.onPanEnd;
-    }
-  }
-
-  void _syncScale() {
-    if (config.onScaleStart == null && config.onScaleUpdate == null && config.onScaleEnd == null) {
-      _scale = _ensureDisposed(_pan);
-    } else {
-      _ensureScale()
-        ..onStart = config.onScaleStart
-        ..onUpdate = config.onScaleUpdate
-        ..onEnd = config.onScaleEnd;
-    }
-  }
-
-  GestureRecognizer _ensureDisposed(GestureRecognizer recognizer) {
-    recognizer?.dispose();
-    return null;
-  }
-
-  void _handlePointerDown(sky.PointerEvent event) {
-    if (_tap != null)
-      _tap.addPointer(event);
-    if (_showPress != null)
-      _showPress.addPointer(event);
-    if (_longPress != null)
-      _longPress.addPointer(event);
-    if (_verticalDrag != null)
-      _verticalDrag.addPointer(event);
-    if (_horizontalDrag != null)
-      _horizontalDrag.addPointer(event);
-    if (_pan != null)
-      _pan.addPointer(event);
-    if (_scale != null)
-      _scale.addPointer(event);
-  }
-
-  Widget build(BuildContext context) {
-    return new Listener(
-      onPointerDown: _handlePointerDown,
-      child: config.child
-    );
-  }
-}

packages/flutter/lib/src/fn3/icon_button.dart

-// 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.
-
-import 'dart:sky' as sky;
-
-import 'package:sky/src/fn3/basic.dart';
-import 'package:sky/src/fn3/icon.dart';
-import 'package:sky/src/fn3/framework.dart';
-import 'package:sky/src/fn3/gesture_detector.dart';
-
-class IconButton extends StatelessComponent {
-  const IconButton({ Key key, this.icon, this.onPressed, this.color }) : super(key: key);
-
-  final String icon;
-  final Function onPressed;
-  final Color color;
-
-  Widget build(BuildContext context) {
-    Widget child = new Icon(type: icon, size: 24);
-    if (color != null) {
-      child = new ColorFilter(
-        color: color,
-        transferMode: sky.TransferMode.srcATop,
-        child: child
-      );
-    }
-    return new GestureDetector(
-      onTap: onPressed,
-      child: new Padding(
-        child: child,
-        padding: const EdgeDims.all(8.0))
-    );
-  }
-}

packages/flutter/lib/src/fn3/title.dart

-// 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.
-
-import 'package:sky/services.dart';
-import 'package:sky/src/fn3/theme.dart';
-import 'package:sky/src/fn3/framework.dart';
-
-class Title extends StatelessComponent {
-  Title({ this.title, this.child });
-
-  final Widget child;
-  final String title;
-
-  Widget build(BuildContext context) {
-    updateTaskDescription(title, Theme.of(context).primaryColor);
-    return child;
-  }
-}

packages/flutter/lib/src/fn3/binding.dart → packages/flutter/lib/src/widgets/binding.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:sky/animation.dart';
 import 'package:sky/rendering.dart';
-import 'package:sky/src/fn3/framework.dart';
+import 'package:sky/src/widgets/framework.dart';
 
 class WidgetFlutterBinding extends FlutterBinding {