DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt a less invasive way to disable fading. (#13733)

Browse Source 
Hopefully this will fix the performance regression in https://github.com/flutter/flutter/pull/13680 but with an easier way to flip the switch.
This commit is contained in:
Ian Hickson 2017-12-21 15:02:03 -08:00 committed by GitHub
parent b3cfa785c4
commit 4e16b9db29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,16 +18,17 @@ final Tween<Offset> _kBottomUpTween = new Tween<Offset>(
class _MountainViewPageTransition extends StatelessWidget {
_MountainViewPageTransition({
Key key,
@required bool fade,
@required Animation<double> routeAnimation,
@required this.child,
}) : _positionAnimation = _kBottomUpTween.animate(new CurvedAnimation(
parent: routeAnimation, // The route's linear 0.0 - 1.0 animation.
curve: Curves.fastOutSlowIn,
)),
_opacityAnimation = new CurvedAnimation(
_opacityAnimation = fade ? new CurvedAnimation(
parent: routeAnimation,
curve: Curves.easeIn, // Eyeballed from other Material apps.
),
) : const AlwaysStoppedAnimation<double>(1.0),
super(key: key);
final Animation<Offset> _positionAnimation;
@ -83,6 +84,14 @@ class MaterialPageRoute<T> extends PageRoute<T> {
assert(opaque);
}
/// Turns on the fading of routes during page transitions.
///
/// This is currently disabled by default because of performance issues on
/// low-end phones. Eventually these issues will be resolved and this flag
/// will be removed.
@Deprecated('This flag will eventually be removed once the performance issues are resolved. See: https://github.com/flutter/flutter/issues/13736')
static bool debugEnableFadingRoutes = false;
/// Builds the primary contents of the route.
final WidgetBuilder builder;
@ -159,6 +168,7 @@ class MaterialPageRoute<T> extends PageRoute<T> {
return new _MountainViewPageTransition(
routeAnimation: animation,
child: child,
fade: debugEnableFadingRoutes, // ignore: deprecated_member_use
);
}
}

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

@ -40,7 +40,7 @@ void main() {
// 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);
expect(widget2Opacity.opacity < 0.01, MaterialPageRoute.debugEnableFadingRoutes); // ignore: deprecated_member_use
await tester.pump(const Duration(milliseconds: 300));
@ -59,7 +59,7 @@ void main() {
// Page 2 starts to move down.
expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
// Page 2 starts to lose opacity.
expect(widget2Opacity.opacity < 1.0, true);
expect(widget2Opacity.opacity < 1.0, MaterialPageRoute.debugEnableFadingRoutes); // ignore: deprecated_member_use
await tester.pump(const Duration(milliseconds: 300));