From b308dbd32a3042168eddc077df31f545b4622d98 Mon Sep 17 00:00:00 2001 From: Qun Cheng Date: Wed, 20 Nov 2024 17:07:19 -0800 Subject: [PATCH] Revert default value change --- .../page_transitions_theme.0.dart | 2 +- packages/flutter/lib/src/material/page.dart | 10 +++++----- .../lib/src/material/page_transitions_theme.dart | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart b/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart index 858aecd8248..dc2dab2eed7 100644 --- a/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart +++ b/examples/api/lib/material/page_transitions_theme/page_transitions_theme.0.dart @@ -18,7 +18,7 @@ class PageTransitionsThemeApp extends StatelessWidget { // Defines the page transition animations used by MaterialPageRoute // for different target platforms. // Non-specified target platforms will default to - // FadeForwardsPageTransitionBuilder(). + // ZoomPageTransitionsBuilder(). pageTransitionsTheme: const PageTransitionsTheme( builders: { TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), diff --git a/packages/flutter/lib/src/material/page.dart b/packages/flutter/lib/src/material/page.dart index de1a5c4111f..82c92d13d53 100644 --- a/packages/flutter/lib/src/material/page.dart +++ b/packages/flutter/lib/src/material/page.dart @@ -63,9 +63,9 @@ class MaterialPageRoute extends PageRoute with MaterialRouteTransitionMixi /// A mixin that provides platform-adaptive transitions for a [PageRoute]. /// /// {@template flutter.material.materialRouteTransitionMixin} -/// For Android, the entrance transition for the page slides in from right to -/// left and fades in while the exiting page slides out in the same direction -/// and fades out. The exit transition is similar, but in reverse. +/// For Android, the entrance transition for the page zooms in and fades in +/// while the exiting page zooms out and fades out. The exit transition is similar, +/// but in reverse. /// /// For iOS, the page slides in from the right and exits in reverse. The page /// also shifts to the left in parallax when another page enters to cover it. @@ -77,8 +77,8 @@ class MaterialPageRoute extends PageRoute with MaterialRouteTransitionMixi /// /// * [PageTransitionsTheme], which defines the default page transitions used /// by the [MaterialRouteTransitionMixin.buildTransitions]. -/// * [FadeForwardsPageTransitionsBuilder], which is the default page transition -/// used by the [PageTransitionsTheme]. +/// * [ZoomPageTransitionsBuilder], which is the default page transition used +/// by the [PageTransitionsTheme]. /// * [CupertinoPageTransitionsBuilder], which is the default page transition /// for iOS and macOS. mixin MaterialRouteTransitionMixin on PageRoute { diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart index 142e3c80ec0..5fe9990d0b6 100644 --- a/packages/flutter/lib/src/material/page_transitions_theme.dart +++ b/packages/flutter/lib/src/material/page_transitions_theme.dart @@ -1041,7 +1041,7 @@ class CupertinoPageTransitionsBuilder extends PageTransitionsBuilder { /// and delegates to [buildTransitions]. /// /// If a builder with a matching platform is not found, then the -/// [FadeForwardsPageTransitionsBuilder] is used. +/// [ZoomPageTransitionsBuilder] is used. /// /// {@tool dartpad} /// This example shows a [MaterialApp] that defines a custom [PageTransitionsTheme]. @@ -1075,7 +1075,7 @@ class PageTransitionsTheme with Diagnosticable { }) : _builders = builders; static const Map _defaultBuilders = { - TargetPlatform.android: FadeForwardsPageTransitionsBuilder(), + TargetPlatform.android: ZoomPageTransitionsBuilder(), TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), TargetPlatform.macOS: CupertinoPageTransitionsBuilder(), }; @@ -1110,7 +1110,7 @@ class PageTransitionsTheme with Diagnosticable { /// {@macro flutter.widgets.delegatedTransition} DelegatedTransitionBuilder? delegatedTransition(TargetPlatform platform) { final PageTransitionsBuilder matchingBuilder = - builders[platform] ?? const FadeForwardsPageTransitionsBuilder(); + builders[platform] ?? const ZoomPageTransitionsBuilder(); return matchingBuilder.delegatedTransition; } @@ -1189,7 +1189,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 FadeForwardsPageTransitionsBuilder(), + TargetPlatform.android || TargetPlatform.fuchsia || TargetPlatform.windows || TargetPlatform.macOS || TargetPlatform.linux => const ZoomPageTransitionsBuilder(), }; return matchingBuilder.buildTransitions( widget.route,