Skip to content

Commit b1c870b

Browse files
authored
Reenable fade transition for Material page transition (#13048) (#13680)
Fixes #12877 by reverting #9472
1 parent ba58111 commit b1c870b

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

‎packages/flutter/lib/src/material/page.dart‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,25 @@ class _MountainViewPageTransition extends StatelessWidget {
2424
parent: routeAnimation, // The route's linear 0.0 - 1.0 animation.
2525
curve: Curves.fastOutSlowIn,
2626
)),
27+
_opacityAnimation = new CurvedAnimation(
28+
parent: routeAnimation,
29+
curve: Curves.easeIn, // Eyeballed from other Material apps.
30+
),
2731
super(key: key);
2832

2933
final Animation<Offset> _positionAnimation;
34+
final Animation<double> _opacityAnimation;
3035
final Widget child;
3136

3237
@override
3338
Widget build(BuildContext context) {
3439
// TODO(ianh): tell the transform to be un-transformed for hit testing
3540
return new SlideTransition(
3641
position: _positionAnimation,
37-
child: child,
42+
child: new FadeTransition(
43+
opacity: _opacityAnimation,
44+
child: child,
45+
),
3846
);
3947
}
4048
}

‎packages/flutter/test/material/page_test.dart‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,19 @@ void main() {
2828
await tester.pump();
2929
await tester.pump(const Duration(milliseconds: 1));
3030

31+
Opacity widget2Opacity =
32+
tester.element(find.text('Page 2')).ancestorWidgetOfExactType(Opacity);
3133
Offset widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
3234
final Size widget2Size = tester.getSize(find.text('Page 2'));
3335

3436
// Android transition is vertical only.
3537
expect(widget1TopLeft.dx == widget2TopLeft.dx, true);
3638
// Page 1 is above page 2 mid-transition.
3739
expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
38-
// Animation begins from the top of the page.
39-
expect(widget2TopLeft.dy < widget2Size.height, true);
40+
// Animation begins 3/4 of the way up the page.
41+
expect(widget2TopLeft.dy < widget2Size.height / 4.0, true);
42+
// Animation starts with page 2 being near transparent.
43+
expect(widget2Opacity.opacity < 0.01, true);
4044

4145
await tester.pump(const Duration(milliseconds: 300));
4246

@@ -48,10 +52,14 @@ void main() {
4852
await tester.pump();
4953
await tester.pump(const Duration(milliseconds: 1));
5054

55+
widget2Opacity =
56+
tester.element(find.text('Page 2')).ancestorWidgetOfExactType(Opacity);
5157
widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
5258

5359
// Page 2 starts to move down.
5460
expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
61+
// Page 2 starts to lose opacity.
62+
expect(widget2Opacity.opacity < 1.0, true);
5563

5664
await tester.pump(const Duration(milliseconds: 300));
5765

0 commit comments

Comments
 (0)