Skip to content

Commit 2e4d976

Browse files
bernaferraribernaferrari
authored
SemanticsFlag/SemanticsAction cleanup (part 4) (#123329)
`SemanticsFlag`/`SemanticsAction` cleanup (part 4)
1 parent b1f8d5d commit 2e4d976

File tree

6 files changed

+30
-42
lines changed

6 files changed

+30
-42
lines changed

‎packages/flutter/lib/src/semantics/semantics.dart

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -672,10 +672,9 @@ class SemanticsData with Diagnosticable {
672672
properties.add(DoubleProperty('elevation', elevation, defaultValue: 0.0));
673673
properties.add(DoubleProperty('thickness', thickness, defaultValue: 0.0));
674674
final List<String> actionSummary = <String>[
675-
// ignore: deprecated_member_use
676-
for (final SemanticsAction action in SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList)
675+
for (final SemanticsAction action in SemanticsAction.values)
677676
if ((actions & action.index) != 0)
678-
describeEnum(action),
677+
action.name,
679678
];
680679
final List<String?> customSemanticsActionSummary = customSemanticsActionIds!
681680
.map<String?>((int actionId) => CustomSemanticsAction.getAction(actionId)!.label)
@@ -684,10 +683,9 @@ class SemanticsData with Diagnosticable {
684683
properties.add(IterableProperty<String?>('customActions', customSemanticsActionSummary, ifEmpty: null));
685684

686685
final List<String> flagSummary = <String>[
687-
// ignore: deprecated_member_use
688-
for (final SemanticsFlag flag in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList)
686+
for (final SemanticsFlag flag in SemanticsFlag.values)
689687
if ((flags & flag.index) != 0)
690-
describeEnum(flag),
688+
flag.name,
691689
];
692690
properties.add(IterableProperty<String>('flags', flagSummary, ifEmpty: null));
693691
properties.add(AttributedStringProperty('label', attributedLabel));
@@ -2785,14 +2783,13 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin {
27852783
properties.add(DiagnosticsProperty<Rect>('rect', rect, description: description, showName: false));
27862784
}
27872785
properties.add(IterableProperty<String>('tags', tags?.map((SemanticsTag tag) => tag.name), defaultValue: null));
2788-
final List<String> actions = _actions.keys.map<String>((SemanticsAction action) => '${describeEnum(action)}${_debugIsActionBlocked(action) ? '🚫️' : ''}').toList()..sort();
2786+
final List<String> actions = _actions.keys.map<String>((SemanticsAction action) => '${action.name}${_debugIsActionBlocked(action) ? '🚫️' : ''}').toList()..sort();
27892787
final List<String?> customSemanticsActions = _customSemanticsActions.keys
27902788
.map<String?>((CustomSemanticsAction action) => action.label)
27912789
.toList();
27922790
properties.add(IterableProperty<String>('actions', actions, ifEmpty: null));
27932791
properties.add(IterableProperty<String?>('customActions', customSemanticsActions, ifEmpty: null));
2794-
// ignore: deprecated_member_use
2795-
final List<String> flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.where((SemanticsFlag flag) => hasFlag(flag)).map((SemanticsFlag flag) => flag.toString().substring('SemanticsFlag.'.length)).toList();
2792+
final List<String> flags = SemanticsFlag.values.where((SemanticsFlag flag) => hasFlag(flag)).map((SemanticsFlag flag) => flag.name).toList();
27962793
properties.add(IterableProperty<String>('flags', flags, ifEmpty: null));
27972794
properties.add(FlagProperty('isInvisible', value: isInvisible, ifTrue: 'invisible'));
27982795
properties.add(FlagProperty('isHidden', value: hasFlag(SemanticsFlag.isHidden), ifTrue: 'HIDDEN'));

‎packages/flutter/test/widgets/custom_painter_test.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,7 @@ void _defineTests() {
346346
),
347347
),
348348
));
349-
// ignore: deprecated_member_use
350-
final Set<SemanticsAction> allActions = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList.toSet()
349+
final Set<SemanticsAction> allActions = SemanticsAction.values.toSet()
351350
..remove(SemanticsAction.customAction) // customAction is not user-exposed.
352351
..remove(SemanticsAction.showOnScreen); // showOnScreen is not user-exposed
353352

@@ -445,8 +444,7 @@ void _defineTests() {
445444
),
446445
),
447446
));
448-
// ignore: deprecated_member_use
449-
List<SemanticsFlag> flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList();
447+
List<SemanticsFlag> flags = SemanticsFlag.values.toList();
450448
// [SemanticsFlag.hasImplicitScrolling] isn't part of [SemanticsProperties]
451449
// therefore it has to be removed.
452450
flags
@@ -500,8 +498,7 @@ void _defineTests() {
500498
),
501499
),
502500
));
503-
// ignore: deprecated_member_use
504-
flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList();
501+
flags = SemanticsFlag.values.toList();
505502
// [SemanticsFlag.hasImplicitScrolling] isn't part of [SemanticsProperties]
506503
// therefore it has to be removed.
507504
flags

