Skip to content

Shared Axis Transition Fix #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shihaohong wants to merge 4 commits into from
Closed

Shared Axis Transition Fix #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0efbb84
Fix shared-axis transitions
shihaohong Jan 18, 2020
ef0ed40
Fix tests and example of shared axis transitions
shihaohong Jan 18, 2020
ebd3abe
Fix returning null at unreachable point of code
shihaohong Jan 18, 2020
fad9ead
Remove flip code from shared axis transition
shihaohong Jan 18, 2020
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
2 changes: 1 addition & 1 deletion packages/animations/example/lib/shared_axis_transition.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class _SharedAxisTransitionDemoState extends State<SharedAxisTransitionDemo> {
Expanded(
child: PageTransitionSwitcher(
duration: const Duration(milliseconds: 300),
reverse: _isLoggedIn,
reverse: !_isLoggedIn,
transitionBuilder: (
Widget child,
Animation<double> animation,
Expand Down
42 changes: 13 additions & 29 deletions packages/animations/lib/src/shared_axis_transition.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,6 @@ class _SharedAxisTransitionState extends State<SharedAxisTransition> {
super.dispose();
}

static final Tween<double> _flippedTween = Tween<double>(
begin: 1.0,
end: 0.0,
);
static Animation<double> _flip(Animation<double> animation) {
return _flippedTween.animate(animation);
}

@override
Widget build(BuildContext context) {
return AnimatedBuilder(
Expand All @@ -330,19 +322,15 @@ class _SharedAxisTransitionState extends State<SharedAxisTransition> {
assert(_effectiveAnimationStatus != null);
switch (_effectiveAnimationStatus) {
case AnimationStatus.forward:
return _EnterTransition(
case AnimationStatus.reverse:
return _BottomWidgetTransition(
animation: widget.animation,
transitionType: widget.transitionType,
child: child,
);
case AnimationStatus.dismissed:
case AnimationStatus.reverse:
case AnimationStatus.completed:
return _ExitTransition(
animation: _flip(widget.animation),
transitionType: widget.transitionType,
child: child,
);
return child;
}
return null; // unreachable
},
Expand All @@ -352,19 +340,15 @@ class _SharedAxisTransitionState extends State<SharedAxisTransition> {
assert(_effectiveSecondaryAnimationStatus != null);
switch (_effectiveSecondaryAnimationStatus) {
case AnimationStatus.forward:
return _ExitTransition(
case AnimationStatus.reverse:
return _TopWidgetTransition(
animation: widget.secondaryAnimation,
transitionType: widget.transitionType,
child: child,
);
case AnimationStatus.dismissed:
case AnimationStatus.reverse:
case AnimationStatus.completed:
return _EnterTransition(
animation: _flip(widget.secondaryAnimation),
transitionType: widget.transitionType,
child: child,
);
case AnimationStatus.dismissed:
return child;
}
return null; // unreachable
},
Expand All @@ -374,8 +358,8 @@ class _SharedAxisTransitionState extends State<SharedAxisTransition> {
}
}

class _EnterTransition extends StatelessWidget {
const _EnterTransition({
class _BottomWidgetTransition extends StatelessWidget {
const _BottomWidgetTransition({
this.animation,
this.transitionType,
this.child,
Expand Down Expand Up @@ -439,8 +423,8 @@ class _EnterTransition extends StatelessWidget {
}
}

class _ExitTransition extends StatelessWidget {
const _ExitTransition({
class _TopWidgetTransition extends StatelessWidget {
const _TopWidgetTransition({
this.animation,
this.transitionType,
this.child,
Expand All @@ -465,7 +449,7 @@ class _ExitTransition extends StatelessWidget {
case SharedAxisTransitionType.horizontal:
final Animatable<Offset> slideOutTransition = Tween<Offset>(
begin: Offset.zero,
end: const Offset(30, 0.0),
end: const Offset(-30, 0.0),
).chain(CurveTween(curve: standardEasing));

return FadeTransition(
Expand All @@ -482,7 +466,7 @@ class _ExitTransition extends StatelessWidget {
case SharedAxisTransitionType.vertical:
final Animatable<Offset> slideOutTransition = Tween<Offset>(
begin: Offset.zero,
end: const Offset(0.0, 30),
end: const Offset(0.0, -30),
).chain(CurveTween(curve: standardEasing));

return FadeTransition(
Expand Down
Loading