commit c6c443083c81f6acd55a95b4737e2812e94083c3
author Kevin Chisholm <kevinjchisholm@google.com> Tue Aug 23 22:24:52 2022 -0500
committer GitHub <noreply@github.com> Tue Aug 23 22:24:52 2022 -0500
tree b18fdbd527b2a60b691f7400a905e6c7738b11b4
parent c86e0f6b6ff697c54852de49ee20ac9d3fc9ad38

Revert "Fixed leading button size on app bar (#110043)" (#110103) (#110134)

This reverts commit 7e33cd5ef30b9960d5c8d6fc75b42dabb7ec1f2f.

Co-authored-by: Qun Cheng <36861262+QuncCccccc@users.noreply.github.com>

packages/flutter/lib/src/material/app_bar.dart

diff --git a/packages/flutter/lib/src/material/app_bar.dart b/packages/flutter/lib/src/material/app_bar.dart
index 9d93fa9..b690185 100644
--- a/packages/flutter/lib/src/material/app_bar.dart
+++ b/packages/flutter/lib/src/material/app_bar.dart
@@ -998,16 +998,11 @@
       }
     }
     if (leading != null) {
-      leading = theme.useMaterial3
-        ? Container(
-          alignment: Alignment.center,
-          constraints: BoxConstraints.tightFor(width: widget.leadingWidth ?? _kLeadingWidth),
-          child: leading,
-        )
-        : ConstrainedBox(
-          constraints: BoxConstraints.tightFor(width: widget.leadingWidth ?? _kLeadingWidth),
-          child: leading,
-        );
+      leading = Container(
+        alignment: Alignment.center,
+        constraints: BoxConstraints.tightFor(width: widget.leadingWidth ?? _kLeadingWidth),
+        child: leading,
+      );
     }
 
     Widget? title = widget.title;

packages/flutter/test/material/app_bar_test.dart

diff --git a/packages/flutter/test/material/app_bar_test.dart b/packages/flutter/test/material/app_bar_test.dart
index 5074100..aec7e26 100644
--- a/packages/flutter/test/material/app_bar_test.dart
+++ b/packages/flutter/test/material/app_bar_test.dart
@@ -694,11 +694,9 @@
   });
 
   testWidgets('leading button extends to edge and is square', (WidgetTester tester) async {
-    final ThemeData themeData = ThemeData(platform: TargetPlatform.android);
-    final bool material3 = themeData.useMaterial3;
     await tester.pumpWidget(
       MaterialApp(
-        theme: themeData,
+        theme: ThemeData(platform: TargetPlatform.android),
         home: Scaffold(
           appBar: AppBar(
             title: const Text('X'),
@@ -708,9 +706,9 @@
       ),
     );
 
-    final Finder hamburger = find.byType(IconButton);
-    expect(tester.getTopLeft(hamburger), material3 ? const Offset(4.0, 4.0) : Offset.zero);
-    expect(tester.getSize(hamburger), material3 ? const Size(48.0, 48.0) : const Size(56.0, 56.0));
+    final Finder hamburger = find.byTooltip('Open navigation menu');
+    expect(tester.getTopLeft(hamburger), const Offset(4.0, 4.0));
+    expect(tester.getSize(hamburger), const Size(48.0, 48.0));
   });
 
   testWidgets('test action is 4dp from edge and 48dp min', (WidgetTester tester) async {