Reland "Android Q transition by default (#82670)" (#88409)
* Reland "Android Q transition by default (#82670)"
This reverts commit 4053b4b16cbec129f03cd7201ab1b8250bda72e8.
* Fix `overall_experience_test.dart` for flutter_tools
diff --git a/packages/flutter/lib/src/material/page.dart b/packages/flutter/lib/src/material/page.dart
index 2a0e279..835b4ff 100644
--- a/packages/flutter/lib/src/material/page.dart
+++ b/packages/flutter/lib/src/material/page.dart
@@ -63,13 +63,14 @@
/// A mixin that provides platform-adaptive transitions for a [PageRoute].
///
/// {@template flutter.material.materialRouteTransitionMixin}
-/// For Android, the entrance transition for the page slides the route upwards
-/// and fades it in. The exit transition is the same, but in reverse.
+/// For Android, the entrance transition for the page zooms in while the
+/// exiting page zooms and fades out. The exit transition is similar, but in
+/// reverse.
///
-/// The transition is adaptive to the platform and on iOS, the route slides in
-/// from the right and exits in reverse. The route also shifts to the left in
-/// parallax when another page enters to cover it. (These directions are flipped
-/// in environments with a right-to-left reading direction.)
+/// 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.
+/// (These directions are flipped in environments with a right-to-left reading
+/// direction.)
/// {@endtemplate}
///
/// See also:
diff --git a/packages/flutter/lib/src/material/page_transitions_theme.dart b/packages/flutter/lib/src/material/page_transitions_theme.dart
index 695fed9..cf0acdd 100644
--- a/packages/flutter/lib/src/material/page_transitions_theme.dart
+++ b/packages/flutter/lib/src/material/page_transitions_theme.dart
@@ -9,7 +9,8 @@
import 'theme.dart';
// Slides the page upwards and fades it in, starting from 1/4 screen
-// below the top.
+// below the top. The transition is intended to match the default for
+// Android O.
class _FadeUpwardsPageTransition extends StatelessWidget {
_FadeUpwardsPageTransition({
Key? key,
@@ -146,7 +147,7 @@
}
// Zooms and fades a new page in, zooming out the previous page. This transition
-// is designed to match the Android 10 activity transition.
+// is designed to match the Android Q activity transition.
class _ZoomPageTransition extends StatelessWidget {
/// Creates a [_ZoomPageTransition].
///
@@ -291,16 +292,16 @@
@override
Widget build(BuildContext context) {
double opacity = 0;
- // The transition's scrim opacity only increases on the forward transition. In the reverse
- // transition, the opacity should always be 0.0.
+ // The transition's scrim opacity only increases on the forward transition.
+ // In the reverse transition, the opacity should always be 0.0.
//
- // Therefore, we need to only apply the scrim opacity animation when the transition
- // is running forwards.
+ // Therefore, we need to only apply the scrim opacity animation when
+ // the transition is running forwards.
//
- // The reason that we check that the animation's status is not `completed` instead
- // of checking that it is `forward` is that this allows the interrupted reversal of the
- // forward transition to smoothly fade the scrim away. This prevents a disjointed
- // removal of the scrim.
+ // The reason that we check that the animation's status is not `completed`
+ // instead of checking that it is `forward` is that this allows
+ // the interrupted reversal of the forward transition to smoothly fade
+ // the scrim away. This prevents a disjointed removal of the scrim.
if (!reverse && animation.status != AnimationStatus.completed) {
opacity = _scrimOpacityTween.evaluate(animation)!;
}
@@ -317,17 +318,14 @@
return AnimatedBuilder(
animation: animation,
builder: (BuildContext context, Widget? child) {
- return Container(
+ return ColoredBox(
color: Colors.black.withOpacity(opacity),
child: child,
);
},
child: FadeTransition(
opacity: fadeTransition,
- child: ScaleTransition(
- scale: scaleTransition,
- child: child,
- ),
+ child: ScaleTransition(scale: scaleTransition, child: child),
),
);
}
@@ -374,10 +372,7 @@
return FadeTransition(
opacity: fadeTransition,
- child: ScaleTransition(
- scale: scaleTransition,
- child: child,
- ),
+ child: ScaleTransition(scale: scaleTransition, child: child),
);
}
}
@@ -391,11 +386,12 @@
///
/// See also:
///
-/// * [FadeUpwardsPageTransitionsBuilder], which defines a default page transition.
+/// * [FadeUpwardsPageTransitionsBuilder], which defines a page transition
+/// that's similar to the one provided by Android O.
/// * [OpenUpwardsPageTransitionsBuilder], which defines a page transition
/// that's similar to the one provided by Android P.
-/// * [ZoomPageTransitionsBuilder], which defines a page transition similar
-/// to the one provided in Android 10.
+/// * [ZoomPageTransitionsBuilder], which defines the default page transition
+/// that's similar to the one provided in Android Q.
/// * [CupertinoPageTransitionsBuilder], which defines a horizontal page
/// transition that matches native iOS page transitions.
abstract class PageTransitionsBuilder {
@@ -419,18 +415,19 @@
);
}
-/// Used by [PageTransitionsTheme] to define a default [MaterialPageRoute] page
-/// transition animation.
+/// Used by [PageTransitionsTheme] to define a vertically fading
+/// [MaterialPageRoute] page transition animation that looks like
+/// the default page transition used on Android O.
///
-/// The default animation fades the new page in while translating it upwards,
+/// The animation fades the new page in while translating it upwards,
/// starting from about 25% below the top of the screen.
///
/// See also:
///
/// * [OpenUpwardsPageTransitionsBuilder], which defines a page transition
/// that's similar to the one provided by Android P.
-/// * [ZoomPageTransitionsBuilder], which defines a page transition similar
-/// to the one provided in Android 10.
+/// * [ZoomPageTransitionsBuilder], which defines the default page transition
+/// that's similar to the one provided in Android Q.
/// * [CupertinoPageTransitionsBuilder], which defines a horizontal page
/// transition that matches native iOS page transitions.
class FadeUpwardsPageTransitionsBuilder extends PageTransitionsBuilder {
@@ -455,9 +452,10 @@
///
/// See also:
///
-/// * [FadeUpwardsPageTransitionsBuilder], which defines a default page transition.
-/// * [ZoomPageTransitionsBuilder], which defines a page transition similar
-/// to the one provided in Android 10.
+/// * [FadeUpwardsPageTransitionsBuilder], which defines a page transition
+/// that's similar to the one provided by Android O.
+/// * [ZoomPageTransitionsBuilder], which defines the default page transition
+/// that's similar to the one provided in Android Q.
/// * [CupertinoPageTransitionsBuilder], which defines a horizontal page
/// transition that matches native iOS page transitions.
class OpenUpwardsPageTransitionsBuilder extends PageTransitionsBuilder {
@@ -483,18 +481,19 @@
/// Used by [PageTransitionsTheme] to define a zooming [MaterialPageRoute] page
/// transition animation that looks like the default page transition used on
-/// Android 10.
+/// Android Q.
///
/// See also:
///
-/// * [FadeUpwardsPageTransitionsBuilder], which defines a default page transition.
+/// * [FadeUpwardsPageTransitionsBuilder], which defines a page transition
+/// that's similar to the one provided by Android O.
/// * [OpenUpwardsPageTransitionsBuilder], which defines a page transition
-/// similar to the one provided by Android P.
+/// that's similar to the one provided by Android P.
/// * [CupertinoPageTransitionsBuilder], which defines a horizontal page
/// transition that matches native iOS page transitions.
class ZoomPageTransitionsBuilder extends PageTransitionsBuilder {
/// Constructs a page transition animation that matches the transition used on
- /// Android 10.
+ /// Android Q.
const ZoomPageTransitionsBuilder();
@override
@@ -518,11 +517,12 @@
///
/// See also:
///
-/// * [FadeUpwardsPageTransitionsBuilder], which defines a default page transition.
+/// * [FadeUpwardsPageTransitionsBuilder], which defines a page transition
+/// that's similar to the one provided by Android O.
/// * [OpenUpwardsPageTransitionsBuilder], which defines a page transition
/// that's similar to the one provided by Android P.
-/// * [ZoomPageTransitionsBuilder], which defines a page transition similar
-/// to the one provided in Android 10.
+/// * [ZoomPageTransitionsBuilder], which defines the default page transition
+/// that's similar to the one provided in Android Q.
class CupertinoPageTransitionsBuilder extends PageTransitionsBuilder {
/// Constructs a page transition animation that matches the iOS transition.
const CupertinoPageTransitionsBuilder();
@@ -554,9 +554,12 @@
///
/// * [ThemeData.pageTransitionsTheme], which defines the default page
/// transitions for the overall theme.
-/// * [FadeUpwardsPageTransitionsBuilder], which defines a default page transition.
+/// * [FadeUpwardsPageTransitionsBuilder], which defines a page transition
+/// that's similar to the one provided by Android O.
/// * [OpenUpwardsPageTransitionsBuilder], which defines a page transition
/// that's similar to the one provided by Android P.
+/// * [ZoomPageTransitionsBuilder], which defines the default page transition
+/// that's similar to the one provided by Android Q.
/// * [CupertinoPageTransitionsBuilder], which defines a horizontal page
/// transition that matches native iOS page transitions.
@immutable
@@ -574,9 +577,9 @@
static const Map<TargetPlatform, PageTransitionsBuilder> _defaultBuilders = <TargetPlatform, PageTransitionsBuilder>{
// Only have default transitions for mobile platforms
- TargetPlatform.android: FadeUpwardsPageTransitionsBuilder(),
+ TargetPlatform.android: ZoomPageTransitionsBuilder(),
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
- TargetPlatform.fuchsia: FadeUpwardsPageTransitionsBuilder(),
+ TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
};
static const Map<TargetPlatform, PageTransitionsBuilder> _defaultWebBuilders = <TargetPlatform, PageTransitionsBuilder>{
@@ -587,8 +590,7 @@
Map<TargetPlatform, PageTransitionsBuilder> get builders => _builders;
final Map<TargetPlatform, PageTransitionsBuilder> _builders;
- /// Delegates to the builder for the current [ThemeData.platform]
- /// or [FadeUpwardsPageTransitionsBuilder].
+ /// Delegates to the builder for the current [ThemeData.platform].
///
/// [MaterialPageRoute.buildTransitions] delegates to this method.
Widget buildTransitions<T>(
diff --git a/packages/flutter/test/material/data_table_test.dart b/packages/flutter/test/material/data_table_test.dart
index 01c4356..aa011d2 100644
--- a/packages/flutter/test/material/data_table_test.dart
+++ b/packages/flutter/test/material/data_table_test.dart
@@ -459,7 +459,7 @@
home: Material(child: buildTable(sortAscending: true)),
));
// The `tester.widget` ensures that there is exactly one upward arrow.
- Transform transformOfArrow = tester.widget<Transform>(find.widgetWithIcon(Transform, Icons.arrow_upward));
+ Transform transformOfArrow = tester.firstWidget<Transform>(find.widgetWithIcon(Transform, Icons.arrow_upward));
expect(
transformOfArrow.transform.getRotation(),
equals(Matrix3.identity()),
@@ -471,7 +471,7 @@
));
await tester.pumpAndSettle();
// The `tester.widget` ensures that there is exactly one upward arrow.
- transformOfArrow = tester.widget<Transform>(find.widgetWithIcon(Transform, Icons.arrow_upward));
+ transformOfArrow = tester.firstWidget<Transform>(find.widgetWithIcon(Transform, Icons.arrow_upward));
expect(
transformOfArrow.transform.getRotation(),
equals(Matrix3.rotationZ(math.pi)),
diff --git a/packages/flutter/test/material/flexible_space_bar_test.dart b/packages/flutter/test/material/flexible_space_bar_test.dart
index a39927b..97439d1 100644
--- a/packages/flutter/test/material/flexible_space_bar_test.dart
+++ b/packages/flutter/test/material/flexible_space_bar_test.dart
@@ -98,7 +98,12 @@
);
final RenderBox clipRect = tester.renderObject(find.byType(ClipRect).first);
- final Transform transform = tester.firstWidget(find.byType(Transform));
+ final Transform transform = tester.firstWidget(
+ find.descendant(
+ of: find.byType(FlexibleSpaceBar),
+ matching: find.byType(Transform),
+ ),
+ );
// The current (200) is half way between the min (100) and max (300) and the
// lerp values used to calculate the scale are 1 and 1.5, so we check for 1.25.
diff --git a/packages/flutter/test/material/page_test.dart b/packages/flutter/test/material/page_test.dart
index 9aa1525..a5a3167 100644
--- a/packages/flutter/test/material/page_test.dart
+++ b/packages/flutter/test/material/page_test.dart
@@ -12,6 +12,24 @@
void main() {
testWidgets('test page transition', (WidgetTester tester) async {
+ Iterable<T> _findWidgets<T extends Widget>(Finder of) {
+ return tester.widgetList<T>(
+ find.ancestor(of: of, matching: find.byType(T)),
+ );
+ }
+
+ FadeTransition _findForwardFadeTransition(Finder of) {
+ return _findWidgets<FadeTransition>(of).where(
+ (FadeTransition t) => t.opacity.status == AnimationStatus.forward,
+ ).first;
+ }
+
+ ScaleTransition _findForwardScaleTransition(Finder of) {
+ return _findWidgets<ScaleTransition>(of).where(
+ (ScaleTransition t) => t.scale.status == AnimationStatus.forward,
+ ).first;
+ }
+
await tester.pumpWidget(
MaterialApp(
home: const Material(child: Text('Page 1')),
@@ -23,47 +41,46 @@
),
);
- final Offset widget1TopLeft = tester.getTopLeft(find.text('Page 1'));
-
tester.state<NavigatorState>(find.byType(Navigator)).pushNamed('/next');
await tester.pump();
+ await tester.pump(const Duration(milliseconds: 50));
+
+ ScaleTransition widget1Scale = _findForwardScaleTransition(find.text('Page 1'));
+ ScaleTransition widget2Scale = _findForwardScaleTransition(find.text('Page 2'));
+ FadeTransition widget2Opacity = _findForwardFadeTransition(find.text('Page 2'));
+
+ // Page 1 is enlarging, starts from 1.0.
+ expect(widget1Scale.scale.value, greaterThan(1.0));
+ // Page 2 is enlarging from the value less than 1.0.
+ expect(widget2Scale.scale.value, lessThan(1.0));
+ // Page 2 is becoming none transparent.
+ expect(widget2Opacity.opacity.value, lessThan(1.0));
+
+ await tester.pump(const Duration(milliseconds: 250));
await tester.pump(const Duration(milliseconds: 1));
- FadeTransition widget2Opacity =
- tester.element(find.text('Page 2')).findAncestorWidgetOfExactType<FadeTransition>()!;
- Offset widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
- final Size widget2Size = tester.getSize(find.text('Page 2'));
-
- // Android transition is vertical only.
- expect(widget1TopLeft.dx == widget2TopLeft.dx, true);
- // Page 1 is above page 2 mid-transition.
- expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
- // Animation begins 3/4 of the way up the page.
- expect(widget2TopLeft.dy < widget2Size.height / 4.0, true);
- // Animation starts with page 2 being near transparent.
- expect(widget2Opacity.opacity.value < 0.01, true);
-
- await tester.pump(const Duration(milliseconds: 300));
-
// Page 2 covers page 1.
expect(find.text('Page 1'), findsNothing);
expect(find.text('Page 2'), isOnstage);
tester.state<NavigatorState>(find.byType(Navigator)).pop();
await tester.pump();
+ await tester.pump(const Duration(milliseconds: 100));
+
+ widget1Scale = _findForwardScaleTransition(find.text('Page 1'));
+ widget2Scale = _findForwardScaleTransition(find.text('Page 2'));
+ widget2Opacity = _findForwardFadeTransition(find.text('Page 2'));
+
+ // Page 1 is narrowing down, but still larger than 1.0.
+ expect(widget1Scale.scale.value, greaterThan(1.0));
+ // Page 2 is smaller than 1.0.
+ expect(widget2Scale.scale.value, lessThan(1.0));
+ // Page 2 is becoming transparent.
+ expect(widget2Opacity.opacity.value, lessThan(1.0));
+
+ await tester.pump(const Duration(milliseconds: 200));
await tester.pump(const Duration(milliseconds: 1));
- widget2Opacity =
- tester.element(find.text('Page 2')).findAncestorWidgetOfExactType<FadeTransition>()!;
- widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
-
- // Page 2 starts to move down.
- expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
- // Page 2 starts to lose opacity.
- expect(widget2Opacity.opacity.value < 1.0, true);
-
- await tester.pump(const Duration(milliseconds: 300));
-
expect(find.text('Page 1'), isOnstage);
expect(find.text('Page 2'), findsNothing);
},
@@ -155,6 +172,70 @@
skip: kIsWeb, // [intended] no default transitions on the web.
);
+ testWidgets('test page transition with FadeUpwardsPageTransitionBuilder', (WidgetTester tester) async {
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: ThemeData(
+ pageTransitionsTheme: const PageTransitionsTheme(
+ builders: <TargetPlatform, PageTransitionsBuilder>{
+ TargetPlatform.android: FadeUpwardsPageTransitionsBuilder(),
+ },
+ ),
+ ),
+ home: const Material(child: Text('Page 1')),
+ routes: <String, WidgetBuilder>{
+ '/next': (BuildContext context) {
+ return const Material(child: Text('Page 2'));
+ },
+ },
+ ),
+ );
+
+ final Offset widget1TopLeft = tester.getTopLeft(find.text('Page 1'));
+
+ tester.state<NavigatorState>(find.byType(Navigator)).pushNamed('/next');
+ await tester.pump();
+ await tester.pump(const Duration(milliseconds: 1));
+
+ FadeTransition widget2Opacity =
+ tester.element(find.text('Page 2')).findAncestorWidgetOfExactType<FadeTransition>()!;
+ Offset widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
+ final Size widget2Size = tester.getSize(find.text('Page 2'));
+
+ // Android transition is vertical only.
+ expect(widget1TopLeft.dx == widget2TopLeft.dx, true);
+ // Page 1 is above page 2 mid-transition.
+ expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
+ // Animation begins 3/4 of the way up the page.
+ expect(widget2TopLeft.dy < widget2Size.height / 4.0, true);
+ // Animation starts with page 2 being near transparent.
+ expect(widget2Opacity.opacity.value < 0.01, true);
+
+ await tester.pump(const Duration(milliseconds: 300));
+
+ // Page 2 covers page 1.
+ expect(find.text('Page 1'), findsNothing);
+ expect(find.text('Page 2'), isOnstage);
+
+ tester.state<NavigatorState>(find.byType(Navigator)).pop();
+ await tester.pump();
+ await tester.pump(const Duration(milliseconds: 1));
+
+ widget2Opacity =
+ tester.element(find.text('Page 2')).findAncestorWidgetOfExactType<FadeTransition>()!;
+ widget2TopLeft = tester.getTopLeft(find.text('Page 2'));
+
+ // Page 2 starts to move down.
+ expect(widget1TopLeft.dy < widget2TopLeft.dy, true);
+ // Page 2 starts to lose opacity.
+ expect(widget2Opacity.opacity.value < 1.0, true);
+
+ await tester.pump(const Duration(milliseconds: 300));
+
+ expect(find.text('Page 1'), isOnstage);
+ expect(find.text('Page 2'), findsNothing);
+ }, variant: TargetPlatformVariant.only(TargetPlatform.android));
+
testWidgets('test fullscreen dialog transition', (WidgetTester tester) async {
await tester.pumpWidget(
const MaterialApp(
diff --git a/packages/flutter/test/material/page_transitions_theme_test.dart b/packages/flutter/test/material/page_transitions_theme_test.dart
index aa56211..8cd01fc 100644
--- a/packages/flutter/test/material/page_transitions_theme_test.dart
+++ b/packages/flutter/test/material/page_transitions_theme_test.dart
@@ -66,7 +66,7 @@
skip: kIsWeb, // [intended] no default transitions on the web.
);
- testWidgets('Default PageTransitionsTheme builds a _FadeUpwardsPageTransition for android', (WidgetTester tester) async {
+ testWidgets('Default PageTransitionsTheme builds a _ZoomPageTransition for android', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => Material(
child: TextButton(
@@ -83,20 +83,20 @@
),
);
- Finder findFadeUpwardsPageTransition() {
+ Finder findZoomPageTransition() {
return find.descendant(
of: find.byType(MaterialApp),
- matching: find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_FadeUpwardsPageTransition'),
+ matching: find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_ZoomPageTransition'),
);
}
expect(Theme.of(tester.element(find.text('push'))).platform, debugDefaultTargetPlatformOverride);
- expect(findFadeUpwardsPageTransition(), findsOneWidget);
+ expect(findZoomPageTransition(), findsOneWidget);
await tester.tap(find.text('push'));
await tester.pumpAndSettle();
expect(find.text('page b'), findsOneWidget);
- expect(findFadeUpwardsPageTransition(), findsOneWidget);
+ expect(findZoomPageTransition(), findsOneWidget);
},
variant: TargetPlatformVariant.only(TargetPlatform.android),
skip: kIsWeb, // [intended] no default transitions on the web.
@@ -145,7 +145,7 @@
skip: kIsWeb, // [intended] no default transitions on the web.
);
- testWidgets('PageTransitionsTheme override builds a _ZoomPageTransition', (WidgetTester tester) async {
+ testWidgets('PageTransitionsTheme override builds a _FadeUpwardsTransition', (WidgetTester tester) async {
final Map<String, WidgetBuilder> routes = <String, WidgetBuilder>{
'/': (BuildContext context) => Material(
child: TextButton(
@@ -161,7 +161,7 @@
theme: ThemeData(
pageTransitionsTheme: const PageTransitionsTheme(
builders: <TargetPlatform, PageTransitionsBuilder>{
- TargetPlatform.android: ZoomPageTransitionsBuilder(), // creates a _ZoomPageTransition
+ TargetPlatform.android: FadeUpwardsPageTransitionsBuilder(), // creates a _FadeUpwardsTransition
},
),
),
@@ -169,20 +169,20 @@
),
);
- Finder findZoomPageTransition() {
+ Finder findFadeUpwardsPageTransition() {
return find.descendant(
of: find.byType(MaterialApp),
- matching: find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_ZoomPageTransition'),
+ matching: find.byWidgetPredicate((Widget w) => '${w.runtimeType}' == '_FadeUpwardsPageTransition'),
);
}
expect(Theme.of(tester.element(find.text('push'))).platform, debugDefaultTargetPlatformOverride);
- expect(findZoomPageTransition(), findsOneWidget);
+ expect(findFadeUpwardsPageTransition(), findsOneWidget);
await tester.tap(find.text('push'));
await tester.pumpAndSettle();
expect(find.text('page b'), findsOneWidget);
- expect(findZoomPageTransition(), findsOneWidget);
+ expect(findFadeUpwardsPageTransition(), findsOneWidget);
},
variant: TargetPlatformVariant.only(TargetPlatform.android),
skip: kIsWeb, // [intended] no default transitions on the web.
diff --git a/packages/flutter/test/material/user_accounts_drawer_header_test.dart b/packages/flutter/test/material/user_accounts_drawer_header_test.dart
index 9f6c5f07..3ff35a3 100644
--- a/packages/flutter/test/material/user_accounts_drawer_header_test.dart
+++ b/packages/flutter/test/material/user_accounts_drawer_header_test.dart
@@ -70,6 +70,12 @@
}
void main() {
+ // Find the exact transform which is the descendant of [UserAccountsDrawerHeader].
+ final Finder findTransform = find.descendant(
+ of: find.byType(UserAccountsDrawerHeader),
+ matching: find.byType(Transform),
+ );
+
testWidgets('UserAccountsDrawerHeader test', (WidgetTester tester) async {
await pumpTestWidget(tester);
@@ -127,7 +133,7 @@
testWidgets('UserAccountsDrawerHeader icon rotation test', (WidgetTester tester) async {
await pumpTestWidget(tester);
- Transform transformWidget = tester.firstWidget(find.byType(Transform));
+ Transform transformWidget = tester.firstWidget(findTransform);
// Icon is right side up.
expect(transformWidget.transform.getRotation()[0], 1.0);
@@ -140,7 +146,7 @@
await tester.pumpAndSettle();
await tester.pump();
- transformWidget = tester.firstWidget(find.byType(Transform));
+ transformWidget = tester.firstWidget(findTransform);
// Icon has rotated 180 degrees.
expect(transformWidget.transform.getRotation()[0], -1.0);
@@ -153,7 +159,7 @@
await tester.pumpAndSettle();
await tester.pump();
- transformWidget = tester.firstWidget(find.byType(Transform));
+ transformWidget = tester.firstWidget(findTransform);
// Icon has rotated 180 degrees back to the original position.
expect(transformWidget.transform.getRotation()[0], 1.0);
@@ -178,7 +184,7 @@
),
));
- Transform transformWidget = tester.firstWidget(find.byType(Transform));
+ Transform transformWidget = tester.firstWidget(findTransform);
// Icon is right side up.
expect(transformWidget.transform.getRotation()[0], 1.0);
@@ -189,7 +195,7 @@
expect(tester.hasRunningAnimations, isFalse);
expect(await tester.pumpAndSettle(), 1);
- transformWidget = tester.firstWidget(find.byType(Transform));
+ transformWidget = tester.firstWidget(findTransform);
// Icon has not rotated.
expect(transformWidget.transform.getRotation()[0], 1.0);
@@ -198,7 +204,7 @@
testWidgets('UserAccountsDrawerHeader icon rotation test speeeeeedy', (WidgetTester tester) async {
await pumpTestWidget(tester);
- Transform transformWidget = tester.firstWidget(find.byType(Transform));
+ Transform transformWidget = tester.firstWidget(findTransform);
// Icon is right side up.
expect(transformWidget.transform.getRotation()[0], 1.0);
@@ -230,7 +236,7 @@
await tester.pumpAndSettle();
await tester.pump();
- transformWidget = tester.firstWidget(find.byType(Transform));
+ transformWidget = tester.firstWidget(findTransform);
// Icon has rotated 180 degrees back to the original position.
expect(transformWidget.transform.getRotation()[0], 1.0);
diff --git a/packages/flutter/test/widgets/heroes_test.dart b/packages/flutter/test/widgets/heroes_test.dart
index b194c0e..345d4c4 100644
--- a/packages/flutter/test/widgets/heroes_test.dart
+++ b/packages/flutter/test/widgets/heroes_test.dart
@@ -728,7 +728,14 @@
testWidgets('Hero pop transition interrupted by a push', (WidgetTester tester) async {
await tester.pumpWidget(
- MaterialApp(routes: routes),
+ MaterialApp(
+ routes: routes,
+ theme: ThemeData(pageTransitionsTheme: const PageTransitionsTheme(
+ builders: <TargetPlatform, PageTransitionsBuilder>{
+ TargetPlatform.android: FadeUpwardsPageTransitionsBuilder(),
+ },
+ )),
+ ),
);
// Pushes MaterialPageRoute '/two'.
diff --git a/packages/flutter_tools/test/integration.shard/overall_experience_test.dart b/packages/flutter_tools/test/integration.shard/overall_experience_test.dart
index 1dd1749..ed8555c 100644
--- a/packages/flutter_tools/test/integration.shard/overall_experience_test.dart
+++ b/packages/flutter_tools/test/integration.shard/overall_experience_test.dart
@@ -533,7 +533,7 @@
matches(RegExp(r'^The specific RenderFlex in question is: RenderFlex#..... OVERFLOWING:$')),
startsWith(' creator: Row ← Test ← '),
contains(' ← '),
- endsWith(' ← ⋯'),
+ endsWith(' ⋯'),
' parentData: <none> (can use size)',
' constraints: BoxConstraints(w=800.0, h=600.0)',
' size: Size(800.0, 600.0)',
