Update default animation duration

This commit is contained in:
Qun Cheng 2024-11-13 10:37:32 -08:00
parent a908be2941
commit cb2572aae4
2 changed files with 12 additions and 6 deletions

View File

@ -87,9 +87,11 @@ mixin MaterialRouteTransitionMixin<T> on PageRoute<T> {
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<T> on PageRoute<T> {
@override
Widget buildTransitions(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation, Widget child) {
final PageTransitionsTheme theme = Theme.of(context).pageTransitionsTheme;
final Duration duration = _getTransitionDuration(context);
controller?.duration = duration;
controller?.reverseDuration = duration;
return theme.buildTransitions<T>(this, context, animation, secondaryAnimation, child);
}
}

View File

@ -1033,7 +1033,7 @@ class PageTransitionsTheme with Diagnosticable {
}) : _builders = builders;
static const Map<TargetPlatform, PageTransitionsBuilder> _defaultBuilders = <TargetPlatform, PageTransitionsBuilder>{
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<T> 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<T>(
widget.route,