diff --git a/sky/sdk/example/stocks/lib/stock_home.dart b/sky/sdk/example/stocks/lib/stock_home.dart index 7d8d17a2ca1..224ec81fff5 100644 --- a/sky/sdk/example/stocks/lib/stock_home.dart +++ b/sky/sdk/example/stocks/lib/stock_home.dart @@ -51,8 +51,8 @@ class StockHome extends StatefulComponent { bool _isSearching = false; String _searchQuery; - SnackBarStatus _snackBarStatus; - bool _isSnackBarShowing = false; // Should it be showing? + SnackBarStatus _snackBarStatus = SnackBarStatus.inactive; + bool _isSnackBarShowing = false; void _handleSearchBegin() { navigator.pushState(this, (_) { diff --git a/sky/sdk/lib/widgets/drawer.dart b/sky/sdk/lib/widgets/drawer.dart index 9bb6d211221..2b7ecdc7ff0 100644 --- a/sky/sdk/lib/widgets/drawer.dart +++ b/sky/sdk/lib/widgets/drawer.dart @@ -46,16 +46,6 @@ enum DrawerStatus { typedef void DrawerStatusChangedCallback(DrawerStatus status); -// TODO(mpcomplete): find a better place for this. -class AnimatedColor extends AnimatedType { - AnimatedColor(Color begin, { Color end, Curve curve: linear }) - : super(begin, end: end, curve: curve); - - void setFraction(double t) { - value = lerpColor(begin, end, t); - } -} - class Drawer extends AnimatedComponent { Drawer({ String key, diff --git a/sky/sdk/lib/widgets/snack_bar.dart b/sky/sdk/lib/widgets/snack_bar.dart index ada76ebca22..81df1d43a96 100644 --- a/sky/sdk/lib/widgets/snack_bar.dart +++ b/sky/sdk/lib/widgets/snack_bar.dart @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +import 'package:sky/animation/animated_value.dart'; import 'package:sky/animation/animation_performance.dart'; import 'package:sky/painting/text_style.dart'; import 'package:sky/theme/typography.dart' as typography; @@ -69,11 +70,11 @@ class SnackBar extends AnimatedComponent { } } - AnimatedType _position; + AnimatedValue _position; AnimationPerformance _performance; void initState() { - _position = new AnimatedType(new Point(0.0, 50.0), end: Point.origin); + _position = new AnimatedValue(new Point(0.0, 50.0), end: Point.origin); _performance = new AnimationPerformance() ..duration = _kSlideInDuration ..variable = _position