Reverts "Support custom transition duration for DialogRoute, CupertinoDialogRoute and show dialog methods. (flutter#154048)" (flutter#154743)

auto-submit[bot] · web-flow · commit 8c6513ddd1b8 · 2024-09-06T19:13:17.000Z
Reverts: flutter#154048 Initiated by: nate-thegrate Reason for reverting: using `AnimationStyle` instead would allow for complete animation duration and curve customization. Original PR Author: nploi Reviewed By: {piedcipher, nate-thegrate} This change reverts the following previous change: Currently we don't support custom transition duration for `DialogRoute`, `CupertinoDialogRoute` and show dialog methods , This PR will to support that.
diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart
@@ -57,9 +57,6 @@ const Color kCupertinoModalBarrierColor = CupertinoDynamicColor.withBrightness(
 // The duration of the transition used when a modal popup is shown.
 const Duration _kModalPopupTransitionDuration = Duration(milliseconds: 335);
 
-// The transition duration used for [CupertinoDialogRoute] transitions.
-const Duration _kCupertinoDialogRouteTransitionDuration = Duration(milliseconds: 250);
-
 // Offset from offscreen to the right to fully on screen.
 final Animatable<Offset> _kRightMiddleTween = Tween<Offset>(
   begin: const Offset(1.0, 0.0),
@@ -1272,10 +1269,6 @@ Widget _buildCupertinoDialogTransitions(BuildContext context, Animation<double>
 /// By default, `useRootNavigator` is `true` and the dialog route created by
 /// this method is pushed to the root navigator.
 ///
-/// the `transitionDuration` argument is used to specify the duration of
-/// the dialog's entrance and exit animations. If it's not provided or `null`,
-/// then it uses the default value as set by [CupertinoDialogRoute].
-///
 /// {@macro flutter.widgets.RawDialogRoute}
 ///
 /// If the application has multiple [Navigator] objects, it may be necessary to
@@ -1320,7 +1313,6 @@ Future<T?> showCupertinoDialog<T>({
   bool barrierDismissible = false,
   RouteSettings? routeSettings,
   Offset? anchorPoint,
-  Duration? transitionDuration,
 }) {
 
   return Navigator.of(context, rootNavigator: useRootNavigator).push<T>(CupertinoDialogRoute<T>(
@@ -1331,7 +1323,6 @@ Future<T?> showCupertinoDialog<T>({
     barrierColor: CupertinoDynamicColor.resolve(kCupertinoModalBarrierColor, context),
     settings: routeSettings,
     anchorPoint: anchorPoint,
-    transitionDuration: transitionDuration,
   ));
 }
 
@@ -1359,10 +1350,6 @@ Future<T?> showCupertinoDialog<T>({
 /// barrier that darkens everything below the dialog. If `null`, then
 /// [CupertinoDynamicColor.resolve] is used to compute the modal color.
 ///
-/// The `transitionDuration` argument is used to specify the duration of
-/// the dialog's entrance and exit animations. If it's not provided or `null`,
-/// then the default duration `Duration(milliseconds: 250)` is used.
-///
 /// The `settings` argument define the settings for this route. See
 /// [RouteSettings] for details.
 ///
@@ -1385,7 +1372,7 @@ class CupertinoDialogRoute<T> extends RawDialogRoute<T> {
     Color? barrierColor,
     String? barrierLabel,
     // This transition duration was eyeballed comparing with iOS
-    Duration? transitionDuration,
+    super.transitionDuration = const Duration(milliseconds: 250),
     this.transitionBuilder,
     super.settings,
     super.requestFocus,
@@ -1397,7 +1384,6 @@ class CupertinoDialogRoute<T> extends RawDialogRoute<T> {
         transitionBuilder: transitionBuilder ?? _buildCupertinoDialogTransitions,
         barrierLabel: barrierLabel ?? CupertinoLocalizations.of(context).modalBarrierDismissLabel,
         barrierColor: barrierColor ?? CupertinoDynamicColor.resolve(kCupertinoModalBarrierColor, context),
-        transitionDuration: transitionDuration ?? _kCupertinoDialogRouteTransitionDuration,
       );
 
   /// Custom transition builder
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
@@ -31,9 +31,6 @@ import 'theme_data.dart';
 
 const EdgeInsets _defaultInsetPadding = EdgeInsets.symmetric(horizontal: 40.0, vertical: 24.0);
 
-// The transition duration used for [DialogRoute] transitions.
-const Duration _kDialogRouteTransitionDuration = Duration(milliseconds: 150);
-
 /// A Material Design dialog.
 ///
 /// This dialog widget does not have any opinion about the contents of the
@@ -1348,10 +1345,6 @@ Widget _buildMaterialDialogTransitions(BuildContext context, Animation<double> a
 /// field from `DialogThemeData` is used. If that is `null` the default color
 /// `Colors.black54` is used.
 ///
-/// the `transitionDuration` argument is used to specify the duration of
-/// the dialog's entrance and exit animations. If it's not provided or `null`,
-/// then it uses the default value as set by [DialogRoute].
-///
 /// The `useSafeArea` argument is used to indicate if the dialog should only
 /// display in 'safe' areas of the screen not used by the operating system
 /// (see [SafeArea] for more details). It is `true` by default, which means
@@ -1435,7 +1428,6 @@ Future<T?> showDialog<T>({
   RouteSettings? routeSettings,
   Offset? anchorPoint,
   TraversalEdgeBehavior? traversalEdgeBehavior,
-  Duration? transitionDuration,
 }) {
   assert(_debugIsActive(context));
   assert(debugCheckHasMaterialLocalizations(context));
@@ -1462,7 +1454,6 @@ Future<T?> showDialog<T>({
     themes: themes,
     anchorPoint: anchorPoint,
     traversalEdgeBehavior: traversalEdgeBehavior ?? TraversalEdgeBehavior.closedLoop,
-    transitionDuration: transitionDuration,
   ));
 }
 
@@ -1474,10 +1465,6 @@ Future<T?> showDialog<T>({
 ///
 /// On Cupertino platforms, [barrierColor], [useSafeArea], and
 /// [traversalEdgeBehavior] are ignored.
-///
-/// The `transitionDuration` argument is used to specify the duration of
-/// the dialog's entrance and exit animations. If it's not provided or `null`,
-/// then it uses the default value as set by [DialogRoute] or [CupertinoDialogRoute].
 Future<T?> showAdaptiveDialog<T>({
   required BuildContext context,
   required WidgetBuilder builder,
@@ -1489,7 +1476,6 @@ Future<T?> showAdaptiveDialog<T>({
   RouteSettings? routeSettings,
   Offset? anchorPoint,
   TraversalEdgeBehavior? traversalEdgeBehavior,
-  Duration? transitionDuration,
 }) {
   final ThemeData theme = Theme.of(context);
   switch (theme.platform) {
@@ -1508,7 +1494,6 @@ Future<T?> showAdaptiveDialog<T>({
         routeSettings: routeSettings,
         anchorPoint: anchorPoint,
         traversalEdgeBehavior: traversalEdgeBehavior,
-        transitionDuration: transitionDuration,
       );
     case TargetPlatform.iOS:
     case TargetPlatform.macOS:
@@ -1520,7 +1505,6 @@ Future<T?> showAdaptiveDialog<T>({
         useRootNavigator: useRootNavigator,
         anchorPoint: anchorPoint,
         routeSettings: routeSettings,
-        transitionDuration: transitionDuration,
       );
   }
 }
@@ -1568,10 +1552,6 @@ bool _debugIsActive(BuildContext context) {
 /// barrier that darkens everything below the dialog. If `null`, the default
 /// color `Colors.black54` is used.
 ///
-/// the `transitionDuration` argument is used to specify the duration of
-/// the dialog's entrance and exit animations. If it's not provided or `null`,
-/// then the default duration `Duration(milliseconds: 150)` is used.
-///
 /// The `useSafeArea` argument is used to indicate if the dialog should only
 /// display in 'safe' areas of the screen not used by the operating system
 /// (see [SafeArea] for more details). It is `true` by default, which means
@@ -1602,7 +1582,6 @@ class DialogRoute<T> extends RawDialogRoute<T> {
     super.barrierDismissible,
     String? barrierLabel,
     bool useSafeArea = true,
-    Duration? transitionDuration,
     super.settings,
     super.requestFocus,
     super.anchorPoint,
@@ -1617,8 +1596,8 @@ class DialogRoute<T> extends RawDialogRoute<T> {
            return dialog;
          },
          barrierLabel: barrierLabel ?? MaterialLocalizations.of(context).modalBarrierDismissLabel,
+         transitionDuration: const Duration(milliseconds: 150),
          transitionBuilder: _buildMaterialDialogTransitions,
-         transitionDuration: transitionDuration ?? _kDialogRouteTransitionDuration,
        );
 
   CurvedAnimation? _curvedAnimation;
diff --git a/packages/flutter/test/cupertino/route_test.dart b/packages/flutter/test/cupertino/route_test.dart
@@ -1883,45 +1883,6 @@ void main() {
     expect(nestedObserver.dialogCount, 0);
   });
 
-  testWidgets('showCupertinoDialog - custom transitionDuration', (WidgetTester tester) async {
-    final DialogObserver rootObserver = DialogObserver();
-    final DialogObserver nestedObserver = DialogObserver();
-
-    await tester.pumpWidget(CupertinoApp(
-      navigatorObservers: <NavigatorObserver>[rootObserver],
-      home: Navigator(
-        observers: <NavigatorObserver>[nestedObserver],
-        onGenerateRoute: (RouteSettings settings) {
-          return PageRouteBuilder<dynamic>(
-            pageBuilder: (BuildContext context, Animation<double> _, Animation<double> __) {
-              return GestureDetector(
-                onTap: () async {
-                  await showCupertinoDialog<void>(
-                    context: context,
-                    transitionDuration: const Duration(milliseconds: 50),
-                    builder: (BuildContext context) => const SizedBox(),
-                  );
-                },
-                child: const Text('tap'),
-              );
-            },
-          );
-        },
-      ),
-    ));
-
-    // Open the dialog.
-    await tester.tap(find.text('tap'));
-    await tester.pump();
-
-    expect(rootObserver.dialogCount, 1);
-    expect(nestedObserver.dialogCount, 0);
-    expect(rootObserver.dialogRoutes.length, equals(1));
-    final ModalRoute<dynamic> route = rootObserver.dialogRoutes.last;
-    expect(route is CupertinoDialogRoute, true);
-    expect(route.transitionDuration.inMilliseconds, 50);
-  });
-
   testWidgets('showCupertinoDialog uses nested navigator if useRootNavigator is false', (WidgetTester tester) async {
     final DialogObserver rootObserver = DialogObserver();
     final DialogObserver nestedObserver = DialogObserver();
@@ -2971,24 +2932,15 @@ class PopupObserver extends NavigatorObserver {
 }
 
 class DialogObserver extends NavigatorObserver {
-  final List<ModalRoute<dynamic>> dialogRoutes = <ModalRoute<dynamic>>[];
-  int get dialogCount => dialogRoutes.length;
+  int dialogCount = 0;
 
   @override
   void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
     if (route is CupertinoDialogRoute) {
-      dialogRoutes.add(route);
+      dialogCount++;
     }
     super.didPush(route, previousRoute);
   }
-
-  @override
-  void didPop(Route<dynamic> route, Route<dynamic>? previousRoute) {
-    if (route is CupertinoDialogRoute) {
-      dialogRoutes.removeLast();
-    }
-    super.didPop(route, previousRoute);
-  }
 }
 
 class RouteSettingsObserver extends NavigatorObserver {
diff --git a/packages/flutter/test/material/dialog_test.dart b/packages/flutter/test/material/dialog_test.dart
@@ -2533,50 +2533,6 @@ void main() {
     expect(currentRouteSetting.name, '/');
   });
 
-  testWidgets('showDialog - custom transitionDuration', (WidgetTester tester) async {
-    final DialogObserver rootObserver = DialogObserver();
-    await tester.pumpWidget(
-      MaterialApp(
-        navigatorObservers: <NavigatorObserver>[rootObserver],
-        home: Material(
-          child: Builder(
-            builder: (BuildContext context) {
-              return Center(
-                child: ElevatedButton(
-                  child: const Text('X'),
-                  onPressed: () {
-                    showDialog<void>(
-                      context: context,
-                      transitionDuration: const Duration(milliseconds: 50),
-                      builder: (BuildContext context) {
-                        return const AlertDialog(
-                          title: Text('Title'),
-                          content: Text('Y'),
-                          actions: <Widget>[],
-                        );
-                      },
-                    );
-                  },
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-
-    await tester.tap(find.text('X'));
-    await tester.pump();
-
-    expect(rootObserver.dialogRoutes.length, equals(1));
-    final ModalRoute<dynamic> route = rootObserver.dialogRoutes.last;
-    expect(route is DialogRoute, true);
-    expect(route.barrierDismissible, isNotNull);
-    expect(route.barrierColor, isNotNull);
-    expect(route.transitionDuration, isNotNull);
-    expect(route.transitionDuration.inMilliseconds, 50);
-  });
-
   testWidgets('showDialog - custom barrierLabel', (WidgetTester tester) async {
     final SemanticsTester semantics = SemanticsTester(tester);
 
@@ -2873,50 +2829,6 @@ void main() {
     expect(find.text('Dialog2'), findsOneWidget);
   });
 
-  testWidgets('showAdaptiveDialog - custom transitionDuration', (WidgetTester tester) async {
-    final DialogObserver rootObserver = DialogObserver();
-    await tester.pumpWidget(
-      MaterialApp(
-        navigatorObservers: <NavigatorObserver>[rootObserver],
-        home: Material(
-          child: Builder(
-            builder: (BuildContext context) {
-              return Center(
-                child: ElevatedButton(
-                  child: const Text('X'),
-                  onPressed: () {
-                    showAdaptiveDialog<void>(
-                      context: context,
-                      transitionDuration: const Duration(milliseconds: 50),
-                      builder: (BuildContext context) {
-                        return const AlertDialog(
-                          title: Text('Title'),
-                          content: Text('Y'),
-                          actions: <Widget>[],
-                        );
-                      },
-                    );
-                  },
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-
-    await tester.tap(find.text('X'));
-    await tester.pump();
-
-    expect(rootObserver.dialogRoutes.length, equals(1));
-    final ModalRoute<dynamic> route = rootObserver.dialogRoutes.last;
-    expect(route is DialogRoute, true);
-    expect(route.barrierDismissible, isNotNull);
-    expect(route.barrierColor, isNotNull);
-    expect(route.transitionDuration, isNotNull);
-    expect(route.transitionDuration.inMilliseconds, 50);
-  });
-
   testWidgets('Uses open focus traversal when overridden', (WidgetTester tester) async {
     final FocusNode okNode = FocusNode();
     addTearDown(okNode.dispose);
@@ -3090,24 +3002,15 @@ class _RestorableDialogTestWidget extends StatelessWidget {
 }
 
 class DialogObserver extends NavigatorObserver {
-  final List<ModalRoute<dynamic>> dialogRoutes = <ModalRoute<dynamic>>[];
-  int get dialogCount => dialogRoutes.length;
+  int dialogCount = 0;
 
   @override
   void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
     if (route is DialogRoute) {
-      dialogRoutes.add(route);
+      dialogCount++;
     }
     super.didPush(route, previousRoute);
   }
-
-  @override
-  void didPop(Route<dynamic> route, Route<dynamic>? previousRoute) {
-    if (route is DialogRoute) {
-      dialogRoutes.removeLast();
-    }
-    super.didPop(route, previousRoute);
-  }
 }
 
 class _ClosureNavigatorObserver extends NavigatorObserver {
diff --git a/packages/flutter/test/widgets/routes_test.dart b/packages/flutter/test/widgets/routes_test.dart
