diff --git a/packages/flutter/lib/src/material/page.dart b/packages/flutter/lib/src/material/page.dart index f067639ad58..f5df9afaad7 100644 --- a/packages/flutter/lib/src/material/page.dart +++ b/packages/flutter/lib/src/material/page.dart @@ -87,9 +87,11 @@ mixin MaterialRouteTransitionMixin on PageRoute { Widget buildContent(BuildContext context); @override - Duration get transitionDuration { - final TargetPlatform platform = Theme.of(navigator!.context).platform; - final PageTransitionsTheme pageTransitionsTheme = Theme.of(navigator!.context).pageTransitionsTheme; + Duration get transitionDuration => _getTransitionDuration(navigator!.context); + + Duration _getTransitionDuration(BuildContext context) { + final TargetPlatform platform = Theme.of(context).platform; + final PageTransitionsTheme pageTransitionsTheme = Theme.of(context).pageTransitionsTheme; final PageTransitionsBuilder? pageTransitionBuilder = pageTransitionsTheme.builders[platform]; return pageTransitionBuilder is FadeForwardsPageTransitionsBuilder ? const Duration(milliseconds: 800) @@ -148,6 +150,10 @@ mixin MaterialRouteTransitionMixin on PageRoute { @override Widget buildTransitions(BuildContext context, Animation animation, Animation secondaryAnimation, Widget child) { final PageTransitionsTheme theme = Theme.of(context).pageTransitionsTheme; + final Duration duration = _getTransitionDuration(context); + controller?.duration = duration; + controller?.reverseDuration = duration; + return theme.buildTransitions(this, context, animation, secondaryAnimation, child); } } diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart index d4b87775a2e..4ed7bdfca32 100644 --- a/packages/flutter/lib/src/material/page_transitions_theme.dart +++ b/packages/flutter/lib/src/material/page_transitions_theme.dart @@ -1033,7 +1033,7 @@ class PageTransitionsTheme with Diagnosticable { }) : _builders = builders; static const Map _defaultBuilders = { - TargetPlatform.android: ZoomPageTransitionsBuilder(), + TargetPlatform.android: FadeForwardsPageTransitionsBuilder(), TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), TargetPlatform.macOS: CupertinoPageTransitionsBuilder(), }; @@ -1068,7 +1068,7 @@ class PageTransitionsTheme with Diagnosticable { /// {@macro flutter.widgets.delegatedTransition} DelegatedTransitionBuilder? delegatedTransition(TargetPlatform platform) { final PageTransitionsBuilder matchingBuilder = - builders[platform] ?? const ZoomPageTransitionsBuilder(); + builders[platform] ?? const FadeForwardsPageTransitionsBuilder(); return matchingBuilder.delegatedTransition; } @@ -1147,7 +1147,7 @@ class _PageTransitionsThemeTransitionsState extends State<_PageTransitionsThe final PageTransitionsBuilder matchingBuilder = widget.builders[platform] ?? switch (platform) { TargetPlatform.iOS => const CupertinoPageTransitionsBuilder(), - TargetPlatform.android || TargetPlatform.fuchsia || TargetPlatform.windows || TargetPlatform.macOS || TargetPlatform.linux => const ZoomPageTransitionsBuilder(), + TargetPlatform.android || TargetPlatform.fuchsia || TargetPlatform.windows || TargetPlatform.macOS || TargetPlatform.linux => const FadeForwardsPageTransitionsBuilder(), }; return matchingBuilder.buildTransitions( widget.route,