Trivial code changes for style in animation/ directory.
diff --git a/packages/flutter/lib/animation/animated_simulation.dart b/packages/flutter/lib/animation/animated_simulation.dart index 4e492c4..b3278e2 100644 --- a/packages/flutter/lib/animation/animated_simulation.dart +++ b/packages/flutter/lib/animation/animated_simulation.dart
@@ -33,11 +33,11 @@ _animationId = null; } + // We take the _completer into a local variable so that !isTicking + // when we actually complete the future (isTicking uses _completer + // to determine its state). Completer localCompleter = _completer; _completer = null; - - // We take the _completer into a local variable so that !isTicking when we - // actually complete the future. assert(!isTicking); localCompleter.complete(); }
diff --git a/packages/flutter/lib/animation/forces.dart b/packages/flutter/lib/animation/forces.dart index cf5f53a..6353c8a 100644 --- a/packages/flutter/lib/animation/forces.dart +++ b/packages/flutter/lib/animation/forces.dart
@@ -10,27 +10,34 @@ } class SpringForce extends Force { - SpringForce(this.spring, {this.left: 0.0, this.right: 1.0}); - - // We overshoot the target by this distance, but stop the simulation when - // the spring gets within this distance (regardless of how fast it's moving). - // This causes the spring to settle a bit faster than it otherwise would. - static final Tolerance tolerance = - new Tolerance(velocity: double.INFINITY, distance: 0.01); + SpringForce(this.spring, { this.left: 0.0, this.right: 1.0 }); final SpringDescription spring; + // Where to put the spring's resting point when releasing left or right, // respectively. final double left, right; + // We overshoot the target by this distance, but stop the simulation when + // the spring gets within this distance (regardless of how fast it's moving). + // This causes the spring to settle a bit faster than it otherwise would. + static final Tolerance tolerance = new Tolerance( + velocity: double.INFINITY, + distance: 0.01 + ); + Simulation release(double position, double velocity) { - double target = velocity < 0.0 ? - this.left - tolerance.distance : this.right + tolerance.distance; + double target = velocity < 0.0 ? this.left - tolerance.distance + : this.right + tolerance.distance; return new SpringSimulation(spring, position, target, velocity) ..tolerance = tolerance; } } -final SpringDescription _kDefaultSpringDesc = - new SpringDescription.withDampingRatio(mass: 1.0, springConstant: 500.0, ratio: 1.0); +final SpringDescription _kDefaultSpringDesc = new SpringDescription.withDampingRatio( + mass: 1.0, + springConstant: 500.0, + ratio: 1.0 +); + final SpringForce kDefaultSpringForce = new SpringForce(_kDefaultSpringDesc);