diff --git a/packages/flutter/lib/src/cupertino/switch.dart b/packages/flutter/lib/src/cupertino/switch.dart index 7c0a1957f3d73..0e76ace69325b 100644 --- a/packages/flutter/lib/src/cupertino/switch.dart +++ b/packages/flutter/lib/src/cupertino/switch.dart @@ -74,8 +74,6 @@ class CupertinoSwitch extends StatefulWidget { this.thumbColor, this.applyTheme, this.focusColor, - this.onLabelColor, - this.offLabelColor, this.focusNode, this.onFocusChange, this.autofocus = false, @@ -132,17 +130,6 @@ class CupertinoSwitch extends StatefulWidget { /// Defaults to a slightly transparent [activeColor]. final Color? focusColor; - /// The color to use for the accessibility label when the switch is on. - /// - /// Defaults to [CupertinoColors.white] when null. - final Color? onLabelColor; - - /// The color to use for the accessibility label when the switch is off. - /// - /// Defaults to [Color.fromARGB(255, 179, 179, 179)] - /// (or [Color.fromARGB(255, 255, 255, 255)] in high contrast) when null. - final Color? offLabelColor; - /// {@macro flutter.widgets.Focus.focusNode} final FocusNode? focusNode; @@ -367,19 +354,6 @@ class _CupertinoSwitchState extends State with TickerProviderSt ?? CupertinoColors.systemGreen, context, ); - final (Color onLabelColor, Color offLabelColor)? onOffLabelColors = - MediaQuery.onOffSwitchLabelsOf(context) - ? ( - CupertinoDynamicColor.resolve( - widget.onLabelColor ?? CupertinoColors.white, - context, - ), - CupertinoDynamicColor.resolve( - widget.offLabelColor ?? _kOffLabelColor, - context, - ), - ) - : null; if (needsPositionAnimation) { _resumePositionAnimation(); } @@ -412,7 +386,6 @@ class _CupertinoSwitchState extends State with TickerProviderSt textDirection: Directionality.of(context), isFocused: isFocused, state: this, - onOffLabelColors: onOffLabelColors, ), ), ), @@ -441,7 +414,6 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget { required this.textDirection, required this.isFocused, required this.state, - required this.onOffLabelColors, }); final bool value; @@ -453,7 +425,6 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget { final _CupertinoSwitchState state; final TextDirection textDirection; final bool isFocused; - final (Color onLabelColor, Color offLabelColor)? onOffLabelColors; @override _RenderCupertinoSwitch createRenderObject(BuildContext context) { @@ -467,7 +438,6 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget { textDirection: textDirection, isFocused: isFocused, state: state, - onOffLabelColors: onOffLabelColors, ); } @@ -494,24 +464,6 @@ const double _kTrackInnerEnd = _kTrackWidth - _kTrackInnerStart; const double _kTrackInnerLength = _kTrackInnerEnd - _kTrackInnerStart; const double _kSwitchWidth = 59.0; const double _kSwitchHeight = 39.0; -// Label sizes and padding taken from xcode inspector. -// See https://github.com/flutter/flutter/issues/4830#issuecomment-528495360 -const double _kOnLabelWidth = 1.0; -const double _kOnLabelHeight = 10.0; -const double _kOnLabelPaddingHorizontal = 11.0; -const double _kOffLabelWidth = 1.0; -const double _kOffLabelPaddingHorizontal = 12.0; -const double _kOffLabelRadius = 5.0; -const CupertinoDynamicColor _kOffLabelColor = CupertinoDynamicColor.withBrightnessAndContrast( - debugLabel: 'offSwitchLabel', - // Source: https://github.com/flutter/flutter/pull/39993#discussion_r321946033 - color: Color.fromARGB(255, 179, 179, 179), - // Source: https://github.com/flutter/flutter/pull/39993#issuecomment-535196665 - darkColor: Color.fromARGB(255, 179, 179, 179), - // Source: https://github.com/flutter/flutter/pull/127776#discussion_r1244208264 - highContrastColor: Color.fromARGB(255, 255, 255, 255), - darkHighContrastColor: Color.fromARGB(255, 255, 255, 255), -); // Opacity of a disabled switch, as eye-balled from iOS Simulator on Mac. const double _kCupertinoSwitchDisabledOpacity = 0.5; @@ -529,7 +481,6 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox { required TextDirection textDirection, required bool isFocused, required _CupertinoSwitchState state, - required (Color onLabelColor, Color offLabelColor)? onOffLabelColors, }) : _value = value, _activeColor = activeColor, _trackColor = trackColor, @@ -539,7 +490,6 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox { _textDirection = textDirection, _isFocused = isFocused, _state = state, - _onOffLabelColors = onOffLabelColors, super(additionalConstraints: const BoxConstraints.tightFor(width: _kSwitchWidth, height: _kSwitchHeight)) { state.position.addListener(markNeedsPaint); state._reaction.addListener(markNeedsPaint); @@ -631,16 +581,6 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox { markNeedsPaint(); } - (Color onLabelColor, Color offLabelColor)? get onOffLabelColors => _onOffLabelColors; - (Color onLabelColor, Color offLabelColor)? _onOffLabelColors; - set onOffLabelColors((Color onLabelColor, Color offLabelColor)? value) { - if (value == _onOffLabelColors) { - return; - } - _onOffLabelColors = value; - markNeedsPaint(); - } - bool get isInteractive => onChanged != null; @override @@ -706,52 +646,6 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox { canvas.drawRRect(borderTrackRRect, borderPaint); } - if (_onOffLabelColors != null) { - final (Color onLabelColor, Color offLabelColor) = onOffLabelColors!; - - final double leftLabelOpacity = visualPosition * (1.0 - currentReactionValue); - final double rightLabelOpacity = (1.0 - visualPosition) * (1.0 - currentReactionValue); - final (double onLabelOpacity, double offLabelOpacity) = - switch (textDirection) { - TextDirection.ltr => (leftLabelOpacity, rightLabelOpacity), - TextDirection.rtl => (rightLabelOpacity, leftLabelOpacity), - }; - - final (Offset onLabelOffset, Offset offLabelOffset) = - switch (textDirection) { - TextDirection.ltr => ( - trackRect.centerLeft.translate(_kOnLabelPaddingHorizontal, 0), - trackRect.centerRight.translate(-_kOffLabelPaddingHorizontal, 0), - ), - TextDirection.rtl => ( - trackRect.centerRight.translate(-_kOnLabelPaddingHorizontal, 0), - trackRect.centerLeft.translate(_kOffLabelPaddingHorizontal, 0), - ), - }; - - // Draws '|' label - final Rect onLabelRect = Rect.fromCenter( - center: onLabelOffset, - width: _kOnLabelWidth, - height: _kOnLabelHeight, - ); - final Paint onLabelPaint = Paint() - ..color = onLabelColor.withOpacity(onLabelOpacity) - ..style = PaintingStyle.fill; - canvas.drawRect(onLabelRect, onLabelPaint); - - // Draws 'O' label - final Paint offLabelPaint = Paint() - ..color = offLabelColor.withOpacity(offLabelOpacity) - ..style = PaintingStyle.stroke - ..strokeWidth = _kOffLabelWidth; - canvas.drawCircle( - offLabelOffset, - _kOffLabelRadius, - offLabelPaint, - ); - } - final double currentThumbExtension = CupertinoThumbPainter.extension * currentReactionValue; final double thumbLeft = lerpDouble( trackRect.left + _kTrackInnerStart - CupertinoThumbPainter.radius, diff --git a/packages/flutter/lib/src/widgets/media_query.dart b/packages/flutter/lib/src/widgets/media_query.dart index f0544de55a18d..3a899096b6761 100644 --- a/packages/flutter/lib/src/widgets/media_query.dart +++ b/packages/flutter/lib/src/widgets/media_query.dart @@ -62,8 +62,6 @@ enum _MediaQueryAspect { invertColors, /// Specifies the aspect corresponding to [MediaQueryData.highContrast]. highContrast, - /// Specifies the aspect corresponding to [MediaQueryData.onOffSwitchLabels]. - onOffSwitchLabels, /// Specifies the aspect corresponding to [MediaQueryData.disableAnimations]. disableAnimations, /// Specifies the aspect corresponding to [MediaQueryData.boldText]. @@ -165,7 +163,6 @@ class MediaQueryData { this.accessibleNavigation = false, this.invertColors = false, this.highContrast = false, - this.onOffSwitchLabels = false, this.disableAnimations = false, this.boldText = false, this.navigationMode = NavigationMode.traditional, @@ -243,7 +240,6 @@ class MediaQueryData { disableAnimations = platformData?.disableAnimations ?? view.platformDispatcher.accessibilityFeatures.disableAnimations, boldText = platformData?.boldText ?? view.platformDispatcher.accessibilityFeatures.boldText, highContrast = platformData?.highContrast ?? view.platformDispatcher.accessibilityFeatures.highContrast, - onOffSwitchLabels = platformData?.onOffSwitchLabels ?? view.platformDispatcher.accessibilityFeatures.onOffSwitchLabels, alwaysUse24HourFormat = platformData?.alwaysUse24HourFormat ?? view.platformDispatcher.alwaysUse24HourFormat, navigationMode = platformData?.navigationMode ?? NavigationMode.traditional, gestureSettings = DeviceGestureSettings.fromView(view), @@ -488,15 +484,6 @@ class MediaQueryData { /// or above. final bool highContrast; - /// Whether the user requested to show on/off labels inside switches on iOS, - /// via Settings -> Accessibility -> Display & Text Size -> On/Off Labels. - /// - /// See also: - /// - /// * [dart:ui.PlatformDispatcher.accessibilityFeatures], where the setting - /// originates. - final bool onOffSwitchLabels; - /// Whether the platform is requesting that animations be disabled or reduced /// as much as possible. /// @@ -578,7 +565,6 @@ class MediaQueryData { EdgeInsets? systemGestureInsets, bool? alwaysUse24HourFormat, bool? highContrast, - bool? onOffSwitchLabels, bool? disableAnimations, bool? invertColors, bool? accessibleNavigation, @@ -603,7 +589,6 @@ class MediaQueryData { alwaysUse24HourFormat: alwaysUse24HourFormat ?? this.alwaysUse24HourFormat, invertColors: invertColors ?? this.invertColors, highContrast: highContrast ?? this.highContrast, - onOffSwitchLabels: onOffSwitchLabels ?? this.onOffSwitchLabels, disableAnimations: disableAnimations ?? this.disableAnimations, accessibleNavigation: accessibleNavigation ?? this.accessibleNavigation, boldText: boldText ?? this.boldText, @@ -795,7 +780,6 @@ class MediaQueryData { && other.systemGestureInsets == systemGestureInsets && other.alwaysUse24HourFormat == alwaysUse24HourFormat && other.highContrast == highContrast - && other.onOffSwitchLabels == onOffSwitchLabels && other.disableAnimations == disableAnimations && other.invertColors == invertColors && other.accessibleNavigation == accessibleNavigation @@ -816,7 +800,6 @@ class MediaQueryData { viewInsets, alwaysUse24HourFormat, highContrast, - onOffSwitchLabels, disableAnimations, invertColors, accessibleNavigation, @@ -840,7 +823,6 @@ class MediaQueryData { 'alwaysUse24HourFormat: $alwaysUse24HourFormat', 'accessibleNavigation: $accessibleNavigation', 'highContrast: $highContrast', - 'onOffSwitchLabels: $onOffSwitchLabels', 'disableAnimations: $disableAnimations', 'invertColors: $invertColors', 'boldText: $boldText', @@ -1432,25 +1414,6 @@ class MediaQuery extends InheritedModel<_MediaQueryAspect> { /// the [MediaQueryData.highContrast] property of the ancestor [MediaQuery] changes. static bool? maybeHighContrastOf(BuildContext context) => _maybeOf(context, _MediaQueryAspect.highContrast)?.highContrast; - /// Returns onOffSwitchLabels for the nearest MediaQuery ancestor or false, if no - /// such ancestor exists. - /// - /// See also: - /// - /// * [MediaQueryData.onOffSwitchLabels], which indicates the platform's - /// desire to show on/off labels inside switches. - /// - /// Use of this method will cause the given [context] to rebuild any time that - /// the [MediaQueryData.onOffSwitchLabels] property of the ancestor [MediaQuery] changes. - static bool onOffSwitchLabelsOf(BuildContext context) => maybeOnOffSwitchLabelsOf(context) ?? false; - - /// Returns onOffSwitchLabels for the nearest MediaQuery ancestor or - /// null, if no such ancestor exists. - /// - /// Use of this method will cause the given [context] to rebuild any time that - /// the [MediaQueryData.onOffSwitchLabels] property of the ancestor [MediaQuery] changes. - static bool? maybeOnOffSwitchLabelsOf(BuildContext context) => _maybeOf(context, _MediaQueryAspect.onOffSwitchLabels)?.onOffSwitchLabels; - /// Returns disableAnimations for the nearest MediaQuery ancestor or /// [Brightness.light], if no such ancestor exists. /// @@ -1606,10 +1569,6 @@ class MediaQuery extends InheritedModel<_MediaQueryAspect> { if (data.highContrast != oldWidget.data.highContrast) { return true; } - case _MediaQueryAspect.onOffSwitchLabels: - if (data.onOffSwitchLabels != oldWidget.data.onOffSwitchLabels) { - return true; - } case _MediaQueryAspect.disableAnimations: if (data.disableAnimations != oldWidget.data.disableAnimations) { return true; diff --git a/packages/flutter/test/cupertino/switch_test.dart b/packages/flutter/test/cupertino/switch_test.dart index e6b484bda281e..3956227161dae 100644 --- a/packages/flutter/test/cupertino/switch_test.dart +++ b/packages/flutter/test/cupertino/switch_test.dart @@ -751,187 +751,6 @@ void main() { ); }); - PaintPattern onLabelPaintPattern({ - required int alpha, - bool isRtl = false, - }) => - paints - ..rect( - rect: Rect.fromLTWH(isRtl ? 43.5 : 14.5, 14.5, 1.0, 10.0), - color: const Color(0xffffffff).withAlpha(alpha), - style: PaintingStyle.fill, - ); - - PaintPattern offLabelPaintPattern({ - required int alpha, - bool highContrast = false, - bool isRtl = false, - }) => - paints - ..circle( - x: isRtl ? 16.0 : 43.0, - y: 19.5, - radius: 5.0, - color: - (highContrast ? const Color(0xffffffff) : const Color(0xffb3b3b3)) - .withAlpha(alpha), - strokeWidth: 1.0, - style: PaintingStyle.stroke, - ); - - testWidgets('Switch renders switch labels correctly before, during, and after being tapped', (WidgetTester tester) async { - final Key switchKey = UniqueKey(); - bool value = false; - await tester.pumpWidget( - MediaQuery( - data: const MediaQueryData(onOffSwitchLabels: true), - child: Directionality( - textDirection: TextDirection.ltr, - child: StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return Center( - child: RepaintBoundary( - child: CupertinoSwitch( - key: switchKey, - value: value, - dragStartBehavior: DragStartBehavior.down, - onChanged: (bool newValue) { - setState(() { - value = newValue; - }); - }, - ), - ), - ); - }, - ), - ), - ), - ); - - final RenderObject switchRenderObject = - tester.element(find.byType(CupertinoSwitch)).renderObject!; - - expect(switchRenderObject, offLabelPaintPattern(alpha: 255)); - expect(switchRenderObject, onLabelPaintPattern(alpha: 0)); - - await tester.tap(find.byKey(switchKey)); - expect(value, isTrue); - - // Kick off animation, then advance to intermediate frame. - await tester.pump(); - await tester.pump(const Duration(milliseconds: 60)); - expect(switchRenderObject, onLabelPaintPattern(alpha: 131)); - expect(switchRenderObject, offLabelPaintPattern(alpha: 124)); - - await tester.pumpAndSettle(); - expect(switchRenderObject, onLabelPaintPattern(alpha: 255)); - expect(switchRenderObject, offLabelPaintPattern(alpha: 0)); - }); - - testWidgets('Switch renders switch labels correctly before, during, and after being tapped in high contrast', (WidgetTester tester) async { - final Key switchKey = UniqueKey(); - bool value = false; - await tester.pumpWidget( - MediaQuery( - data: const MediaQueryData( - onOffSwitchLabels: true, - highContrast: true, - ), - child: Directionality( - textDirection: TextDirection.ltr, - child: StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return Center( - child: RepaintBoundary( - child: CupertinoSwitch( - key: switchKey, - value: value, - dragStartBehavior: DragStartBehavior.down, - onChanged: (bool newValue) { - setState(() { - value = newValue; - }); - }, - ), - ), - ); - }, - ), - ), - ), - ); - - final RenderObject switchRenderObject = - tester.element(find.byType(CupertinoSwitch)).renderObject!; - - expect(switchRenderObject, offLabelPaintPattern(highContrast: true, alpha: 255)); - expect(switchRenderObject, onLabelPaintPattern(alpha: 0)); - - await tester.tap(find.byKey(switchKey)); - expect(value, isTrue); - - // Kick off animation, then advance to intermediate frame. - await tester.pump(); - await tester.pump(const Duration(milliseconds: 60)); - expect(switchRenderObject, onLabelPaintPattern(alpha: 131)); - expect(switchRenderObject, offLabelPaintPattern(highContrast: true, alpha: 124)); - - await tester.pumpAndSettle(); - expect(switchRenderObject, onLabelPaintPattern(alpha: 255)); - expect(switchRenderObject, offLabelPaintPattern(highContrast: true, alpha: 0)); - }); - - testWidgets('Switch renders switch labels correctly before, during, and after being tapped with direction rtl', (WidgetTester tester) async { - final Key switchKey = UniqueKey(); - bool value = false; - await tester.pumpWidget( - MediaQuery( - data: const MediaQueryData(onOffSwitchLabels: true), - child: Directionality( - textDirection: TextDirection.rtl, - child: StatefulBuilder( - builder: (BuildContext context, StateSetter setState) { - return Center( - child: RepaintBoundary( - child: CupertinoSwitch( - key: switchKey, - value: value, - dragStartBehavior: DragStartBehavior.down, - onChanged: (bool newValue) { - setState(() { - value = newValue; - }); - }, - ), - ), - ); - }, - ), - ), - ), - ); - - final RenderObject switchRenderObject = - tester.element(find.byType(CupertinoSwitch)).renderObject!; - - expect(switchRenderObject, offLabelPaintPattern(isRtl: true, alpha: 255)); - expect(switchRenderObject, onLabelPaintPattern(isRtl: true, alpha: 0)); - - await tester.tap(find.byKey(switchKey)); - expect(value, isTrue); - - // Kick off animation, then advance to intermediate frame. - await tester.pump(); - await tester.pump(const Duration(milliseconds: 60)); - expect(switchRenderObject, onLabelPaintPattern(isRtl: true, alpha: 131)); - expect(switchRenderObject, offLabelPaintPattern(isRtl: true, alpha: 124)); - - await tester.pumpAndSettle(); - expect(switchRenderObject, onLabelPaintPattern(isRtl: true, alpha: 255)); - expect(switchRenderObject, offLabelPaintPattern(isRtl: true, alpha: 0)); - }); - testWidgets('Switch renders correctly in dark mode', (WidgetTester tester) async { final Key switchKey = UniqueKey(); bool value = false; diff --git a/packages/flutter/test/widgets/media_query_test.dart b/packages/flutter/test/widgets/media_query_test.dart index f2608a214057b..0cafd366143b9 100644 --- a/packages/flutter/test/widgets/media_query_test.dart +++ b/packages/flutter/test/widgets/media_query_test.dart @@ -157,7 +157,6 @@ void main() { expect(data.disableAnimations, false); expect(data.boldText, false); expect(data.highContrast, false); - expect(data.onOffSwitchLabels, false); expect(data.platformBrightness, Brightness.light); expect(data.gestureSettings.touchSlop, null); expect(data.displayFeatures, isEmpty); @@ -172,7 +171,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, alwaysUse24HourFormat: true, navigationMode: NavigationMode.directional, ); @@ -193,7 +191,6 @@ void main() { expect(data.disableAnimations, platformData.disableAnimations); expect(data.boldText, platformData.boldText); expect(data.highContrast, platformData.highContrast); - expect(data.onOffSwitchLabels, platformData.onOffSwitchLabels); expect(data.alwaysUse24HourFormat, platformData.alwaysUse24HourFormat); expect(data.navigationMode, platformData.navigationMode); expect(data.gestureSettings, DeviceGestureSettings.fromView(tester.view)); @@ -223,7 +220,6 @@ void main() { expect(data.disableAnimations, tester.platformDispatcher.accessibilityFeatures.disableAnimations); expect(data.boldText, tester.platformDispatcher.accessibilityFeatures.boldText); expect(data.highContrast, tester.platformDispatcher.accessibilityFeatures.highContrast); - expect(data.onOffSwitchLabels, tester.platformDispatcher.accessibilityFeatures.onOffSwitchLabels); expect(data.alwaysUse24HourFormat, tester.platformDispatcher.alwaysUse24HourFormat); expect(data.navigationMode, NavigationMode.traditional); expect(data.gestureSettings, DeviceGestureSettings.fromView(tester.view)); @@ -239,7 +235,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, alwaysUse24HourFormat: true, navigationMode: NavigationMode.directional, ); @@ -272,7 +267,6 @@ void main() { expect(data.disableAnimations, platformData.disableAnimations); expect(data.boldText, platformData.boldText); expect(data.highContrast, platformData.highContrast); - expect(data.onOffSwitchLabels, platformData.onOffSwitchLabels); expect(data.alwaysUse24HourFormat, platformData.alwaysUse24HourFormat); expect(data.navigationMode, platformData.navigationMode); expect(data.gestureSettings, DeviceGestureSettings.fromView(tester.view)); @@ -323,7 +317,6 @@ void main() { expect(data.disableAnimations, tester.platformDispatcher.accessibilityFeatures.disableAnimations); expect(data.boldText, tester.platformDispatcher.accessibilityFeatures.boldText); expect(data.highContrast, tester.platformDispatcher.accessibilityFeatures.highContrast); - expect(data.onOffSwitchLabels, tester.platformDispatcher.accessibilityFeatures.onOffSwitchLabels); expect(data.alwaysUse24HourFormat, tester.platformDispatcher.alwaysUse24HourFormat); expect(data.navigationMode, NavigationMode.traditional); expect(data.gestureSettings, DeviceGestureSettings.fromView(tester.view)); @@ -505,7 +498,6 @@ void main() { expect(copied.disableAnimations, data.disableAnimations); expect(copied.boldText, data.boldText); expect(copied.highContrast, data.highContrast); - expect(copied.onOffSwitchLabels, data.onOffSwitchLabels); expect(copied.platformBrightness, data.platformBrightness); expect(copied.gestureSettings, data.gestureSettings); expect(copied.displayFeatures, data.displayFeatures); @@ -545,7 +537,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, platformBrightness: Brightness.dark, navigationMode: NavigationMode.directional, gestureSettings: gestureSettings, @@ -564,7 +555,6 @@ void main() { expect(copied.disableAnimations, true); expect(copied.boldText, true); expect(copied.highContrast, true); - expect(copied.onOffSwitchLabels, true); expect(copied.platformBrightness, Brightness.dark); expect(copied.navigationMode, NavigationMode.directional); expect(copied.gestureSettings, gestureSettings); @@ -602,7 +592,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, navigationMode: NavigationMode.directional, displayFeatures: displayFeatures, ), @@ -638,7 +627,6 @@ void main() { expect(unpadded.disableAnimations, true); expect(unpadded.boldText, true); expect(unpadded.highContrast, true); - expect(unpadded.onOffSwitchLabels, true); expect(unpadded.navigationMode, NavigationMode.directional); expect(unpadded.displayFeatures, displayFeatures); }); @@ -674,7 +662,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, navigationMode: NavigationMode.directional, displayFeatures: displayFeatures, ), @@ -707,7 +694,6 @@ void main() { expect(unpadded.disableAnimations, true); expect(unpadded.boldText, true); expect(unpadded.highContrast, true); - expect(unpadded.onOffSwitchLabels, true); expect(unpadded.navigationMode, NavigationMode.directional); expect(unpadded.displayFeatures, displayFeatures); }); @@ -743,7 +729,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, navigationMode: NavigationMode.directional, displayFeatures: displayFeatures, ), @@ -779,7 +764,6 @@ void main() { expect(unpadded.disableAnimations, true); expect(unpadded.boldText, true); expect(unpadded.highContrast, true); - expect(unpadded.onOffSwitchLabels, true); expect(unpadded.navigationMode, NavigationMode.directional); expect(unpadded.displayFeatures, displayFeatures); }); @@ -815,7 +799,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, navigationMode: NavigationMode.directional, displayFeatures: displayFeatures, ), @@ -848,7 +831,6 @@ void main() { expect(unpadded.disableAnimations, true); expect(unpadded.boldText, true); expect(unpadded.highContrast, true); - expect(unpadded.onOffSwitchLabels, true); expect(unpadded.navigationMode, NavigationMode.directional); expect(unpadded.displayFeatures, displayFeatures); }); @@ -884,7 +866,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, navigationMode: NavigationMode.directional, displayFeatures: displayFeatures, ), @@ -920,7 +901,6 @@ void main() { expect(unpadded.disableAnimations, true); expect(unpadded.boldText, true); expect(unpadded.highContrast, true); - expect(unpadded.onOffSwitchLabels, true); expect(unpadded.navigationMode, NavigationMode.directional); expect(unpadded.displayFeatures, displayFeatures); }); @@ -956,7 +936,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, navigationMode: NavigationMode.directional, displayFeatures: displayFeatures, ), @@ -989,7 +968,6 @@ void main() { expect(unpadded.disableAnimations, true); expect(unpadded.boldText, true); expect(unpadded.highContrast, true); - expect(unpadded.onOffSwitchLabels, true); expect(unpadded.navigationMode, NavigationMode.directional); expect(unpadded.displayFeatures, displayFeatures); }); @@ -1229,7 +1207,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, displayFeatures: displayFeatures, ), child: Builder( @@ -1260,7 +1237,6 @@ void main() { expect(subScreenMediaQuery.disableAnimations, true); expect(subScreenMediaQuery.boldText, true); expect(subScreenMediaQuery.highContrast, true); - expect(subScreenMediaQuery.onOffSwitchLabels, true); expect(subScreenMediaQuery.displayFeatures, isEmpty); }); @@ -1304,7 +1280,6 @@ void main() { disableAnimations: true, boldText: true, highContrast: true, - onOffSwitchLabels: true, displayFeatures: displayFeatures, ), child: Builder( @@ -1344,7 +1319,6 @@ void main() { expect(subScreenMediaQuery.disableAnimations, true); expect(subScreenMediaQuery.boldText, true); expect(subScreenMediaQuery.highContrast, true); - expect(subScreenMediaQuery.onOffSwitchLabels, true); expect(subScreenMediaQuery.displayFeatures, [cutoutDisplayFeature]); }); @@ -1517,8 +1491,6 @@ void main() { const _MediaQueryAspectCase(MediaQuery.maybeInvertColorsOf, MediaQueryData(invertColors: true)), const _MediaQueryAspectCase(MediaQuery.highContrastOf, MediaQueryData(highContrast: true)), const _MediaQueryAspectCase(MediaQuery.maybeHighContrastOf, MediaQueryData(highContrast: true)), - const _MediaQueryAspectCase(MediaQuery.onOffSwitchLabelsOf, MediaQueryData(onOffSwitchLabels: true)), - const _MediaQueryAspectCase(MediaQuery.maybeOnOffSwitchLabelsOf, MediaQueryData(onOffSwitchLabels: true)), const _MediaQueryAspectCase(MediaQuery.disableAnimationsOf, MediaQueryData(disableAnimations: true)), const _MediaQueryAspectCase(MediaQuery.maybeDisableAnimationsOf, MediaQueryData(disableAnimations: true)), const _MediaQueryAspectCase(MediaQuery.boldTextOf, MediaQueryData(boldText: true)), diff --git a/packages/flutter_tools/test/general.shard/android/android_studio_test.dart b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart index 2fca60b3de957..cc8d8c2f36481 100644 --- a/packages/flutter_tools/test/general.shard/android/android_studio_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart @@ -11,6 +11,7 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/version.dart'; import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/plist_parser.dart'; +import 'package:path/path.dart' show Context; // flutter_ignore: package_path_import -- We only use Context as an interface. import 'package:test/fake.dart'; import '../../src/common.dart';