Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "ANimatedContainer.doesnt.work"
This reverts commit 327f197.
  • Loading branch information
mpcomplete committed Jul 17, 2015
commit 52ce955d8e9f68c1323f33de145100d5ecc8b92f
21 changes: 1 addition & 20 deletions sky/sdk/lib/widgets/animated_container.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,6 @@ class AnimatedBoxDecorationValue extends AnimatedType<BoxDecoration> {
}
}


class AnimatedMatrix4 extends AnimatedType<Matrix4> {
AnimatedMatrix4(Matrix4 begin, { Matrix4 end, Curve curve: linear })
: super(begin, end: end, curve: curve);

void setFraction(double t) {
if (t == 1.0) {
value = end;
return;
}
// TODO(mpcomplete): lerp the whole matrix (can we just lerp each cell?).
Vector3 trans = begin.getTranslation()*(1.0 - t) + end.getTranslation() * t;
value = new Matrix4.identity()..translate(trans);
}
}

class AnimatedEdgeDimsValue extends AnimatedType<EdgeDims> {
AnimatedEdgeDimsValue(EdgeDims begin, { EdgeDims end, Curve curve: linear })
: super(begin, end: end, curve: curve);
Expand Down Expand Up @@ -132,7 +116,6 @@ class AnimatedContainer extends AnimatedComponent {
decoration = source.decoration;
margin = source.margin;
padding = source.padding;
transform = source.transform;
width = source.width;
height = source.height;
_updateFields();
Expand Down Expand Up @@ -184,10 +167,8 @@ class AnimatedContainer extends AnimatedComponent {
}

void _updateTransform() {
if (transform != null)
print("AC transform: $transform vs $_transform");
_updateField(transform, _transform, () {
_transform = new ImplicitlyAnimatedValue<Matrix4>(new AnimatedMatrix4(transform), duration);
_transform = new ImplicitlyAnimatedValue<Matrix4>(new AnimatedType<Matrix4>(transform), duration);
watch(_transform.performance);
});
}
Expand Down
51 changes: 40 additions & 11 deletions sky/sdk/lib/widgets/snack_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:sky/animation/animation_performance.dart';
import 'package:sky/painting/text_style.dart';
import 'package:sky/theme/typography.dart' as typography;
import 'package:sky/widgets/animated_component.dart';
import 'package:sky/widgets/animated_container.dart';
import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/default_text_style.dart';
import 'package:sky/widgets/material.dart';
Expand Down Expand Up @@ -36,7 +35,7 @@ class SnackBarAction extends Component {
}
}

class SnackBar extends Component {
class SnackBar extends AnimatedComponent {

SnackBar({
String key,
Expand All @@ -53,8 +52,41 @@ class SnackBar extends Component {
bool showing;
Function onHidden;

Point get _position =>
showing ? Point.origin : new Point(0.0, 50.0);
void syncFields(SnackBar source) {
content = source.content;
actions = source.actions;
onHidden = source.onHidden;
if (showing != source.showing) {
showing = source.showing;
showing ? _show() : _hide();
}
}

AnimatedType<Point> _position;
AnimationPerformance _performance;

void initState() {
_position = new AnimatedType<Point>(new Point(0.0, 50.0), end: Point.origin);
_performance = new AnimationPerformance()
..duration = _kSlideInDuration
..variable = _position
..addListener(_checkCompleted);
watch(_performance);
if (showing)
_show();
}

void _show() {
_performance.play();
}
void _hide() {
_performance.reverse();
}
void _checkCompleted() {
if (!_performance.isAnimating && _performance.isDismissed && onHidden != null) {
onHidden();
}
}

Widget build() {
List<Widget> children = [
Expand All @@ -70,13 +102,10 @@ class SnackBar extends Component {
]..addAll(actions);

Matrix4 transform = new Matrix4.identity();
transform.translate(_position.x, _position.y);
print("transform: $_position");
return new AnimatedContainer(
director: director,
transform: transform,
duration: _kSlideInDuration,
child: new Material(
transform.translate(_position.value.x, _position.value.y);
return new Transform(
transform: transform,
child: new Material(
level: 2,
color: const Color(0xFF323232),
type: MaterialType.canvas,
Expand Down