firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use parent consistently for parent animation

Browse Source 
Some of the Animation classes that we converted from performances use
the term "master" to refer to the animation upon which they're based.
This patch changes them to use the term "parent", which is consistent
with the rest of the animation classes.
This commit is contained in:
Adam Barth
2016-01-20 20:47:15 -08:00
parent bdb52ce081
commit d59da41bfc
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/flutter/lib/src/animation/animations.dart
View File

@@ -64,8 +64,8 @@ abstract class ProxyAnimatedMixin {
class ProxyAnimation extends Animation<double>
with LazyListenerMixin, LocalPerformanceListenersMixin, LocalPerformanceStatusListenersMixin {
ProxyAnimation([Animation<double> animation]) {
_masterAnimation = animation;
if (_masterAnimation == null) {
_parent = animation;
if (_parent == null) {
_status = AnimationStatus.dismissed;
_direction = AnimationDirection.forward;
_value = 0.0;
@@ -76,26 +76,26 @@ class ProxyAnimation extends Animation<double>
AnimationDirection _direction;
double _value;
Animation<double> get masterAnimation => _masterAnimation;
Animation<double> _masterAnimation;
void set masterAnimation(Animation<double> value) {
if (value == _masterAnimation)
Animation<double> get parent => _parent;
Animation<double> _parent;
void set parent(Animation<double> value) {
if (value == _parent)
return;
if (_masterAnimation != null) {
_status = _masterAnimation.status;
_direction = _masterAnimation.direction;
_value = _masterAnimation.value;
if (_parent != null) {
_status = _parent.status;
_direction = _parent.direction;
_value = _parent.value;
if (isListening)
didStopListening();
}
_masterAnimation = value;
if (_masterAnimation != null) {
_parent = value;
if (_parent != null) {
if (isListening)
didStartListening();
if (_value != _masterAnimation.value)
if (_value != _parent.value)
notifyListeners();
if (_status != _masterAnimation.status)
notifyStatusListeners(_masterAnimation.status);
if (_status != _parent.status)
notifyStatusListeners(_parent.status);
_status = null;
_direction = null;
_value = null;
@@ -103,54 +103,54 @@ class ProxyAnimation extends Animation<double>
}
void didStartListening() {
if (_masterAnimation != null) {
_masterAnimation.addListener(notifyListeners);
_masterAnimation.addStatusListener(notifyStatusListeners);
if (_parent != null) {
_parent.addListener(notifyListeners);
_parent.addStatusListener(notifyStatusListeners);
}
}
void didStopListening() {
if (_masterAnimation != null) {
_masterAnimation.removeListener(notifyListeners);
_masterAnimation.removeStatusListener(notifyStatusListeners);
if (_parent != null) {
_parent.removeListener(notifyListeners);
_parent.removeStatusListener(notifyStatusListeners);
}
}
AnimationStatus get status => _masterAnimation != null ? _masterAnimation.status : _status;
AnimationDirection get direction => _masterAnimation != null ? _masterAnimation.direction : _direction;
double get value => _masterAnimation != null ? _masterAnimation.value : _value;
AnimationStatus get status => _parent != null ? _parent.status : _status;
AnimationDirection get direction => _parent != null ? _parent.direction : _direction;
double get value => _parent != null ? _parent.value : _value;
}
class ReverseAnimation extends Animation<double>
with LazyListenerMixin, LocalPerformanceStatusListenersMixin {
ReverseAnimation(this.masterAnimation);
ReverseAnimation(this.parent);
final Animation<double> masterAnimation;
final Animation<double> parent;
void addListener(VoidCallback listener) {
didRegisterListener();
masterAnimation.addListener(listener);
parent.addListener(listener);
}
void removeListener(VoidCallback listener) {
masterAnimation.removeListener(listener);
parent.removeListener(listener);
didUnregisterListener();
}
void didStartListening() {
masterAnimation.addStatusListener(_statusChangeHandler);
parent.addStatusListener(_statusChangeHandler);
}
void didStopListening() {
masterAnimation.removeStatusListener(_statusChangeHandler);
parent.removeStatusListener(_statusChangeHandler);
}
void _statusChangeHandler(AnimationStatus status) {
notifyStatusListeners(_reverseStatus(status));
}
AnimationStatus get status => _reverseStatus(masterAnimation.status);
AnimationDirection get direction => _reverseDirection(masterAnimation.direction);
double get value => 1.0 - masterAnimation.value;
AnimationStatus get status => _reverseStatus(parent.status);
AnimationDirection get direction => _reverseDirection(parent.direction);
double get value => 1.0 - parent.value;
AnimationStatus _reverseStatus(AnimationStatus status) {
switch (status) {

14
packages/flutter/lib/src/widgets/routes.dart
View File

@@ -177,7 +177,7 @@ abstract class TransitionRoute<T> extends OverlayRoute<T> {
void _updateForwardAnimation(Route nextRoute) {
if (nextRoute is TransitionRoute && canTransitionTo(nextRoute) && nextRoute.canTransitionFrom(this)) {
Animation<double> current = _forwardAnimation.masterAnimation;
Animation<double> current = _forwardAnimation.parent;
if (current != null) {
if (current is TrainHoppingAnimation) {
TrainHoppingAnimation newAnimation;
@@ -185,22 +185,22 @@ abstract class TransitionRoute<T> extends OverlayRoute<T> {
current.currentTrain,
nextRoute.animation,
onSwitchedTrain: () {
assert(_forwardAnimation.masterAnimation == newAnimation);
assert(_forwardAnimation.parent == newAnimation);
assert(newAnimation.currentTrain == nextRoute.animation);
_forwardAnimation.masterAnimation = newAnimation.currentTrain;
_forwardAnimation.parent = newAnimation.currentTrain;
newAnimation.dispose();
}
);
_forwardAnimation.masterAnimation = newAnimation;
_forwardAnimation.parent = newAnimation;
current.dispose();
} else {
_forwardAnimation.masterAnimation = new TrainHoppingAnimation(current, nextRoute.animation);
_forwardAnimation.parent = new TrainHoppingAnimation(current, nextRoute.animation);
}
} else {
_forwardAnimation.masterAnimation = nextRoute.animation;
_forwardAnimation.parent = nextRoute.animation;
}
} else {
_forwardAnimation.masterAnimation = kAlwaysDismissedAnimation;
_forwardAnimation.parent = kAlwaysDismissedAnimation;
}
}