diff --git a/packages/flutter/lib/animation.dart b/packages/flutter/lib/animation.dart index 6a8b2869b2..da4b59f347 100644 --- a/packages/flutter/lib/animation.dart +++ b/packages/flutter/lib/animation.dart @@ -7,8 +7,6 @@ /// This library includes and re-exports all Sky animation classes. library animation; -export 'package:sky/src/rendering/auto_layout.dart'; - export 'src/animation/animated_simulation.dart'; export 'src/animation/animated_value.dart'; export 'src/animation/animation_performance.dart'; diff --git a/packages/flutter/lib/gestures.dart b/packages/flutter/lib/gestures.dart new file mode 100644 index 0000000000..3b47c94248 --- /dev/null +++ b/packages/flutter/lib/gestures.dart @@ -0,0 +1,16 @@ +// 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. + +/// The Sky gesture recognizers +library gestures; + +export 'src/gestures/arena.dart'; +export 'src/gestures/constants.dart'; +export 'src/gestures/drag.dart'; +export 'src/gestures/long_press.dart'; +export 'src/gestures/pointer_router.dart'; +export 'src/gestures/recognizer.dart'; +export 'src/gestures/scale.dart'; +export 'src/gestures/show_press.dart'; +export 'src/gestures/tap.dart'; diff --git a/packages/flutter/lib/gestures/README.md b/packages/flutter/lib/gestures/README.md deleted file mode 100644 index 27ef1d0bcc..0000000000 --- a/packages/flutter/lib/gestures/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Sky Gestures -============ - -Code for recognizing and representing user interface gestures. - -Dependencies ------------- - - * [`package:sky/base`](../base) diff --git a/packages/flutter/lib/gestures/arena.dart b/packages/flutter/lib/src/gestures/arena.dart similarity index 100% rename from packages/flutter/lib/gestures/arena.dart rename to packages/flutter/lib/src/gestures/arena.dart diff --git a/packages/flutter/lib/gestures/constants.dart b/packages/flutter/lib/src/gestures/constants.dart similarity index 100% rename from packages/flutter/lib/gestures/constants.dart rename to packages/flutter/lib/src/gestures/constants.dart diff --git a/packages/flutter/lib/gestures/drag.dart b/packages/flutter/lib/src/gestures/drag.dart similarity index 97% rename from packages/flutter/lib/gestures/drag.dart rename to packages/flutter/lib/src/gestures/drag.dart index d340d6caab..66a7ec6cf0 100644 --- a/packages/flutter/lib/gestures/drag.dart +++ b/packages/flutter/lib/src/gestures/drag.dart @@ -4,9 +4,9 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/recognizer.dart'; -import 'package:sky/gestures/constants.dart'; +import 'package:sky/src/gestures/arena.dart'; +import 'package:sky/src/gestures/recognizer.dart'; +import 'package:sky/src/gestures/constants.dart'; enum DragState { ready, diff --git a/packages/flutter/lib/gestures/long_press.dart b/packages/flutter/lib/src/gestures/long_press.dart similarity index 78% rename from packages/flutter/lib/gestures/long_press.dart rename to packages/flutter/lib/src/gestures/long_press.dart index 0cb35c5ad0..f7e280b7a7 100644 --- a/packages/flutter/lib/gestures/long_press.dart +++ b/packages/flutter/lib/src/gestures/long_press.dart @@ -4,10 +4,10 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/constants.dart'; -import 'package:sky/gestures/pointer_router.dart'; -import 'package:sky/gestures/recognizer.dart'; +import 'package:sky/src/gestures/arena.dart'; +import 'package:sky/src/gestures/constants.dart'; +import 'package:sky/src/gestures/pointer_router.dart'; +import 'package:sky/src/gestures/recognizer.dart'; typedef void GestureLongPressListener(); diff --git a/packages/flutter/lib/gestures/pointer_router.dart b/packages/flutter/lib/src/gestures/pointer_router.dart similarity index 100% rename from packages/flutter/lib/gestures/pointer_router.dart rename to packages/flutter/lib/src/gestures/pointer_router.dart diff --git a/packages/flutter/lib/gestures/recognizer.dart b/packages/flutter/lib/src/gestures/recognizer.dart similarity index 94% rename from packages/flutter/lib/gestures/recognizer.dart rename to packages/flutter/lib/src/gestures/recognizer.dart index 9fd068d825..4705e4c611 100644 --- a/packages/flutter/lib/gestures/recognizer.dart +++ b/packages/flutter/lib/src/gestures/recognizer.dart @@ -5,11 +5,11 @@ import 'dart:async'; import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/constants.dart'; -import 'package:sky/gestures/pointer_router.dart'; +import 'package:sky/src/gestures/arena.dart'; +import 'package:sky/src/gestures/constants.dart'; +import 'package:sky/src/gestures/pointer_router.dart'; -export 'package:sky/gestures/pointer_router.dart' show PointerRouter; +export 'package:sky/src/gestures/pointer_router.dart' show PointerRouter; abstract class GestureRecognizer extends GestureArenaMember { GestureRecognizer({ PointerRouter router }) : _router = router; diff --git a/packages/flutter/lib/gestures/scale.dart b/packages/flutter/lib/src/gestures/scale.dart similarity index 95% rename from packages/flutter/lib/gestures/scale.dart rename to packages/flutter/lib/src/gestures/scale.dart index 2096517625..299322b3f7 100644 --- a/packages/flutter/lib/gestures/scale.dart +++ b/packages/flutter/lib/src/gestures/scale.dart @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:math' as math; import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/recognizer.dart'; -import 'package:sky/gestures/constants.dart'; +import 'package:sky/src/gestures/arena.dart'; +import 'package:sky/src/gestures/recognizer.dart'; +import 'package:sky/src/gestures/constants.dart'; enum ScaleState { ready, diff --git a/packages/flutter/lib/gestures/show_press.dart b/packages/flutter/lib/src/gestures/show_press.dart similarity index 85% rename from packages/flutter/lib/gestures/show_press.dart rename to packages/flutter/lib/src/gestures/show_press.dart index 900a05c5fc..1f56cba4d0 100644 --- a/packages/flutter/lib/gestures/show_press.dart +++ b/packages/flutter/lib/src/gestures/show_press.dart @@ -4,9 +4,9 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/constants.dart'; -import 'package:sky/gestures/recognizer.dart'; +import 'package:sky/src/gestures/arena.dart'; +import 'package:sky/src/gestures/constants.dart'; +import 'package:sky/src/gestures/recognizer.dart'; typedef void GestureShowPressListener(); diff --git a/packages/flutter/lib/gestures/tap.dart b/packages/flutter/lib/src/gestures/tap.dart similarity index 85% rename from packages/flutter/lib/gestures/tap.dart rename to packages/flutter/lib/src/gestures/tap.dart index fad7270376..fe107b149d 100644 --- a/packages/flutter/lib/gestures/tap.dart +++ b/packages/flutter/lib/src/gestures/tap.dart @@ -4,8 +4,8 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/recognizer.dart'; +import 'package:sky/src/gestures/arena.dart'; +import 'package:sky/src/gestures/recognizer.dart'; typedef void GestureTapListener(); diff --git a/packages/flutter/lib/src/rendering/sky_binding.dart b/packages/flutter/lib/src/rendering/sky_binding.dart index ed9fa9197c..26ca62893f 100644 --- a/packages/flutter/lib/src/rendering/sky_binding.dart +++ b/packages/flutter/lib/src/rendering/sky_binding.dart @@ -5,8 +5,7 @@ import 'dart:sky' as sky; import 'package:sky/animation.dart'; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/pointer_router.dart'; +import 'package:sky/gestures.dart'; import 'package:sky/src/rendering/box.dart'; import 'package:sky/src/rendering/hit_test.dart'; import 'package:sky/src/rendering/object.dart'; diff --git a/packages/flutter/lib/src/widgets/drawer.dart b/packages/flutter/lib/src/widgets/drawer.dart index 9b43301d11..d2aca7cf7a 100644 --- a/packages/flutter/lib/src/widgets/drawer.dart +++ b/packages/flutter/lib/src/widgets/drawer.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'dart:async'; -import 'dart:sky' as sky; import 'package:sky/animation.dart'; import 'package:sky/theme/colors.dart' as colors; diff --git a/packages/flutter/lib/src/widgets/gesture_detector.dart b/packages/flutter/lib/src/widgets/gesture_detector.dart index 04307644f0..085253736a 100644 --- a/packages/flutter/lib/src/widgets/gesture_detector.dart +++ b/packages/flutter/lib/src/widgets/gesture_detector.dart @@ -4,12 +4,7 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/drag.dart'; -import 'package:sky/gestures/long_press.dart'; -import 'package:sky/gestures/scale.dart'; -import 'package:sky/gestures/recognizer.dart'; -import 'package:sky/gestures/show_press.dart'; -import 'package:sky/gestures/tap.dart'; +import 'package:sky/gestures.dart'; import 'package:sky/src/rendering/sky_binding.dart'; import 'package:sky/src/widgets/framework.dart'; diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index bb36afe500..c4d026cc1f 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -8,8 +8,7 @@ import 'dart:sky' as sky; import 'package:newton/newton.dart'; import 'package:sky/animation.dart'; -import 'package:sky/gestures/constants.dart'; -import 'package:sky/gestures/drag.dart'; +import 'package:sky/gestures.dart'; import 'package:sky/src/rendering/box.dart'; import 'package:sky/src/rendering/viewport.dart'; import 'package:sky/src/widgets/basic.dart'; diff --git a/packages/unit/test/gestures/arena_test.dart b/packages/unit/test/gestures/arena_test.dart index b0da6f4cab..f9b8c84777 100644 --- a/packages/unit/test/gestures/arena_test.dart +++ b/packages/unit/test/gestures/arena_test.dart @@ -1,4 +1,4 @@ -import 'package:sky/gestures/arena.dart'; +import 'package:sky/gestures.dart'; import 'package:test/test.dart'; typedef void GestureArenaCallback(Object key); diff --git a/packages/unit/test/gestures/long_press_test.dart b/packages/unit/test/gestures/long_press_test.dart index 4ecead1488..85995d1c58 100644 --- a/packages/unit/test/gestures/long_press_test.dart +++ b/packages/unit/test/gestures/long_press_test.dart @@ -1,8 +1,5 @@ import 'package:quiver/testing/async.dart'; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/long_press.dart'; -import 'package:sky/gestures/pointer_router.dart'; -import 'package:sky/gestures/show_press.dart'; +import 'package:sky/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/pointer_router_test.dart b/packages/unit/test/gestures/pointer_router_test.dart index 7865773657..8cedf5d2dc 100644 --- a/packages/unit/test/gestures/pointer_router_test.dart +++ b/packages/unit/test/gestures/pointer_router_test.dart @@ -1,6 +1,6 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/pointer_router.dart'; +import 'package:sky/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/scroll_test.dart b/packages/unit/test/gestures/scroll_test.dart index 38e3d47375..bee66db54b 100644 --- a/packages/unit/test/gestures/scroll_test.dart +++ b/packages/unit/test/gestures/scroll_test.dart @@ -1,9 +1,6 @@ import 'dart:sky' as sky; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/drag.dart'; -import 'package:sky/gestures/pointer_router.dart'; -import 'package:sky/gestures/tap.dart'; +import 'package:sky/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/show_press_test.dart b/packages/unit/test/gestures/show_press_test.dart index cd4078f87d..b9e1fb35ee 100644 --- a/packages/unit/test/gestures/show_press_test.dart +++ b/packages/unit/test/gestures/show_press_test.dart @@ -1,7 +1,5 @@ import 'package:quiver/testing/async.dart'; -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/pointer_router.dart'; -import 'package:sky/gestures/show_press.dart'; +import 'package:sky/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/gestures/tap_test.dart b/packages/unit/test/gestures/tap_test.dart index ffef98ebee..058e18bd1b 100644 --- a/packages/unit/test/gestures/tap_test.dart +++ b/packages/unit/test/gestures/tap_test.dart @@ -1,6 +1,4 @@ -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/pointer_router.dart'; -import 'package:sky/gestures/tap.dart'; +import 'package:sky/gestures.dart'; import 'package:test/test.dart'; import '../engine/mock_events.dart'; diff --git a/packages/unit/test/widget/set_state_test.dart b/packages/unit/test/widget/set_state_test.dart index e002d3c263..52167ff27e 100644 --- a/packages/unit/test/widget/set_state_test.dart +++ b/packages/unit/test/widget/set_state_test.dart @@ -1,6 +1,3 @@ -import 'package:sky/gestures/arena.dart'; -import 'package:sky/gestures/pointer_router.dart'; -import 'package:sky/gestures/tap.dart'; import 'package:sky/widgets.dart'; import 'package:test/test.dart'; @@ -68,8 +65,8 @@ void main() { tester.pumpFrameWithoutChange(); tester.dispatchEvent(pointer.up(), location); - + tester.pumpFrameWithoutChange(); }); -} \ No newline at end of file +} diff --git a/packages/unit/test/widget/stateful_components_test.dart b/packages/unit/test/widget/stateful_components_test.dart index 7387677b38..c0c62f55f8 100644 --- a/packages/unit/test/widget/stateful_components_test.dart +++ b/packages/unit/test/widget/stateful_components_test.dart @@ -1,4 +1,3 @@ -import 'package:sky/animation.dart'; import 'package:sky/widgets.dart'; import 'package:test/test.dart';