diff --git a/examples/api/lib/material/app_bar/app_bar.1.dart b/examples/api/lib/material/app_bar/app_bar.1.dart index 2f4eb93cba4..9ded23bf0f8 100644 --- a/examples/api/lib/material/app_bar/app_bar.1.dart +++ b/examples/api/lib/material/app_bar/app_bar.1.dart @@ -98,7 +98,7 @@ class _AppBarExampleState extends State { label: const Text('shadow color'), ), const SizedBox(width: 5), - ElevatedButton( + ElevatedButton.icon( onPressed: () { if (scrolledUnderElevation == null) { setState(() { @@ -111,7 +111,8 @@ class _AppBarExampleState extends State { }); } }, - child: Text( + icon: const Icon(Icons.add), + label: Text( 'scrolledUnderElevation: ${scrolledUnderElevation ?? 'default'}', ), ), diff --git a/packages/flutter/lib/src/material/elevated_button.dart b/packages/flutter/lib/src/material/elevated_button.dart index 7c33379d40e..6665fdffe2c 100644 --- a/packages/flutter/lib/src/material/elevated_button.dart +++ b/packages/flutter/lib/src/material/elevated_button.dart @@ -333,10 +333,10 @@ class ElevatedButton extends ButtonStyleButton { /// * hovered - 3 /// * focused or pressed - 1 /// * `padding` - /// * `textScaleFactor <= 1` - horizontal(24) - /// * `1 < textScaleFactor <= 2` - lerp(horizontal(24), horizontal(12)) - /// * `2 < textScaleFactor <= 3` - lerp(horizontal(12), horizontal(6)) - /// * `3 < textScaleFactor` - horizontal(6) + /// * `textScaleFactor <= 1` - horizontal(16) + /// * `1 < textScaleFactor <= 2` - lerp(horizontal(16), horizontal(8)) + /// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4)) + /// * `3 < textScaleFactor` - horizontal(4) /// * `minimumSize` - Size(64, 40) /// * `fixedSize` - null /// * `maximumSize` - Size.infinite @@ -351,10 +351,6 @@ class ElevatedButton extends ButtonStyleButton { /// * `enableFeedback` - true /// * `alignment` - Alignment.center /// * `splashFactory` - Theme.splashFactory - /// - /// For the [ElevatedButton.icon] factory, the start (generally the left) value of - /// [padding] is reduced from 24 to 16. - @override ButtonStyle defaultStyleOf(BuildContext context) { final ThemeData theme = Theme.of(context); @@ -394,12 +390,10 @@ class ElevatedButton extends ButtonStyleButton { } EdgeInsetsGeometry _scaledPadding(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; - final double padding1x = useMaterial3 ? 24.0 : 16.0; return ButtonStyleButton.scaledPadding( - EdgeInsets.symmetric(horizontal: padding1x), - EdgeInsets.symmetric(horizontal: padding1x / 2), - EdgeInsets.symmetric(horizontal: padding1x / 2 / 2), + const EdgeInsets.symmetric(horizontal: 16), + const EdgeInsets.symmetric(horizontal: 8), + const EdgeInsets.symmetric(horizontal: 4), MediaQuery.textScaleFactorOf(context), ); } @@ -502,13 +496,7 @@ class _ElevatedButtonWithIcon extends ElevatedButton { @override ButtonStyle defaultStyleOf(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; - final EdgeInsetsGeometry scaledPadding = useMaterial3 ? ButtonStyleButton.scaledPadding( - const EdgeInsetsDirectional.fromSTEB(16, 0, 24, 0), - const EdgeInsetsDirectional.fromSTEB(8, 0, 12, 0), - const EdgeInsetsDirectional.fromSTEB(4, 0, 6, 0), - MediaQuery.textScaleFactorOf(context), - ) : ButtonStyleButton.scaledPadding( + final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding( const EdgeInsetsDirectional.fromSTEB(12, 0, 16, 0), const EdgeInsets.symmetric(horizontal: 8), const EdgeInsetsDirectional.fromSTEB(8, 0, 4, 0), diff --git a/packages/flutter/lib/src/material/filled_button.dart b/packages/flutter/lib/src/material/filled_button.dart index b466fd858fe..e4ecb99e6b8 100644 --- a/packages/flutter/lib/src/material/filled_button.dart +++ b/packages/flutter/lib/src/material/filled_button.dart @@ -345,50 +345,6 @@ class FilledButton extends ButtonStyleButton { /// shape's [OutlinedBorder.side]. Typically the default value of an /// [OutlinedBorder]'s side is [BorderSide.none], so an outline is not drawn. /// - /// ## Material 3 defaults - /// - /// If [ThemeData.useMaterial3] is set to true the following defaults will - /// be used: - /// - /// * `textStyle` - Theme.textTheme.labelLarge - /// * `backgroundColor` - /// * disabled - Theme.colorScheme.onSurface(0.12) - /// * others - Theme.colorScheme.secondaryContainer - /// * `foregroundColor` - /// * disabled - Theme.colorScheme.onSurface(0.38) - /// * others - Theme.colorScheme.onSecondaryContainer - /// * `overlayColor` - /// * hovered - Theme.colorScheme.onSecondaryContainer(0.08) - /// * focused or pressed - Theme.colorScheme.onSecondaryContainer(0.12) - /// * `shadowColor` - Theme.colorScheme.shadow - /// * `surfaceTintColor` - Colors.transparent - /// * `elevation` - /// * disabled - 0 - /// * default - 1 - /// * hovered - 3 - /// * focused or pressed - 1 - /// * `padding` - /// * `textScaleFactor <= 1` - horizontal(24) - /// * `1 < textScaleFactor <= 2` - lerp(horizontal(24), horizontal(12)) - /// * `2 < textScaleFactor <= 3` - lerp(horizontal(12), horizontal(6)) - /// * `3 < textScaleFactor` - horizontal(6) - /// * `minimumSize` - Size(64, 40) - /// * `fixedSize` - null - /// * `maximumSize` - Size.infinite - /// * `side` - null - /// * `shape` - StadiumBorder() - /// * `mouseCursor` - /// * disabled - SystemMouseCursors.basic - /// * others - SystemMouseCursors.click - /// * `visualDensity` - Theme.visualDensity - /// * `tapTargetSize` - Theme.materialTapTargetSize - /// * `animationDuration` - kThemeChangeDuration - /// * `enableFeedback` - true - /// * `alignment` - Alignment.center - /// * `splashFactory` - Theme.splashFactory - /// - /// For the [FilledButton.icon] factory, the start (generally the left) value of - /// [padding] is reduced from 24 to 16. @override ButtonStyle defaultStyleOf(BuildContext context) { switch (_variant) { @@ -408,12 +364,10 @@ class FilledButton extends ButtonStyleButton { } EdgeInsetsGeometry _scaledPadding(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; - final double padding1x = useMaterial3 ? 24.0 : 16.0; return ButtonStyleButton.scaledPadding( - EdgeInsets.symmetric(horizontal: padding1x), - EdgeInsets.symmetric(horizontal: padding1x / 2), - EdgeInsets.symmetric(horizontal: padding1x / 2 / 2), + const EdgeInsets.symmetric(horizontal: 16), + const EdgeInsets.symmetric(horizontal: 8), + const EdgeInsets.symmetric(horizontal: 4), MediaQuery.textScaleFactorOf(context), ); } @@ -513,13 +467,7 @@ class _FilledButtonWithIcon extends FilledButton { @override ButtonStyle defaultStyleOf(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; - final EdgeInsetsGeometry scaledPadding = useMaterial3 ? ButtonStyleButton.scaledPadding( - const EdgeInsetsDirectional.fromSTEB(16, 0, 24, 0), - const EdgeInsetsDirectional.fromSTEB(8, 0, 12, 0), - const EdgeInsetsDirectional.fromSTEB(4, 0, 6, 0), - MediaQuery.textScaleFactorOf(context), - ) : ButtonStyleButton.scaledPadding( + final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding( const EdgeInsetsDirectional.fromSTEB(12, 0, 16, 0), const EdgeInsets.symmetric(horizontal: 8), const EdgeInsetsDirectional.fromSTEB(8, 0, 4, 0), diff --git a/packages/flutter/lib/src/material/outlined_button.dart b/packages/flutter/lib/src/material/outlined_button.dart index cec8ff1740c..5b77d8cd0d0 100644 --- a/packages/flutter/lib/src/material/outlined_button.dart +++ b/packages/flutter/lib/src/material/outlined_button.dart @@ -287,10 +287,10 @@ class OutlinedButton extends ButtonStyleButton { /// * `surfaceTintColor` - null /// * `elevation` - 0 /// * `padding` - /// * `textScaleFactor <= 1` - horizontal(24) - /// * `1 < textScaleFactor <= 2` - lerp(horizontal(24), horizontal(12)) - /// * `2 < textScaleFactor <= 3` - lerp(horizontal(12), horizontal(6)) - /// * `3 < textScaleFactor` - horizontal(6) + /// * `textScaleFactor <= 1` - horizontal(16) + /// * `1 < textScaleFactor <= 2` - lerp(horizontal(16), horizontal(8)) + /// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4)) + /// * `3 < textScaleFactor` - horizontal(4) /// * `minimumSize` - Size(64, 40) /// * `fixedSize` - null /// * `maximumSize` - Size.infinite @@ -307,9 +307,6 @@ class OutlinedButton extends ButtonStyleButton { /// * `enableFeedback` - true /// * `alignment` - Alignment.center /// * `splashFactory` - Theme.splashFactory - /// - /// For the [OutlinedButton.icon] factory, the start (generally the left) value of - /// [padding] is reduced from 24 to 16. @override ButtonStyle defaultStyleOf(BuildContext context) { final ThemeData theme = Theme.of(context); @@ -350,12 +347,10 @@ class OutlinedButton extends ButtonStyleButton { } EdgeInsetsGeometry _scaledPadding(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; - final double padding1x = useMaterial3 ? 24.0 : 16.0; return ButtonStyleButton.scaledPadding( - EdgeInsets.symmetric(horizontal: padding1x), - EdgeInsets.symmetric(horizontal: padding1x / 2), - EdgeInsets.symmetric(horizontal: padding1x / 2 / 2), + const EdgeInsets.symmetric(horizontal: 16), + const EdgeInsets.symmetric(horizontal: 8), + const EdgeInsets.symmetric(horizontal: 4), MediaQuery.textScaleFactorOf(context), ); } @@ -429,23 +424,6 @@ class _OutlinedButtonWithIcon extends OutlinedButton { clipBehavior: clipBehavior ?? Clip.none, child: _OutlinedButtonWithIconChild(icon: icon, label: label), ); - - @override - ButtonStyle defaultStyleOf(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; - if (!useMaterial3) { - return super.defaultStyleOf(context); - } - final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding( - const EdgeInsetsDirectional.fromSTEB(16, 0, 24, 0), - const EdgeInsetsDirectional.fromSTEB(8, 0, 12, 0), - const EdgeInsetsDirectional.fromSTEB(4, 0, 6, 0), - MediaQuery.textScaleFactorOf(context), - ); - return super.defaultStyleOf(context).copyWith( - padding: MaterialStatePropertyAll(scaledPadding), - ); - } } class _OutlinedButtonWithIconChild extends StatelessWidget { diff --git a/packages/flutter/lib/src/material/text_button.dart b/packages/flutter/lib/src/material/text_button.dart index 838a5d4c17a..938726de557 100644 --- a/packages/flutter/lib/src/material/text_button.dart +++ b/packages/flutter/lib/src/material/text_button.dart @@ -270,7 +270,7 @@ class TextButton extends ButtonStyleButton { /// * `shadowColor` - Theme.shadowColor /// * `elevation` - 0 /// * `padding` - /// * `textScaleFactor <= 1` - (horizontal(12), vertical(8)) + /// * `textScaleFactor <= 1` - all(8) /// * `1 < textScaleFactor <= 2` - lerp(all(8), horizontal(8)) /// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4)) /// * `3 < textScaleFactor` - horizontal(4) @@ -320,7 +320,7 @@ class TextButton extends ButtonStyleButton { /// * `surfaceTintColor` - null /// * `elevation` - 0 /// * `padding` - /// * `textScaleFactor <= 1` - lerp(horizontal(12), horizontal(4)) + /// * `textScaleFactor <= 1` - all(8) /// * `1 < textScaleFactor <= 2` - lerp(all(8), horizontal(8)) /// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4)) /// * `3 < textScaleFactor` - horizontal(4) @@ -338,9 +338,6 @@ class TextButton extends ButtonStyleButton { /// * `enableFeedback` - true /// * `alignment` - Alignment.center /// * `splashFactory` - Theme.splashFactory - /// - /// For the [TextButton.icon] factory, the end (generally the right) value of - /// [padding] is increased from 12 to 16. /// {@endtemplate} @override ButtonStyle defaultStyleOf(BuildContext context) { @@ -381,9 +378,8 @@ class TextButton extends ButtonStyleButton { } EdgeInsetsGeometry _scaledPadding(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; return ButtonStyleButton.scaledPadding( - useMaterial3 ? const EdgeInsets.symmetric(horizontal: 12, vertical: 8) : const EdgeInsets.all(8), + const EdgeInsets.all(8), const EdgeInsets.symmetric(horizontal: 8), const EdgeInsets.symmetric(horizontal: 4), MediaQuery.textScaleFactorOf(context), @@ -495,9 +491,8 @@ class _TextButtonWithIcon extends TextButton { @override ButtonStyle defaultStyleOf(BuildContext context) { - final bool useMaterial3 = Theme.of(context).useMaterial3; final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding( - useMaterial3 ? const EdgeInsetsDirectional.fromSTEB(12, 8, 16, 8) : const EdgeInsets.all(8), + const EdgeInsets.all(8), const EdgeInsets.symmetric(horizontal: 4), const EdgeInsets.symmetric(horizontal: 4), MediaQuery.textScaleFactorOf(context), diff --git a/packages/flutter/test/material/elevated_button_test.dart b/packages/flutter/test/material/elevated_button_test.dart index 686fe9619b9..bb0d15f0d1f 100644 --- a/packages/flutter/test/material/elevated_button_test.dart +++ b/packages/flutter/test/material/elevated_button_test.dart @@ -1147,59 +1147,6 @@ void main() { expect(paddingWidget.padding, const EdgeInsets.all(22)); }); - testWidgets('M3 ElevatedButton has correct padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: ElevatedButton( - key: key, - onPressed: () {}, - child: const Text('ElevatedButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 24)); - }); - - testWidgets('M3 ElevatedButton.icon has correct padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: ElevatedButton.icon( - key: key, - icon: const Icon(Icons.favorite), - onPressed: () {}, - label: const Text('ElevatedButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 24.0, 0.0)); - }); - testWidgets('Elevated buttons animate elevation before color on disable', (WidgetTester tester) async { // This is a regression test for https://github.com/flutter/flutter/issues/387 diff --git a/packages/flutter/test/material/filled_button_test.dart b/packages/flutter/test/material/filled_button_test.dart index 235729d52b9..fefdb72d64f 100644 --- a/packages/flutter/test/material/filled_button_test.dart +++ b/packages/flutter/test/material/filled_button_test.dart @@ -1224,59 +1224,6 @@ void main() { expect(paddingWidget.padding, const EdgeInsets.all(22)); }); - testWidgets('M3 FilledButton has correct padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: ElevatedButton( - key: key, - onPressed: () {}, - child: const Text('FilledButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 24)); - }); - - testWidgets('M3 FilledButton.icon has correct padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: FilledButton.icon( - key: key, - icon: const Icon(Icons.favorite), - onPressed: () {}, - label: const Text('ElevatedButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 24.0, 0.0)); - }); - testWidgets('By default, FilledButton shape outline is defined by shape.side', (WidgetTester tester) async { const Color borderColor = Color(0xff4caf50); await tester.pumpWidget( diff --git a/packages/flutter/test/material/outlined_button_test.dart b/packages/flutter/test/material/outlined_button_test.dart index d53af3efbc4..0bfb6e5cf53 100644 --- a/packages/flutter/test/material/outlined_button_test.dart +++ b/packages/flutter/test/material/outlined_button_test.dart @@ -1388,59 +1388,6 @@ void main() { expect(paddingWidget.padding, const EdgeInsets.all(22)); }); - testWidgets('M3 OutlinedButton has correct padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: OutlinedButton( - key: key, - onPressed: () {}, - child: const Text('OutlinedButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 24)); - }); - - testWidgets('M3 OutlinedButton.icon has correct padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: OutlinedButton.icon( - key: key, - icon: const Icon(Icons.favorite), - onPressed: () {}, - label: const Text('OutlinedButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 24.0, 0.0)); - }); - testWidgets('Fixed size OutlinedButtons', (WidgetTester tester) async { await tester.pumpWidget( MaterialApp( diff --git a/packages/flutter/test/material/text_button_test.dart b/packages/flutter/test/material/text_button_test.dart index 224b4c631dd..17fd1029b49 100644 --- a/packages/flutter/test/material/text_button_test.dart +++ b/packages/flutter/test/material/text_button_test.dart @@ -1195,59 +1195,6 @@ void main() { expect(paddingWidget.padding, const EdgeInsets.all(22)); }); - testWidgets('M3 TextButton has correct default padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: TextButton( - key: key, - onPressed: () {}, - child: const Text('TextButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 12,vertical: 8)); - }); - - testWidgets('M3 TextButton.icon has correct default padding', (WidgetTester tester) async { - final Key key = UniqueKey(); - await tester.pumpWidget( - MaterialApp( - theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true), - home: Scaffold( - body: Center( - child: TextButton.icon( - key: key, - onPressed: () {}, - icon: const Icon(Icons.add), - label: const Text('TextButton'), - ), - ), - ), - ), - ); - - final Padding paddingWidget = tester.widget( - find.descendant( - of: find.byKey(key), - matching: find.byType(Padding), - ), - ); - expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(12, 8, 16, 8)); - }); - testWidgets('Fixed size TextButtons', (WidgetTester tester) async { await tester.pumpWidget( MaterialApp( diff --git a/packages/flutter/test/material/time_picker_test.dart b/packages/flutter/test/material/time_picker_test.dart index 630ab51cd20..3cf69b57dc1 100644 --- a/packages/flutter/test/material/time_picker_test.dart +++ b/packages/flutter/test/material/time_picker_test.dart @@ -589,17 +589,15 @@ void main() { case MaterialType.material2: expect(tester.getTopLeft(find.text(selectTimeString)), equals(const Offset(154, 155))); expect(tester.getBottomRight(find.text(selectTimeString)), equals(const Offset(281, 165))); - expect(tester.getBottomRight(find.text(okString)).dx, 644); - expect(tester.getBottomLeft(find.text(okString)).dx, 616); - expect(tester.getBottomRight(find.text(cancelString)).dx, 582); break; case MaterialType.material3: expect(tester.getTopLeft(find.text(selectTimeString)), equals(const Offset(138, 129))); expect(tester.getBottomRight(find.text(selectTimeString)), equals(const Offset(292.0, 143.0))); - expect(tester.getBottomLeft(find.text(okString)).dx, 616); - expect(tester.getBottomRight(find.text(cancelString)).dx, 578); break; } + expect(tester.getBottomRight(find.text(okString)).dx, 644); + expect(tester.getBottomLeft(find.text(okString)).dx, 616); + expect(tester.getBottomRight(find.text(cancelString)).dx, 582); await tester.tap(find.text(okString)); await tester.pumpAndSettle(); @@ -612,18 +610,15 @@ void main() { case MaterialType.material2: expect(tester.getTopLeft(find.text(selectTimeString)), equals(const Offset(519, 155))); expect(tester.getBottomRight(find.text(selectTimeString)), equals(const Offset(646, 165))); - expect(tester.getBottomLeft(find.text(okString)).dx, 156); - expect(tester.getBottomRight(find.text(okString)).dx, 184); - expect(tester.getBottomLeft(find.text(cancelString)).dx, 218); break; case MaterialType.material3: expect(tester.getTopLeft(find.text(selectTimeString)), equals(const Offset(508, 129))); expect(tester.getBottomRight(find.text(selectTimeString)), equals(const Offset(662, 143))); - expect(tester.getBottomLeft(find.text(okString)).dx, 156); - expect(tester.getBottomRight(find.text(okString)).dx, 184); - expect(tester.getBottomLeft(find.text(cancelString)).dx, 222); break; } + expect(tester.getBottomLeft(find.text(okString)).dx, 156); + expect(tester.getBottomRight(find.text(okString)).dx, 184); + expect(tester.getBottomLeft(find.text(cancelString)).dx, 218); await tester.tap(find.text(okString)); await tester.pumpAndSettle();