firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reenable fade transition for Material page transition (#13048)

Browse Source 
Fixes #12877 by reverting #9472
This commit is contained in:
Pascal Welsch 2017-11-23 00:07:41 +01:00 committed by Ian Hickson
parent 3dc32873bf
commit e73d406106
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/material/page.dart
View File

@ -24,9 +24,14 @@ class _MountainViewPageTransition extends StatelessWidget {
parent: routeAnimation, // The route's linear 0.0 - 1.0 animation.
curve: Curves.fastOutSlowIn,
)),
_opacityAnimation = new CurvedAnimation(
parent: routeAnimation,
curve: Curves.easeIn, // Eyeballed from other Material apps.
),
super(key: key);
final Animation<Offset> _positionAnimation;
final Animation<double> _opacityAnimation;
final Widget child;
@override
@ -34,7 +39,10 @@ class _MountainViewPageTransition extends StatelessWidget {
// TODO(ianh): tell the transform to be un-transformed for hit testing
return new SlideTransition(
position: _positionAnimation,
child: child,
child: new FadeTransition(
opacity: _opacityAnimation,
child: child,
),
);
}
}

12
packages/flutter/test/material/page_test.dart
View File

@ -28,6 +28,8 @@ void main() {
await tester.pump();
await tester.pump(const Duration(milliseconds: 1));
Opacity widget2Opacity =
tester.element(find.text('Page 2')).ancestorWidgetOfExactType(Opacity);
Offset widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
final Size widget2Size = tester.getSize(find.text('Page 2'));
@ -35,8 +37,10 @@ void main() {
expect(widget1TopLeft.dx == widget2TopLeft.dx, true);
// Page 1 is above page 2 mid-transition.
expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
// Animation begins from the top of the page.
expect(widget2TopLeft.dy < widget2Size.height, true);
// Animation begins 3/4 of the way up the page.
expect(widget2TopLeft.dy < widget2Size.height / 4.0, true);
// Animation starts with page 2 being near transparent.
expect(widget2Opacity.opacity < 0.01, true);
await tester.pump(const Duration(milliseconds: 300));
@ -48,10 +52,14 @@ void main() {
await tester.pump();
await tester.pump(const Duration(milliseconds: 1));
widget2Opacity =
tester.element(find.text('Page 2')).ancestorWidgetOfExactType(Opacity);
widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
// Page 2 starts to move down.
expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
// Page 2 starts to lose opacity.
expect(widget2Opacity.opacity < 1.0, true);
await tester.pump(const Duration(milliseconds: 300));