firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Scrollbehavior release() to createFlingScrollSimulation()

Browse Source
This commit is contained in:
Hans Muller 2015-09-29 11:45:18 -07:00
parent 7385641f6d
commit c3510b7d94
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/animation/scroll_behavior.dart
View File

@ -14,7 +14,7 @@ const double _kScrollDrag = 0.025;
abstract class ScrollBehavior { abstract class ScrollBehavior {
/// Called when a drag gesture ends. Returns a simulation that /// Called when a drag gesture ends. Returns a simulation that
/// propels the scrollOffset. /// propels the scrollOffset.
Simulation release(double position, double velocity) => null; Simulation createFlingScrollSimulation(double position, double velocity) => null;
/// Called when a drag gesture ends and toSnapOffset is specified. /// Called when a drag gesture ends and toSnapOffset is specified.
/// Returns an animation that ends at the snap offset. /// Returns an animation that ends at the snap offset.
@ -83,7 +83,7 @@ class UnboundedBehavior extends ExtentScrollBehavior {
UnboundedBehavior({ double contentExtent: 0.0, double containerExtent: 0.0 }) UnboundedBehavior({ double contentExtent: 0.0, double containerExtent: 0.0 })
: super(contentExtent: contentExtent, containerExtent: containerExtent); : super(contentExtent: contentExtent, containerExtent: containerExtent);
Simulation release(double position, double velocity) { Simulation createFlingScrollSimulation(double position, double velocity) {
double velocityPerSecond = velocity * 1000.0; double velocityPerSecond = velocity * 1000.0;
return new BoundedFrictionSimulation( return new BoundedFrictionSimulation(
_kScrollDrag, position, velocityPerSecond, double.NEGATIVE_INFINITY, double.INFINITY _kScrollDrag, position, velocityPerSecond, double.NEGATIVE_INFINITY, double.INFINITY
@ -133,7 +133,7 @@ class OverscrollBehavior extends BoundedBehavior {
OverscrollBehavior({ double contentExtent: 0.0, double containerExtent: 0.0 }) OverscrollBehavior({ double contentExtent: 0.0, double containerExtent: 0.0 })
: super(contentExtent: contentExtent, containerExtent: containerExtent); : super(contentExtent: contentExtent, containerExtent: containerExtent);
Simulation release(double position, double velocity) { Simulation createFlingScrollSimulation(double position, double velocity) {
return _createFlingScrollSimulation(position, velocity, minScrollOffset, maxScrollOffset); return _createFlingScrollSimulation(position, velocity, minScrollOffset, maxScrollOffset);
} }
@ -162,9 +162,9 @@ class OverscrollBehavior extends BoundedBehavior {
class OverscrollWhenScrollableBehavior extends OverscrollBehavior { class OverscrollWhenScrollableBehavior extends OverscrollBehavior {
bool get isScrollable => contentExtent > containerExtent; bool get isScrollable => contentExtent > containerExtent;
Simulation release(double position, double velocity) { Simulation createFlingScrollSimulation(double position, double velocity) {
if (isScrollable || position < minScrollOffset || position > maxScrollOffset) if (isScrollable || position < minScrollOffset || position > maxScrollOffset)
return super.release(position, velocity); return super.createFlingScrollSimulation(position, velocity);
return null; return null;
} }

4
packages/flutter/lib/src/fn3/scrollable.dart
View File

@ -137,7 +137,7 @@ abstract class ScrollableState<T extends Scrollable> extends State<T> {
_stopAnimations(); _stopAnimations();
if (velocity != null && config.snapOffsetCallback != null && _scrollOffsetIsInBounds(scrollOffset)) { if (velocity != null && config.snapOffsetCallback != null && _scrollOffsetIsInBounds(scrollOffset)) {
Simulation simulation = scrollBehavior.release(scrollOffset, velocity); Simulation simulation = scrollBehavior.createFlingScrollSimulation(scrollOffset, velocity);
if (simulation == null) if (simulation == null)
return; return;
double endScrollOffset = simulation.x(double.INFINITY); double endScrollOffset = simulation.x(double.INFINITY);
@ -152,7 +152,7 @@ abstract class ScrollableState<T extends Scrollable> extends State<T> {
} }
} }
Simulation simulation = scrollBehavior.release(scrollOffset, velocity ?? 0.0); Simulation simulation = scrollBehavior.createFlingScrollSimulation(scrollOffset, velocity ?? 0.0);
if (simulation == null) if (simulation == null)
return; return;
_toEndAnimation.start(simulation); _toEndAnimation.start(simulation);

2
packages/flutter/lib/src/widgets/tabs.dart
View File

@ -367,7 +367,7 @@ class _TabsScrollBehavior extends BoundedBehavior {
bool isScrollable = true; bool isScrollable = true;
Simulation release(double position, double velocity) { Simulation createFlingScrollSimulation(double position, double velocity) {
if (!isScrollable) if (!isScrollable)
return null; return null;