diff --git a/packages/flutter/lib/animation.dart b/packages/flutter/lib/animation.dart index 05fcbfee97..63719215e7 100644 --- a/packages/flutter/lib/animation.dart +++ b/packages/flutter/lib/animation.dart @@ -13,6 +13,5 @@ export 'src/animation/animations.dart'; export 'src/animation/curves.dart'; export 'src/animation/forces.dart'; export 'src/animation/listener_helpers.dart'; -export 'src/animation/scroll_behavior.dart'; export 'src/animation/ticker.dart'; export 'src/animation/tween.dart'; diff --git a/packages/flutter/lib/src/material/input.dart b/packages/flutter/lib/src/material/input.dart index f046d6d3e1..bb44f698ab 100644 --- a/packages/flutter/lib/src/material/input.dart +++ b/packages/flutter/lib/src/material/input.dart @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:flutter/animation.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/flutter/lib/src/widgets/pageable_list.dart b/packages/flutter/lib/src/widgets/pageable_list.dart index 1b627df9fe..cc0b8e684d 100644 --- a/packages/flutter/lib/src/widgets/pageable_list.dart +++ b/packages/flutter/lib/src/widgets/pageable_list.dart @@ -10,6 +10,7 @@ import 'package:flutter/rendering.dart'; import 'basic.dart'; import 'framework.dart'; +import 'scroll_behavior.dart'; import 'scrollable.dart'; import 'virtual_viewport.dart'; diff --git a/packages/flutter/lib/src/animation/scroll_behavior.dart b/packages/flutter/lib/src/widgets/scroll_behavior.dart similarity index 100% rename from packages/flutter/lib/src/animation/scroll_behavior.dart rename to packages/flutter/lib/src/widgets/scroll_behavior.dart diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index 4f152a62e2..cecd3f4fa6 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -18,6 +18,7 @@ import 'homogeneous_viewport.dart'; import 'mixed_viewport.dart'; import 'notification_listener.dart'; import 'page_storage.dart'; +import 'scroll_behavior.dart'; // The gesture velocity properties are pixels/second, config min,max limits are pixels/ms const double _kMillisecondsPerSecond = 1000.0; diff --git a/packages/flutter/lib/src/widgets/scrollable_grid.dart b/packages/flutter/lib/src/widgets/scrollable_grid.dart index 740c6e60c5..04f16502a3 100644 --- a/packages/flutter/lib/src/widgets/scrollable_grid.dart +++ b/packages/flutter/lib/src/widgets/scrollable_grid.dart @@ -4,13 +4,13 @@ import 'dart:math' as math; +import 'package:flutter/rendering.dart'; + import 'framework.dart'; +import 'scroll_behavior.dart'; import 'scrollable.dart'; import 'virtual_viewport.dart'; -import 'package:flutter/animation.dart'; -import 'package:flutter/rendering.dart'; - /// A vertically scrollable grid. /// /// Requires that delegate places its children in row-major order. diff --git a/packages/flutter/lib/src/widgets/scrollable_list.dart b/packages/flutter/lib/src/widgets/scrollable_list.dart index ec00da9327..9fc21d5f1a 100644 --- a/packages/flutter/lib/src/widgets/scrollable_list.dart +++ b/packages/flutter/lib/src/widgets/scrollable_list.dart @@ -5,10 +5,10 @@ import 'dart:math' as math; import 'framework.dart'; +import 'scroll_behavior.dart'; import 'scrollable.dart'; import 'virtual_viewport.dart'; -import 'package:flutter/animation.dart'; import 'package:flutter/rendering.dart'; class ScrollableList extends Scrollable { diff --git a/packages/flutter/lib/widgets.dart b/packages/flutter/lib/widgets.dart index b7bc88167e..433442a21c 100644 --- a/packages/flutter/lib/widgets.dart +++ b/packages/flutter/lib/widgets.dart @@ -35,6 +35,7 @@ export 'src/widgets/routes.dart'; export 'src/widgets/scrollable.dart'; export 'src/widgets/scrollable_grid.dart'; export 'src/widgets/scrollable_list.dart'; +export 'src/widgets/scroll_behavior.dart'; export 'src/widgets/status_transitions.dart'; export 'src/widgets/title.dart'; export 'src/widgets/transitions.dart'; diff --git a/packages/flutter/test/widget/remember_scroll_position_test.dart b/packages/flutter/test/widget/remember_scroll_position_test.dart index a225b0733b..f37dbd42aa 100644 --- a/packages/flutter/test/widget/remember_scroll_position_test.dart +++ b/packages/flutter/test/widget/remember_scroll_position_test.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter/animation.dart'; import 'package:flutter/material.dart'; import 'package:test/test.dart';