This commit is contained in:
Qun Cheng 2024-11-16 22:32:55 -08:00
parent fa72d77b9d
commit 2cd2034fe9

View File

@ -574,8 +574,8 @@ class _FadeForwardsPageTransition extends StatelessWidget {
Animation<double> 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<double> 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<double> 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<double> 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,
);