diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart index 72eb20ab9d..b3fae67349 100644 --- a/packages/flutter/lib/src/semantics/semantics.dart +++ b/packages/flutter/lib/src/semantics/semantics.dart @@ -672,10 +672,9 @@ class SemanticsData with Diagnosticable { properties.add(DoubleProperty('elevation', elevation, defaultValue: 0.0)); properties.add(DoubleProperty('thickness', thickness, defaultValue: 0.0)); final List actionSummary = [ - // ignore: deprecated_member_use - for (final SemanticsAction action in SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList) + for (final SemanticsAction action in SemanticsAction.values) if ((actions & action.index) != 0) - describeEnum(action), + action.name, ]; final List customSemanticsActionSummary = customSemanticsActionIds! .map((int actionId) => CustomSemanticsAction.getAction(actionId)!.label) @@ -684,10 +683,9 @@ class SemanticsData with Diagnosticable { properties.add(IterableProperty('customActions', customSemanticsActionSummary, ifEmpty: null)); final List flagSummary = [ - // ignore: deprecated_member_use - for (final SemanticsFlag flag in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList) + for (final SemanticsFlag flag in SemanticsFlag.values) if ((flags & flag.index) != 0) - describeEnum(flag), + flag.name, ]; properties.add(IterableProperty('flags', flagSummary, ifEmpty: null)); properties.add(AttributedStringProperty('label', attributedLabel)); @@ -2785,14 +2783,13 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin { properties.add(DiagnosticsProperty('rect', rect, description: description, showName: false)); } properties.add(IterableProperty('tags', tags?.map((SemanticsTag tag) => tag.name), defaultValue: null)); - final List actions = _actions.keys.map((SemanticsAction action) => '${describeEnum(action)}${_debugIsActionBlocked(action) ? '🚫️' : ''}').toList()..sort(); + final List actions = _actions.keys.map((SemanticsAction action) => '${action.name}${_debugIsActionBlocked(action) ? '🚫️' : ''}').toList()..sort(); final List customSemanticsActions = _customSemanticsActions.keys .map((CustomSemanticsAction action) => action.label) .toList(); properties.add(IterableProperty('actions', actions, ifEmpty: null)); properties.add(IterableProperty('customActions', customSemanticsActions, ifEmpty: null)); - // ignore: deprecated_member_use - final List flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.where((SemanticsFlag flag) => hasFlag(flag)).map((SemanticsFlag flag) => flag.toString().substring('SemanticsFlag.'.length)).toList(); + final List flags = SemanticsFlag.values.where((SemanticsFlag flag) => hasFlag(flag)).map((SemanticsFlag flag) => flag.name).toList(); properties.add(IterableProperty('flags', flags, ifEmpty: null)); properties.add(FlagProperty('isInvisible', value: isInvisible, ifTrue: 'invisible')); properties.add(FlagProperty('isHidden', value: hasFlag(SemanticsFlag.isHidden), ifTrue: 'HIDDEN')); diff --git a/packages/flutter/test/widgets/custom_painter_test.dart b/packages/flutter/test/widgets/custom_painter_test.dart index 02750e75a1..3d102a4699 100644 --- a/packages/flutter/test/widgets/custom_painter_test.dart +++ b/packages/flutter/test/widgets/custom_painter_test.dart @@ -346,8 +346,7 @@ void _defineTests() { ), ), )); - // ignore: deprecated_member_use - final Set allActions = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList.toSet() + final Set allActions = SemanticsAction.values.toSet() ..remove(SemanticsAction.customAction) // customAction is not user-exposed. ..remove(SemanticsAction.showOnScreen); // showOnScreen is not user-exposed @@ -445,8 +444,7 @@ void _defineTests() { ), ), )); - // ignore: deprecated_member_use - List flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList(); + List flags = SemanticsFlag.values.toList(); // [SemanticsFlag.hasImplicitScrolling] isn't part of [SemanticsProperties] // therefore it has to be removed. flags @@ -500,8 +498,7 @@ void _defineTests() { ), ), )); - // ignore: deprecated_member_use - flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList(); + flags = SemanticsFlag.values.toList(); // [SemanticsFlag.hasImplicitScrolling] isn't part of [SemanticsProperties] // therefore it has to be removed. flags diff --git a/packages/flutter/test/widgets/semantics_test.dart b/packages/flutter/test/widgets/semantics_test.dart index 412197e9d1..809eb09c8c 100644 --- a/packages/flutter/test/widgets/semantics_test.dart +++ b/packages/flutter/test/widgets/semantics_test.dart @@ -519,8 +519,7 @@ void main() { ), ); - // ignore: deprecated_member_use - final Set allActions = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList.toSet() + final Set allActions = SemanticsAction.values.toSet() ..remove(SemanticsAction.moveCursorForwardByWord) ..remove(SemanticsAction.moveCursorBackwardByWord) ..remove(SemanticsAction.customAction) // customAction is not user-exposed. @@ -612,8 +611,7 @@ void main() { liveRegion: true, ), ); - // ignore: deprecated_member_use - final List flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList(); + final List flags = SemanticsFlag.values.toList(); flags ..remove(SemanticsFlag.hasToggledState) ..remove(SemanticsFlag.isToggled) diff --git a/packages/flutter/test/widgets/semantics_tester.dart b/packages/flutter/test/widgets/semantics_tester.dart index 245a4291de..014137f658 100644 --- a/packages/flutter/test/widgets/semantics_tester.dart +++ b/packages/flutter/test/widgets/semantics_tester.dart @@ -633,8 +633,7 @@ class SemanticsTester { static String _flagsToSemanticsFlagExpression(dynamic flags) { Iterable list; if (flags is int) { - // ignore: deprecated_member_use - list = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList + list = SemanticsFlag.values .where((SemanticsFlag flag) => (flag.index & flags) != 0); } else { list = flags as List; @@ -649,8 +648,7 @@ class SemanticsTester { static String _actionsToSemanticsActionExpression(dynamic actions) { Iterable list; if (actions is int) { - // ignore: deprecated_member_use - list = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList + list = SemanticsAction.values .where((SemanticsAction action) => (action.index & actions) != 0); } else { list = actions as List; diff --git a/packages/flutter_test/lib/src/matchers.dart b/packages/flutter_test/lib/src/matchers.dart index d778c3d8be..a9027ac52a 100644 --- a/packages/flutter_test/lib/src/matchers.dart +++ b/packages/flutter_test/lib/src/matchers.dart @@ -2533,7 +2533,11 @@ class _MatchesSemanticsData extends Matcher { static String _createEnumsSummary(List enums) { assert(T == SemanticsAction || T == SemanticsFlag, 'This method is only intended for lists of SemanticsActions or SemanticsFlags.'); - return '[${enums.map(describeEnum).join(', ')}]'; + if (T == SemanticsAction) { + return '[${(enums as List).map((SemanticsAction d) => d.name).join(', ')}]'; + } else { + return '[${(enums as List).map((SemanticsFlag d) => d.name).join(', ')}]'; + } } } diff --git a/packages/flutter_test/test/matchers_test.dart b/packages/flutter_test/test/matchers_test.dart index 18b4fc4989..cc846dcd41 100644 --- a/packages/flutter_test/test/matchers_test.dart +++ b/packages/flutter_test/test/matchers_test.dart @@ -613,13 +613,11 @@ void main() { int actions = 0; int flags = 0; const CustomSemanticsAction action = CustomSemanticsAction(label: 'test'); - // ignore: deprecated_member_use - for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) { - actions |= index; + for (final SemanticsAction action in SemanticsAction.values) { + actions |= action.index; } - // ignore: deprecated_member_use - for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) { - flags |= index; + for (final SemanticsFlag flag in SemanticsFlag.values) { + flags |= flag.index; } final SemanticsData data = SemanticsData( flags: flags, @@ -897,13 +895,11 @@ void main() { int actions = 0; int flags = 0; const CustomSemanticsAction action = CustomSemanticsAction(label: 'test'); - // ignore: deprecated_member_use - for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) { - actions |= index; + for (final SemanticsAction action in SemanticsAction.values) { + actions |= action.index; } - // ignore: deprecated_member_use - for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) { - flags |= index; + for (final SemanticsFlag flag in SemanticsFlag.values) { + flags |= flag.index; } final SemanticsData data = SemanticsData( flags: flags, @@ -1085,13 +1081,11 @@ void main() { testWidgets('only matches given flags and actions', (WidgetTester tester) async { int allActions = 0; int allFlags = 0; - // ignore: deprecated_member_use - for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) { - allActions |= index; + for (final SemanticsAction action in SemanticsAction.values) { + allActions |= action.index; } - // ignore: deprecated_member_use - for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) { - allFlags |= index; + for (final SemanticsFlag flag in SemanticsFlag.values) { + allFlags |= flag.index; } final SemanticsData emptyData = SemanticsData( flags: 0,