Reverts "Reland: [CupertinoActionSheet] Match colors to native (flutter#149568) (flutter#150015)" (flutter#150021)

Reverts: flutter#150015
Initiated by: vashworth
Reason for reverting: Still failing tree on goldens
Original PR Author: dkwingsmt

Reviewed By: {chunhtai}

This change reverts the following previous change:
Relands flutter#149568, which was reverted in flutter#149998 due to unverified golden tests post-commit. (Honestly I don't know what happened but I guess resubmitting should resolve it.)

No code is changed.

Author: auto-submit[bot]

packages/flutter/lib/src/cupertino/dialog.dart

@@ -104,35 +104,35 @@ const Color _kDialogColor = CupertinoDynamicColor.withBrightness(
 // Translucent light gray that is painted on top of the blurred backdrop as the
 // background color of a pressed button.
 // Eyeballed from iOS 13 beta simulator.
-const Color _kDialogPressedColor = CupertinoDynamicColor.withBrightness(
+const Color _kPressedColor = CupertinoDynamicColor.withBrightness(
   color: Color(0xFFE1E1E1),
   darkColor: Color(0xFF2E2E2E),
 );
 
-// Translucent light gray that is painted on top of the blurred backdrop as the
-// background color of a pressed button.
-// Eyeballed from iOS 17 simulator.
-const Color _kActionSheetPressedColor = Color(0xCAE0E0E0);
-
-const Color _kActionSheetCancelColor = Color(0xFFFFFFFF);
-const Color _kActionSheetCancelPressedColor = Color(0xFFECECEC);
+const Color _kActionSheetCancelPressedColor = CupertinoDynamicColor.withBrightness(
+  color: Color(0xFFECECEC),
+  darkColor: Color(0xFF49494B),
+);
 
 // Translucent, very light gray that is painted on top of the blurred backdrop
 // as the action sheet's background color.
 // TODO(LongCatIsLooong): https://github.com/flutter/flutter/issues/39272. Use
 // System Materials once we have them.
-// Eyeballed from iOS 17 simulator.
-const Color _kActionSheetBackgroundColor = Color(0xC8FCFCFC);
+// Extracted from https://developer.apple.com/design/resources/.
+const Color _kActionSheetBackgroundColor = CupertinoDynamicColor.withBrightness(
+  color: Color(0xC7F9F9F9),
+  darkColor: Color(0xC7252525),
+);
 
 // The gray color used for text that appears in the title area.
-// Eyeballed from iOS 17 simulator.
-const Color _kActionSheetContentTextColor = Color(0x851D1D1D);
+// Extracted from https://developer.apple.com/design/resources/.
+const Color _kActionSheetContentTextColor = Color(0xFF8F8F8F);
 
 // Translucent gray that is painted on top of the blurred backdrop in the gap
 // areas between the content section and actions section, as well as between
 // buttons.
-// Eyeballed from iOS 17 simulator.
-const Color _kActionSheetButtonDividerColor = Color(0xD4C9C9C9);
+// Eye-balled from iOS 13 beta simulator.
+const Color _kActionSheetButtonDividerColor = _kActionSheetContentTextColor;
 
 // The alert dialog layout policy changes depending on whether the user is using
 // a "regular" font size vs a "large" font size. This is a spectrum. There are
@@ -1115,19 +1115,19 @@ class _ActionSheetButtonBackgroundState extends State<_ActionSheetButtonBackgrou
     BorderRadius? borderRadius;
     if (!widget.isCancel) {
       backgroundColor = isBeingPressed
-        ? _kActionSheetPressedColor
-        : _kActionSheetBackgroundColor;
+        ? _kPressedColor
+        : CupertinoDynamicColor.resolve(_kActionSheetBackgroundColor, context);
     } else {
       backgroundColor = isBeingPressed
-        ? _kActionSheetCancelPressedColor
-        : _kActionSheetCancelColor;
+          ? _kActionSheetCancelPressedColor
+        : CupertinoColors.secondarySystemGroupedBackground;
       borderRadius = const BorderRadius.all(Radius.circular(_kCornerRadius));
     }
     return MetaData(
       metaData: this,
       child: Container(
         decoration: BoxDecoration(
-          color: CupertinoDynamicColor.resolve(backgroundColor, context),
+          color: backgroundColor,
           borderRadius: borderRadius,
         ),
         child: widget.child,
@@ -2269,7 +2269,7 @@ class _CupertinoDialogActionsRenderWidget extends MultiChildRenderObjectWidget {
               : _kCupertinoDialogWidth,
       dividerThickness: _dividerThickness,
       dialogColor: CupertinoDynamicColor.resolve(_kDialogColor, context),
-      dialogPressedColor: CupertinoDynamicColor.resolve(_kDialogPressedColor, context),
+      dialogPressedColor: CupertinoDynamicColor.resolve(_kPressedColor, context),
       dividerColor: CupertinoDynamicColor.resolve(CupertinoColors.separator, context),
       hasCancelButton: _hasCancelButton,
     );
@@ -2283,7 +2283,7 @@ class _CupertinoDialogActionsRenderWidget extends MultiChildRenderObjectWidget {
             : _kCupertinoDialogWidth
       ..dividerThickness = _dividerThickness
       ..dialogColor = CupertinoDynamicColor.resolve(_kDialogColor, context)
-      ..dialogPressedColor = CupertinoDynamicColor.resolve(_kDialogPressedColor, context)
+      ..dialogPressedColor = CupertinoDynamicColor.resolve(_kPressedColor, context)
       ..dividerColor = CupertinoDynamicColor.resolve(CupertinoColors.separator, context)
       ..hasCancelButton = _hasCancelButton;
   }

packages/flutter/test/cupertino/action_sheet_test.dart

@@ -18,69 +18,6 @@ import 'package:flutter_test/flutter_test.dart';
 import '../widgets/semantics_tester.dart';
 
 void main() {
-  testWidgets('Overall looks correctly under light theme', (WidgetTester tester) async {
-    await tester.pumpWidget(
-      TestScaffoldApp(
-        theme: const CupertinoThemeData(brightness: Brightness.light),
-        actionSheet: CupertinoActionSheet(
-          message: const Text('The title'),
-          actions: <Widget>[
-            CupertinoActionSheetAction(child: const Text('One'), onPressed: () {}),
-            CupertinoActionSheetAction(child: const Text('Two'), onPressed: () {}),
-          ],
-          cancelButton: CupertinoActionSheetAction(child: const Text('Cancel'), onPressed: () {}),
-        ),
-      ),
-    );
-
-    await tester.tap(find.text('Go'));
-    await tester.pumpAndSettle();
-
-    final TestGesture gesture = await tester.startGesture(tester.getCenter(find.text('One')));
-    // This golden file also verifies the structure of an action sheet that
-    // has a message, no title, and no overscroll for any sections (in contrast
-    // to cupertinoActionSheet.dark-theme.png).
-    await expectLater(
-      find.byType(CupertinoApp),
-      matchesGoldenFile('cupertinoActionSheet.overall-light-theme.png'),
-    );
-
-    await gesture.up();
-  });
-
-  testWidgets('Overall looks correctly under dark theme', (WidgetTester tester) async {
-    await tester.pumpWidget(
-      TestScaffoldApp(
-        theme: const CupertinoThemeData(brightness: Brightness.dark),
-        actionSheet: CupertinoActionSheet(
-          title: const Text('The title'),
-          message: const Text('The message'),
-          actions: List<Widget>.generate(20, (int i) =>
-            CupertinoActionSheetAction(
-              onPressed: () {},
-              child: Text('Button $i'),
-            ),
-          ),
-          cancelButton: CupertinoActionSheetAction(child: const Text('Cancel'), onPressed: () {}),
-        ),
-      ),
-    );
-
-    await tester.tap(find.text('Go'));
-    await tester.pumpAndSettle();
-
-    final TestGesture gesture = await tester.startGesture(tester.getCenter(find.text('Button 0')));
-    // This golden file also verifies the structure of an action sheet that
-    // has both a message and a title, and an overscrolled action section (in
-    // contrast to cupertinoActionSheet.light-theme.png).
-    await expectLater(
-      find.byType(CupertinoApp),
-      matchesGoldenFile('cupertinoActionSheet.overall-dark-theme.png'),
-    );
-
-    await gesture.up();
-  });
-
   testWidgets('Verify that a tap on modal barrier dismisses an action sheet', (WidgetTester tester) async {
     await tester.pumpWidget(
       createAppWithButtonThatLaunchesActionSheet(
@@ -1738,50 +1675,6 @@ Widget createAppWithButtonThatLaunchesActionSheet(Widget actionSheet) {
   );
 }
 
-// Shows an app that has a button with text "Go", and clicking this button
-// displays the `actionSheet` and hides the button.
-//
-// The `theme` will be applied to the app and determines the background.
-class TestScaffoldApp extends StatefulWidget {
-  const TestScaffoldApp({super.key, required this.theme, required this.actionSheet});
-  final CupertinoThemeData theme;
-  final Widget actionSheet;
-
-  @override
-  TestScaffoldAppState createState() => TestScaffoldAppState();
-}
-
-class TestScaffoldAppState extends State<TestScaffoldApp> {
-  bool _pressedButton = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return CupertinoApp(
-      theme: widget.theme,
-      home: Builder(builder: (BuildContext context) =>
-        CupertinoPageScaffold(
-          child: Center(
-            child: _pressedButton ? Container() : CupertinoButton(
-              onPressed: () {
-                setState(() {
-                  _pressedButton = true;
-                });
-                showCupertinoModalPopup<void>(
-                  context: context,
-                  builder: (BuildContext context) {
-                    return widget.actionSheet;
-                  },
-                );
-              },
-              child: const Text('Go'),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
 Widget boilerplate(Widget child) {
   return Directionality(
     textDirection: TextDirection.ltr,