Reverts "Reland 3: [CupertinoActionSheet] Match colors to native (#150386)" (#150413)
Reverts: flutter/flutter#150386
Initiated by: andrewkolos
Reason for reverting: the Mac framework_tests_impeller check has been failing (due to golden test failures) since this PR (though it occasionally passes after retry). Taking a brief look at this PR, it looks like there's been some troubles with goldens in the past (though the recent failures appear very different to past ones). Regardless, I'm taking a shot at getting the tree green again by reverting this. Apologies i
Original PR Author: dkwingsmt
Reviewed By: {chunhtai}
This change reverts the following previous change:
Relands https://github.com/flutter/flutter/pull/149568 (first attempt) or https://github.com/flutter/flutter/pull/150129 (latest attempt), which was reverted in https://github.com/flutter/flutter/pull/150142 due to unverified golden tests post-commit from recent infra issues.
No code is changed from https://github.com/flutter/flutter/pull/150129.
The relevant golden files have been resubmitted in https://github.com/flutter/flutter/pull/150219. I expect these files to appear in the golden file checker in this PR (which will hint that this PR is safe.) Fingers crossed.diff --git a/packages/flutter/lib/src/cupertino/dialog.dart b/packages/flutter/lib/src/cupertino/dialog.dart
index 15cd34a..c482b5f 100644
--- a/packages/flutter/lib/src/cupertino/dialog.dart
+++ b/packages/flutter/lib/src/cupertino/dialog.dart
@@ -65,9 +65,8 @@
inherit: false,
fontSize: 13.0,
fontWeight: FontWeight.w400,
+ color: _kActionSheetContentTextColor,
textBaseline: TextBaseline.alphabetic,
- // The `color` is configured by _kActionSheetContentTextColor to be dynamic on
- // context.
);
// Generic constants shared between Dialog and ActionSheet.
@@ -105,53 +104,35 @@
// 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 = CupertinoDynamicColor.withBrightness(
- color: Color(0xCAE0E0E0),
- darkColor: Color(0xC1515151),
-);
-
-const Color _kActionSheetCancelColor = CupertinoDynamicColor.withBrightness(
- color: Color(0xFFFFFFFF),
- darkColor: Color(0xFF2C2C2C),
-);
const Color _kActionSheetCancelPressedColor = CupertinoDynamicColor.withBrightness(
color: Color(0xFFECECEC),
- darkColor: Color(0xFF494949),
+ 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.
+// Extracted from https://developer.apple.com/design/resources/.
const Color _kActionSheetBackgroundColor = CupertinoDynamicColor.withBrightness(
- color: Color(0xC8FCFCFC),
- darkColor: Color(0xBE292929),
+ 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 = CupertinoDynamicColor.withBrightness(
- color: Color(0x851D1D1D),
- darkColor: Color(0x96F1F1F1),
-);
+// 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 = CupertinoDynamicColor.withBrightness(
- color: Color(0xD4C9C9C9),
- darkColor: Color(0xD57D7D7D),
-);
+// 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
@@ -860,9 +841,6 @@
Widget _buildContent(BuildContext context) {
final List<Widget> content = <Widget>[];
- final TextStyle textStyle = _kActionSheetContentStyle.copyWith(
- color: CupertinoDynamicColor.resolve(_kActionSheetContentTextColor, context),
- );
if (hasContent) {
final Widget titleSection = _CupertinoAlertContentSection(
title: widget.title,
@@ -881,11 +859,11 @@
top: widget.title == null ? _kActionSheetContentVerticalPadding : 0.0,
),
titleTextStyle: widget.message == null
- ? textStyle
- : textStyle.copyWith(fontWeight: FontWeight.w600),
+ ? _kActionSheetContentStyle
+ : _kActionSheetContentStyle.copyWith(fontWeight: FontWeight.w600),
messageTextStyle: widget.title == null
- ? textStyle.copyWith(fontWeight: FontWeight.w600)
- : textStyle,
+ ? _kActionSheetContentStyle.copyWith(fontWeight: FontWeight.w600)
+ : _kActionSheetContentStyle,
additionalPaddingBetweenTitleAndMessage: const EdgeInsets.only(top: 4.0),
);
content.add(Flexible(child: titleSection));
@@ -930,7 +908,7 @@
hasContent: hasContent,
contentSection: Builder(builder: _buildContent),
actions: widget.actions,
- dividerColor: CupertinoDynamicColor.resolve(_kActionSheetButtonDividerColor, context),
+ dividerColor: _kActionSheetButtonDividerColor,
),
),
),
@@ -1137,19 +1115,19 @@
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,
@@ -2291,7 +2269,7 @@
: _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,
);
@@ -2305,7 +2283,7 @@
: _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;
}
diff --git a/packages/flutter/test/cupertino/action_sheet_test.dart b/packages/flutter/test/cupertino/action_sheet_test.dart
index 24904fa..0f272d8 100644
--- a/packages/flutter/test/cupertino/action_sheet_test.dart
+++ b/packages/flutter/test/cupertino/action_sheet_test.dart
@@ -18,71 +18,6 @@
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')));
- await tester.pumpAndSettle();
- // 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')));
- await tester.pumpAndSettle();
- // 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(
@@ -1741,50 +1676,6 @@
);
}
-// 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,
