Skip to content

Commit f5415a4

Browse files
authored
SemanticsFlag/SemanticsAction enum migration (part 2) (#123817)
`SemanticsFlag`/`SemanticsAction` enum migration (part 2)
1 parent f6c2b10 commit f5415a4

File tree

5 files changed

+32
-16
lines changed

5 files changed

+32
-16
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,8 @@ class SemanticsData with Diagnosticable {
669669
properties.add(DoubleProperty('elevation', elevation, defaultValue: 0.0));
670670
properties.add(DoubleProperty('thickness', thickness, defaultValue: 0.0));
671671
final List<String> actionSummary = <String>[
672-
for (final SemanticsAction action in SemanticsAction.values.values)
672+
// ignore: deprecated_member_use
673+
for (final SemanticsAction action in SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList)
673674
if ((actions & action.index) != 0)
674675
describeEnum(action),
675676
];
@@ -680,7 +681,8 @@ class SemanticsData with Diagnosticable {
680681
properties.add(IterableProperty<String?>('customActions', customSemanticsActionSummary, ifEmpty: null));
681682

682683
final List<String> flagSummary = <String>[
683-
for (final SemanticsFlag flag in SemanticsFlag.values.values)
684+
// ignore: deprecated_member_use
685+
for (final SemanticsFlag flag in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList)
684686
if ((flags & flag.index) != 0)
685687
describeEnum(flag),
686688
];
@@ -2755,7 +2757,8 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin {
27552757
.toList();
27562758
properties.add(IterableProperty<String>('actions', actions, ifEmpty: null));
27572759
properties.add(IterableProperty<String?>('customActions', customSemanticsActions, ifEmpty: null));
2758-
final List<String> flags = SemanticsFlag.values.values.where((SemanticsFlag flag) => hasFlag(flag)).map((SemanticsFlag flag) => flag.toString().substring('SemanticsFlag.'.length)).toList();
2760+
// ignore: deprecated_member_use
2761+
final List<String> flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.where((SemanticsFlag flag) => hasFlag(flag)).map((SemanticsFlag flag) => flag.toString().substring('SemanticsFlag.'.length)).toList();
27592762
properties.add(IterableProperty<String>('flags', flags, ifEmpty: null));
27602763
properties.add(FlagProperty('isInvisible', value: isInvisible, ifTrue: 'invisible'));
27612764
properties.add(FlagProperty('isHidden', value: hasFlag(SemanticsFlag.isHidden), ifTrue: 'HIDDEN'));

packages/flutter/test/widgets/custom_painter_test.dart

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

@@ -444,7 +445,8 @@ void _defineTests() {
444445
),
445446
),
446447
));
447-
List<SemanticsFlag> flags = SemanticsFlag.values.values.toList();
448+
// ignore: deprecated_member_use
449+
List<SemanticsFlag> flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList();
448450
// [SemanticsFlag.hasImplicitScrolling] isn't part of [SemanticsProperties]
449451
// therefore it has to be removed.
450452
flags
@@ -498,7 +500,8 @@ void _defineTests() {
498500
),
499501
),
500502
));
501-
flags = SemanticsFlag.values.values.toList();
503+
// ignore: deprecated_member_use
504+
flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList();
502505
// [SemanticsFlag.hasImplicitScrolling] isn't part of [SemanticsProperties]
503506
// therefore it has to be removed.
504507
flags

packages/flutter/test/widgets/semantics_test.dart

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

523-
final Set<SemanticsAction> allActions = SemanticsAction.values.values.toSet()
523+
// ignore: deprecated_member_use
524+
final Set<SemanticsAction> allActions = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList.toSet()
524525
..remove(SemanticsAction.moveCursorForwardByWord)
525526
..remove(SemanticsAction.moveCursorBackwardByWord)
526527
..remove(SemanticsAction.customAction) // customAction is not user-exposed.
@@ -612,7 +613,8 @@ void main() {
612613
liveRegion: true,
613614
),
614615
);
615-
final List<SemanticsFlag> flags = SemanticsFlag.values.values.toList();
616+
// ignore: deprecated_member_use
617+
final List<SemanticsFlag> flags = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList.toList();
616618
flags
617619
..remove(SemanticsFlag.hasToggledState)
618620
..remove(SemanticsFlag.isToggled)

packages/flutter/test/widgets/semantics_tester.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,8 @@ class SemanticsTester {
633633
static String _flagsToSemanticsFlagExpression(dynamic flags) {
634634
Iterable<SemanticsFlag> list;
635635
if (flags is int) {
636-
list = SemanticsFlag.values.values
636+
// ignore: deprecated_member_use
637+
list = SemanticsFlag.doNotUseWillBeDeletedWithoutWarningValuesAsList
637638
.where((SemanticsFlag flag) => (flag.index & flags) != 0);
638639
} else {
639640
list = flags as List<SemanticsFlag>;
@@ -648,7 +649,8 @@ class SemanticsTester {
648649
static String _actionsToSemanticsActionExpression(dynamic actions) {
649650
Iterable<SemanticsAction> list;
650651
if (actions is int) {
651-
list = SemanticsAction.values.values
652+
// ignore: deprecated_member_use
653+
list = SemanticsAction.doNotUseWillBeDeletedWithoutWarningValuesAsList
652654
.where((SemanticsAction action) => (action.index & actions) != 0);
653655
} else {
654656
list = actions as List<SemanticsAction>;

packages/flutter_test/test/matchers_test.dart

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -613,10 +613,12 @@ void main() {
613613
int actions = 0;
614614
int flags = 0;
615615
const CustomSemanticsAction action = CustomSemanticsAction(label: 'test');
616-
for (final int index in SemanticsAction.values.keys) {
616+
// ignore: deprecated_member_use
617+
for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) {
617618
actions |= index;
618619
}
619-
for (final int index in SemanticsFlag.values.keys) {
620+
// ignore: deprecated_member_use
621+
for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) {
620622
flags |= index;
621623
}
622624
final SemanticsData data = SemanticsData(
@@ -895,10 +897,12 @@ void main() {
895897
int actions = 0;
896898
int flags = 0;
897899
const CustomSemanticsAction action = CustomSemanticsAction(label: 'test');
898-
for (final int index in SemanticsAction.values.keys) {
900+
// ignore: deprecated_member_use
901+
for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) {
899902
actions |= index;
900903
}
901-
for (final int index in SemanticsFlag.values.keys) {
904+
// ignore: deprecated_member_use
905+
for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) {
902906
flags |= index;
903907
}
904908
final SemanticsData data = SemanticsData(
@@ -1081,10 +1085,12 @@ void main() {
10811085
testWidgets('only matches given flags and actions', (WidgetTester tester) async {
10821086
int allActions = 0;
10831087
int allFlags = 0;
1084-
for (final int index in SemanticsAction.values.keys) {
1088+
// ignore: deprecated_member_use
1089+
for (final int index in SemanticsAction.doNotUseWillBeDeletedWithoutWarningKeys) {
10851090
allActions |= index;
10861091
}
1087-
for (final int index in SemanticsFlag.values.keys) {
1092+
// ignore: deprecated_member_use
1093+
for (final int index in SemanticsFlag.doNotUseWillBeDeletedWithoutWarningKeys) {
10881094
allFlags |= index;
10891095
}
10901096
final SemanticsData emptyData = SemanticsData(

0 commit comments

Comments
 (0)