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

Remove FadeTransition from _MountainViewFadeTransition. (#9472)

Browse Source 
* Remove FadeTransition from _MountainViewFadeTransition.
* Update tests.
This commit is contained in:
Chinmay Garde 2017-04-19 15:12:40 -07:00 committed by GitHub
parent 3cf23fcb20
commit 9b90ec4846
2 changed files with 4 additions and 18 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

@ -10,7 +10,7 @@ import 'theme.dart';
// Fractional offset from 1/4 screen below the top to fully on screen. // Fractional offset from 1/4 screen below the top to fully on screen.
final FractionalOffsetTween _kBottomUpTween = new FractionalOffsetTween( final FractionalOffsetTween _kBottomUpTween = new FractionalOffsetTween(
begin: const FractionalOffset(0.0, 0.25), begin: FractionalOffset.bottomLeft,
end: FractionalOffset.topLeft end: FractionalOffset.topLeft
); );
@ -24,14 +24,9 @@ class _MountainViewPageTransition extends StatelessWidget {
parent: routeAnimation, // The route's linear 0.0 - 1.0 animation. parent: routeAnimation, // The route's linear 0.0 - 1.0 animation.
curve: Curves.fastOutSlowIn, curve: Curves.fastOutSlowIn,
)), )),
_opacityAnimation = new CurvedAnimation(
parent: routeAnimation,
curve: Curves.easeIn, // Eyeballed from other Material apps.
),
super(key: key); super(key: key);
final Animation<FractionalOffset> _positionAnimation; final Animation<FractionalOffset> _positionAnimation;
final Animation<double> _opacityAnimation;
final Widget child; final Widget child;
@override @override
@ -39,10 +34,7 @@ class _MountainViewPageTransition extends StatelessWidget {
// TODO(ianh): tell the transform to be un-transformed for hit testing // TODO(ianh): tell the transform to be un-transformed for hit testing
return new SlideTransition( return new SlideTransition(
position: _positionAnimation, position: _positionAnimation,
child: new FadeTransition(
opacity: _opacityAnimation,
child: child, child: child,
),
); );
} }
} }

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

@ -26,7 +26,6 @@ void main() {
await tester.pump(); await tester.pump();
await tester.pump(const Duration(milliseconds: 1)); 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')); Offset widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
final Size widget2Size = tester.getSize(find.text('Page 2')); final Size widget2Size = tester.getSize(find.text('Page 2'));
@ -34,10 +33,8 @@ void main() {
expect(widget1TopLeft.dx == widget2TopLeft.dx, true); expect(widget1TopLeft.dx == widget2TopLeft.dx, true);
// Page 1 is above page 2 mid-transition. // Page 1 is above page 2 mid-transition.
expect(widget1TopLeft.dy < widget2TopLeft.dy, true); expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
// Animation begins 3/4 of the way up the page. // Animation begins from the top of the page.
expect(widget2TopLeft.dy < widget2Size.height / 4.0, true); expect(widget2TopLeft.dy < widget2Size.height, true);
// Animation starts with page 2 being near transparent.
expect(widget2Opacity.opacity < 0.01, true);
await tester.pumpAndSettle(); await tester.pumpAndSettle();
@ -49,13 +46,10 @@ void main() {
await tester.pump(); await tester.pump();
await tester.pump(const Duration(milliseconds: 1)); await tester.pump(const Duration(milliseconds: 1));
widget2Opacity = tester.element(find.text('Page 2')).ancestorWidgetOfExactType(Opacity);
widget2TopLeft = tester.getTopLeft(find.text('Page 2')); widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
// Page 2 starts to move down. // Page 2 starts to move down.
expect(widget1TopLeft.dy < widget2TopLeft.dy, true); expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
// Page 2 starts to lose opacity.
expect(widget2Opacity.opacity < 1.0, true);
await tester.pumpAndSettle(); await tester.pumpAndSettle();