‎packages/flutter/test/widgets/semantics_test.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,7 @@ void main() {
519519
),
520520
);
521521

522-
// ignore: deprecated_member_use
523-
final Set<SemanticsAction> allActions = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList.toSet()
522+
final Set<SemanticsAction> allActions = SemanticsAction.values.toSet()
524523
..remove(SemanticsAction.moveCursorForwardByWord)
525524
..remove(SemanticsAction.moveCursorBackwardByWord)
526525
..remove(SemanticsAction.customAction) // customAction is not user-exposed.
@@ -612,8 +611,7 @@ void main() {
612611
liveRegion: true,
613612
),
614613
);
615-
// ignore: deprecated_member_use
616-
final List<SemanticsFlag> flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList();
614+
final List<SemanticsFlag> flags = SemanticsFlag.values.toList();
617615
flags
618616
..remove(SemanticsFlag.hasToggledState)
619617
..remove(SemanticsFlag.isToggled)

‎packages/flutter/test/widgets/semantics_tester.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,8 +633,7 @@ class SemanticsTester {
633633
static String _flagsToSemanticsFlagExpression(dynamic flags) {
634634
Iterable<SemanticsFlag> list;
635635
if (flags is int) {
636-
// ignore: deprecated_member_use
637-
list = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList
636+
list = SemanticsFlag.values
638637
.where((SemanticsFlag flag) => (flag.index & flags) != 0);
639638
} else {
640639
list = flags as List<SemanticsFlag>;
@@ -649,8 +648,7 @@ class SemanticsTester {
649648
static String _actionsToSemanticsActionExpression(dynamic actions) {
650649
Iterable<SemanticsAction> list;
651650
if (actions is int) {
652-
// ignore: deprecated_member_use
653-
list = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList
651+
list = SemanticsAction.values
654652
.where((SemanticsAction action) => (action.index & actions) != 0);
655653
} else {
656654
list = actions as List<SemanticsAction>;

‎packages/flutter_test/lib/src/matchers.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2533,7 +2533,11 @@ class _MatchesSemanticsData extends Matcher {
25332533

25342534
static String _createEnumsSummary<T extends Object>(List<T> enums) {
25352535
assert(T == SemanticsAction || T == SemanticsFlag, 'This method is only intended for lists of SemanticsActions or SemanticsFlags.');
2536-
return '[${enums.map(describeEnum).join(', ')}]';
2536+
if (T == SemanticsAction) {
2537+
return '[${(enums as List<SemanticsAction>).map((SemanticsAction d) => d.name).join(', ')}]';
2538+
} else {
2539+
return '[${(enums as List<SemanticsFlag>).map((SemanticsFlag d) => d.name).join(', ')}]';
2540+
}
25372541
}
25382542
}
25392543

‎packages/flutter_test/test/matchers_test.dart

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -613,13 +613,11 @@ void main() {
613613
int actions = 0;
614614
int flags = 0;
615615
const CustomSemanticsAction action = CustomSemanticsAction(label: 'test');
616-
// ignore: deprecated_member_use
617-
for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) {
618-
actions |= index;
616+
for (final SemanticsAction action in SemanticsAction.values) {
617+
actions |= action.index;
619618
}
620-
// ignore: deprecated_member_use
621-
for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) {
622-
flags |= index;
619+
for (final SemanticsFlag flag in SemanticsFlag.values) {
620+
flags |= flag.index;
623621
}
624622
final SemanticsData data = SemanticsData(
625623
flags: flags,
@@ -897,13 +895,11 @@ void main() {
897895
int actions = 0;
898896
int flags = 0;
899897
const CustomSemanticsAction action = CustomSemanticsAction(label: 'test');
900-
// ignore: deprecated_member_use
901-
for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) {
902-
actions |= index;
898+
for (final SemanticsAction action in SemanticsAction.values) {
899+
actions |= action.index;
903900
}
904-
// ignore: deprecated_member_use
905-
for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) {
906-
flags |= index;
901+
for (final SemanticsFlag flag in SemanticsFlag.values) {
902+
flags |= flag.index;
907903
}
908904
final SemanticsData data = SemanticsData(
909905
flags: flags,
@@ -1085,13 +1081,11 @@ void main() {
10851081
testWidgets('only matches given flags and actions', (WidgetTester tester) async {
10861082
int allActions = 0;
10871083
int allFlags = 0;
1088-
// ignore: deprecated_member_use
1089-
for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) {
1090-
allActions |= index;
1084+
for (final SemanticsAction action in SemanticsAction.values) {
1085+
allActions |= action.index;
10911086
}
1092-
// ignore: deprecated_member_use
1093-
for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) {
1094-
allFlags |= index;
1087+
for (final SemanticsFlag flag in SemanticsFlag.values) {
1088+
allFlags |= flag.index;
10951089
}
10961090
final SemanticsData emptyData = SemanticsData(
10971091
flags: 0,

0 commit comments

Comments
 (0)