Commit 89320ee2 authored by Adam Barth's avatar Adam Barth

Rename Performance to Animation in a couple more places

These should be the last references to the old "performance" name.
parent d59da41b
...@@ -14,7 +14,7 @@ import 'listener_helpers.dart'; ...@@ -14,7 +14,7 @@ import 'listener_helpers.dart';
import 'ticker.dart'; import 'ticker.dart';
class AnimationController extends Animation<double> class AnimationController extends Animation<double>
with EagerListenerMixin, LocalPerformanceListenersMixin, LocalPerformanceStatusListenersMixin { with EagerListenerMixin, LocalAnimationListenersMixin, LocalAnimationStatusListenersMixin {
AnimationController({ AnimationController({
double value, double value,
this.duration, this.duration,
......
...@@ -62,7 +62,7 @@ abstract class ProxyAnimatedMixin { ...@@ -62,7 +62,7 @@ abstract class ProxyAnimatedMixin {
} }
class ProxyAnimation extends Animation<double> class ProxyAnimation extends Animation<double>
with LazyListenerMixin, LocalPerformanceListenersMixin, LocalPerformanceStatusListenersMixin { with LazyListenerMixin, LocalAnimationListenersMixin, LocalAnimationStatusListenersMixin {
ProxyAnimation([Animation<double> animation]) { ProxyAnimation([Animation<double> animation]) {
_parent = animation; _parent = animation;
if (_parent == null) { if (_parent == null) {
...@@ -122,7 +122,7 @@ class ProxyAnimation extends Animation<double> ...@@ -122,7 +122,7 @@ class ProxyAnimation extends Animation<double>
} }
class ReverseAnimation extends Animation<double> class ReverseAnimation extends Animation<double>
with LazyListenerMixin, LocalPerformanceStatusListenersMixin { with LazyListenerMixin, LocalAnimationStatusListenersMixin {
ReverseAnimation(this.parent); ReverseAnimation(this.parent);
final Animation<double> parent; final Animation<double> parent;
...@@ -240,7 +240,7 @@ enum _TrainHoppingMode { minimize, maximize } ...@@ -240,7 +240,7 @@ enum _TrainHoppingMode { minimize, maximize }
/// removed, it exposes a [dispose()] method. Call this method to shut this /// removed, it exposes a [dispose()] method. Call this method to shut this
/// object down. /// object down.
class TrainHoppingAnimation extends Animation<double> class TrainHoppingAnimation extends Animation<double>
with EagerListenerMixin, LocalPerformanceListenersMixin, LocalPerformanceStatusListenersMixin { with EagerListenerMixin, LocalAnimationListenersMixin, LocalAnimationStatusListenersMixin {
TrainHoppingAnimation(this._currentTrain, this._nextTrain, { this.onSwitchedTrain }) { TrainHoppingAnimation(this._currentTrain, this._nextTrain, { this.onSwitchedTrain }) {
assert(_currentTrain != null); assert(_currentTrain != null);
if (_nextTrain != null) { if (_nextTrain != null) {
......
...@@ -38,7 +38,7 @@ abstract class EagerListenerMixin implements _ListenerMixin { ...@@ -38,7 +38,7 @@ abstract class EagerListenerMixin implements _ListenerMixin {
void dispose(); void dispose();
} }
abstract class LocalPerformanceListenersMixin extends _ListenerMixin { abstract class LocalAnimationListenersMixin extends _ListenerMixin {
final List<VoidCallback> _listeners = <VoidCallback>[]; final List<VoidCallback> _listeners = <VoidCallback>[];
void addListener(VoidCallback listener) { void addListener(VoidCallback listener) {
didRegisterListener(); didRegisterListener();
...@@ -55,7 +55,7 @@ abstract class LocalPerformanceListenersMixin extends _ListenerMixin { ...@@ -55,7 +55,7 @@ abstract class LocalPerformanceListenersMixin extends _ListenerMixin {
} }
} }
abstract class LocalPerformanceStatusListenersMixin extends _ListenerMixin { abstract class LocalAnimationStatusListenersMixin extends _ListenerMixin {
final List<AnimationStatusListener> _statusListeners = <AnimationStatusListener>[]; final List<AnimationStatusListener> _statusListeners = <AnimationStatusListener>[];
void addStatusListener(AnimationStatusListener listener) { void addStatusListener(AnimationStatusListener listener) {
didRegisterListener(); didRegisterListener();
......
...@@ -381,7 +381,7 @@ class _TabsScrollBehavior extends BoundedBehavior { ...@@ -381,7 +381,7 @@ class _TabsScrollBehavior extends BoundedBehavior {
} }
} }
abstract class TabBarSelectionPerformanceListener { abstract class TabBarSelectionAnimationListener {
void handleStatusChange(AnimationStatus status); void handleStatusChange(AnimationStatus status);
void handleProgressChange(); void handleProgressChange();
void handleSelectionDeactivate(); void handleSelectionDeactivate();
...@@ -503,28 +503,28 @@ class TabBarSelectionState<T> extends State<TabBarSelection<T>> { ...@@ -503,28 +503,28 @@ class TabBarSelectionState<T> extends State<TabBarSelection<T>> {
}); });
} }
final List<TabBarSelectionPerformanceListener> _performanceListeners = <TabBarSelectionPerformanceListener>[]; final List<TabBarSelectionAnimationListener> _animationListeners = <TabBarSelectionAnimationListener>[];
void registerPerformanceListener(TabBarSelectionPerformanceListener listener) { void registerAnimationListener(TabBarSelectionAnimationListener listener) {
_performanceListeners.add(listener); _animationListeners.add(listener);
_controller _controller
..addStatusListener(listener.handleStatusChange) ..addStatusListener(listener.handleStatusChange)
..addListener(listener.handleProgressChange); ..addListener(listener.handleProgressChange);
} }
void unregisterPerformanceListener(TabBarSelectionPerformanceListener listener) { void unregisterAnimationListener(TabBarSelectionAnimationListener listener) {
_performanceListeners.remove(listener); _animationListeners.remove(listener);
_controller _controller
..removeStatusListener(listener.handleStatusChange) ..removeStatusListener(listener.handleStatusChange)
..removeListener(listener.handleProgressChange); ..removeListener(listener.handleProgressChange);
} }
void deactivate() { void deactivate() {
for (TabBarSelectionPerformanceListener listener in _performanceListeners.toList()) { for (TabBarSelectionAnimationListener listener in _animationListeners.toList()) {
listener.handleSelectionDeactivate(); listener.handleSelectionDeactivate();
unregisterPerformanceListener(listener); unregisterAnimationListener(listener);
} }
assert(_performanceListeners.isEmpty); assert(_animationListeners.isEmpty);
} }
Widget build(BuildContext context) { Widget build(BuildContext context) {
...@@ -552,15 +552,15 @@ class TabBar<T> extends Scrollable { ...@@ -552,15 +552,15 @@ class TabBar<T> extends Scrollable {
_TabBarState createState() => new _TabBarState(); _TabBarState createState() => new _TabBarState();
} }
class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelectionPerformanceListener { class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelectionAnimationListener {
TabBarSelectionState _selection; TabBarSelectionState _selection;
bool _valueIsChanging = false; bool _valueIsChanging = false;
void _initSelection(TabBarSelectionState<T> selection) { void _initSelection(TabBarSelectionState<T> selection) {
_selection?.unregisterPerformanceListener(this); _selection?.unregisterAnimationListener(this);
_selection = selection; _selection = selection;
_selection?.registerPerformanceListener(this); _selection?.registerAnimationListener(this);
} }
void initState() { void initState() {
...@@ -576,7 +576,7 @@ class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelect ...@@ -576,7 +576,7 @@ class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelect
} }
void dispose() { void dispose() {
_selection?.unregisterPerformanceListener(this); _selection?.unregisterAnimationListener(this);
super.dispose(); super.dispose();
} }
...@@ -791,7 +791,7 @@ class TabBarView extends PageableList { ...@@ -791,7 +791,7 @@ class TabBarView extends PageableList {
_TabBarViewState createState() => new _TabBarViewState(); _TabBarViewState createState() => new _TabBarViewState();
} }
class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSelectionPerformanceListener { class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSelectionAnimationListener {
TabBarSelectionState _selection; TabBarSelectionState _selection;
List<Widget> _items; List<Widget> _items;
...@@ -809,7 +809,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe ...@@ -809,7 +809,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe
void _initSelection(TabBarSelectionState selection) { void _initSelection(TabBarSelectionState selection) {
_selection = selection; _selection = selection;
if (_selection != null) { if (_selection != null) {
_selection.registerPerformanceListener(this); _selection.registerAnimationListener(this);
_updateItemsAndScrollBehavior(); _updateItemsAndScrollBehavior();
} }
} }
...@@ -826,7 +826,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe ...@@ -826,7 +826,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe
} }
void dispose() { void dispose() {
_selection?.unregisterPerformanceListener(this); _selection?.unregisterAnimationListener(this);
super.dispose(); super.dispose();
} }
...@@ -874,7 +874,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe ...@@ -874,7 +874,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe
void handleProgressChange() { void handleProgressChange() {
if (_selection == null || !_selection.valueIsChanging) if (_selection == null || !_selection.valueIsChanging)
return; return;
// The TabBar is driving the TabBarSelection performance. // The TabBar is driving the TabBarSelection animation.
final Animation<double> animation = _selection.animation; final Animation<double> animation = _selection.animation;
...@@ -906,7 +906,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe ...@@ -906,7 +906,7 @@ class _TabBarViewState extends PageableListState<TabBarView> implements TabBarSe
void dispatchOnScroll() { void dispatchOnScroll() {
if (_selection == null || _selection.valueIsChanging) if (_selection == null || _selection.valueIsChanging)
return; return;
// This class is driving the TabBarSelection's performance. // This class is driving the TabBarSelection's animation.
final AnimationController controller = _selection._controller; final AnimationController controller = _selection._controller;
......
...@@ -175,9 +175,8 @@ class RelativeRectTween extends Tween<RelativeRect> { ...@@ -175,9 +175,8 @@ class RelativeRectTween extends Tween<RelativeRect> {
} }
/// Animated version of [Positioned] which takes a specific /// Animated version of [Positioned] which takes a specific
/// [AnimatedRelativeRectValue] and a [PerformanceView] to transition the /// [Animation<RelativeRect>] to transition the child's position from a start
/// child's position from a start position to and end position over the lifetime /// position to and end position over the lifetime of the animation.
/// of the performance.
/// ///
/// Only works if it's the child of a [Stack]. /// Only works if it's the child of a [Stack].
class PositionedTransition extends AnimatedComponent { class PositionedTransition extends AnimatedComponent {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment