From 2cd2034fe94735f8acfafa2ad6f9e9c8c55ca595 Mon Sep 17 00:00:00 2001 From: Qun Cheng Date: Sat, 16 Nov 2024 22:32:55 -0800 Subject: [PATCH] Update --- .../src/material/page_transitions_theme.dart | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart index 844a78882ac..80d3399b258 100644 --- a/packages/flutter/lib/src/material/page_transitions_theme.dart +++ b/packages/flutter/lib/src/material/page_transitions_theme.dart @@ -574,8 +574,8 @@ class _FadeForwardsPageTransition extends StatelessWidget { Animation animation, Widget? child ) { - return Opacity( - opacity: FadeForwardsPageTransitionsBuilder._fadeInTransition.evaluate(animation), + return FadeTransition( + opacity: FadeForwardsPageTransitionsBuilder._fadeInTransition.animate(animation), child: SlideTransition( position: _forwardTranslationTween.animate(animation), child: child, @@ -587,8 +587,8 @@ class _FadeForwardsPageTransition extends StatelessWidget { Animation animation, Widget? child ) { - return Opacity( - opacity: FadeForwardsPageTransitionsBuilder._fadeOutTransition.evaluate(animation), + return FadeTransition( + opacity: FadeForwardsPageTransitionsBuilder._fadeOutTransition.animate(animation), child: SlideTransition( position: _backwardTranslationTween.animate(animation), child: child, @@ -793,32 +793,44 @@ class FadeForwardsPageTransitionsBuilder extends PageTransitionsBuilder { Animation animation, Widget? child ) { - return ColoredBox( - color: backgroundColor ?? Theme.of(context).colorScheme.surface, - child: Opacity( - opacity: _fadeInTransition.evaluate(animation), - child: SlideTransition( - position: _secondaryForwardTranslationTween.animate(animation), - child: child, - ), + child = FadeTransition( + opacity: _fadeInTransition.animate(animation), + child: SlideTransition( + position: _secondaryForwardTranslationTween.animate(animation), + child: child, ), ); + + if (animation.isAnimating) { + return ColoredBox( + color: backgroundColor ?? Theme.of(context).colorScheme.surface, + child: child, + ); + } + + return child; }, reverseBuilder: ( BuildContext context, Animation animation, Widget? child ) { - return ColoredBox( - color: backgroundColor ?? Theme.of(context).colorScheme.surface, - child: Opacity( - opacity: _fadeOutTransition.evaluate(animation), - child: SlideTransition( - position: _secondaryBackwardTranslationTween.animate(animation), - child: child, - ), + child = FadeTransition( + opacity: _fadeOutTransition.animate(animation), + child: SlideTransition( + position: _secondaryBackwardTranslationTween.animate(animation), + child: child, ), ); + + if (animation.isAnimating) { + return ColoredBox( + color: backgroundColor ?? Theme.of(context).colorScheme.surface, + child: child, + ); + } + + return child; }, child: child, );