a11y: name settings switches by their row title and expose selected state on Fiat API choices (#3808)
What changed, and why it matters
This commit improves screen-reader accessibility in the Cake Wallet mobile app. It makes settings switches announce their name (e.g., 'Auto generate addresses, switch, off') and makes choice options like 'Enabled / Tor only / Disabled' tell the user which one is currently selected. There is no security vulnerability being fixed here; it is purely an accessibility (a11y) improvement.
No security action needed. Treat as a normal accessibility improvement. Reviewers may optionally verify the new tests pass and that TalkBack/VoiceOver announcements match the described behavior.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The change adds Flutter Semantics widgets to three UI components: ListItemToggleWidget, SettingsSwitcherCell, and SettingsChoicesCell, plus Picker items. It merges row text and switch state into a single semantics node when the row has no separate onTap, and keeps row and switch actions separate when onTap is provided. Choice options are now exposed with button role, selected state, and mutually-exclusive grouping. A new widget test verifies the semantics contract. No logic, authentication, cryptography, or network behavior is modified.
Changed components
lib/src/screens/settings/widgets/settings_choices_cell.dartlib/src/screens/settings/widgets/settings_switcher_cell.dartlib/src/widgets/new_list_row/list_item_toggle_widget.dartlib/src/widgets/picker.darttest/src/widgets/settings_controls_semantics_test.dartInspect captured patch +198 / −12
### lib/src/screens/settings/widgets/settings_choices_cell.dart
@@ -71,7 +71,7 @@ class SettingsChoicesCell extends StatelessWidget {
children: items.map((dynamic e) {
final isSelected = choicesListItem.selectedItem == e;
return Expanded(
- child: GestureDetector(
+ child: Semantics(button: true, selected: isSelected, inMutuallyExclusiveGroup: true, child: GestureDetector(
onTap: () => choicesListItem.onItemSelected.call(e),
child: Container(
padding: const EdgeInsets.symmetric(vertical: 8),
@@ -92,6 +92,7 @@ class SettingsChoicesCell extends StatelessWidget {
),
),
),
+ ),
);
}).toList(),
),
### lib/src/screens/settings/widgets/settings_switcher_cell.dart
@@ -24,17 +24,21 @@ class SettingsSwitcherCell extends StandardListRow {
final double? height;
@override
- Widget buildTrailing(BuildContext context) => StandardSwitch(
- value: value,
- onTapped: () => onValueChange?.call(context, !value),
- backgroundColor: switchBackgroundColor,
+ Widget buildTrailing(BuildContext context) => Semantics(
+ container: onTap != null,
+ label: onTap != null ? title : null,
+ child: StandardSwitch(
+ value: value,
+ onTapped: () => onValueChange?.call(context, !value),
+ backgroundColor: switchBackgroundColor,
+ ),
);
@override
Widget build(BuildContext context) {
final leading = buildLeading(context);
final trailing = buildTrailing(context);
- return Container(
+ final row = Container(
height: height,
padding: padding ?? EdgeInsets.only(left: 12, right: 12),
child: TextButton(
@@ -64,6 +68,7 @@ class SettingsSwitcherCell extends StandardListRow {
),
),
);
+ return onTap == null ? MergeSemantics(child: row) : row;
}
@override
### lib/src/widgets/new_list_row/list_item_toggle_widget.dart
@@ -41,7 +41,7 @@ class _ListItemToggleWidgetState extends State<ListItemToggleWidget> {
@override
Widget build(BuildContext context) {
- return ListItemStyleWrapper(
+ return MergeSemantics(child: ListItemStyleWrapper(
isFirstInSection: widget.isFirstInSection,
isLastInSection: widget.isLastInSection,
iconPath: widget.iconPath,
@@ -92,6 +92,6 @@ class _ListItemToggleWidgetState extends State<ListItemToggleWidget> {
),
],
);
- });
+ }));
}
}
\ No newline at end of file
### lib/src/widgets/picker.dart
@@ -370,7 +370,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
],
);
- return GestureDetector(
+ return Semantics(button: true, selected: false, inMutuallyExclusiveGroup: true, child: GestureDetector(
key: ValueKey('picker_items_index_${itemName}_button_key'),
onTap: () {
if (widget.closeOnItemSelected) Navigator.of(context).pop();
@@ -390,7 +390,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
)
: itemContent,
),
- );
+ ));
}
Widget buildSelectedItem(int index) {
@@ -459,7 +459,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
],
);
- return GestureDetector(
+ return Semantics(button: true, selected: true, inMutuallyExclusiveGroup: true, child: GestureDetector(
key: ValueKey('picker_items_index_${itemName}_selected_item_button_key'),
onTap: () {
if (widget.closeOnItemSelected) Navigator.of(context).pop();
@@ -478,7 +478,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
)
: itemContent,
),
- );
+ ));
}
Widget? _getItemIcon(Item item) {
### test/src/widgets/settings_controls_semantics_test.dart
@@ -0,0 +1,180 @@
+import "package:cake_wallet/di.dart";
+import "package:cake_wallet/generated/i18n.dart";
+import "package:cake_wallet/locales/locale.dart";
+import "package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart";
+import "package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart";
+import "package:cake_wallet/src/widgets/new_list_row/list_item_toggle_widget.dart";
+import "package:cake_wallet/src/widgets/picker.dart";
+import "package:cake_wallet/src/widgets/standard_switch.dart";
+import "package:cake_wallet/themes/core/theme_store.dart";
+import "package:cake_wallet/view_model/settings/choices_list_item.dart";
+import "package:flutter/material.dart";
+import "package:flutter/semantics.dart";
+import "package:flutter_test/flutter_test.dart";
+
+void main() {
+ late bool registeredThemeStore;
+
+ setUpAll(() {
+ registeredThemeStore = !getIt.isRegistered<ThemeStore>();
+ if (registeredThemeStore) {
+ getIt.registerSingleton(ThemeStore());
+ }
+ });
+
+ tearDownAll(() async {
+ if (registeredThemeStore) {
+ await getIt.unregister<ThemeStore>();
+ }
+ });
+
+ Future<void> pump(WidgetTester tester, Widget child) => tester.pumpWidget(
+ MaterialApp(
+ localizationsDelegates: localizationDelegates,
+ supportedLocales: S.delegate.supportedLocales,
+ home: Scaffold(body: child),
+ ),
+ );
+
+ testWidgets("ListItemToggleWidget switch is named by its row title", (tester) async {
+ final handle = tester.ensureSemantics();
+ await pump(
+ tester,
+ ListItemToggleWidget(
+ key: const ValueKey("auto_generate_subaddresses"),
+ keyValue: "auto_generate_subaddresses",
+ label: "Auto generate addresses",
+ value: false,
+ onChanged: (_) {},
+ ),
+ );
+
+ expect(find.bySemanticsLabel("Auto generate addresses"), findsOneWidget);
+ expect(
+ tester.getSemantics(find.byType(StandardSwitch)),
+ containsSemantics(
+ label: "Auto generate addresses",
+ hasToggledState: true,
+ isToggled: false,
+ hasTapAction: true,
+ ),
+ );
+ handle.dispose();
+ });
+
+ testWidgets("SettingsSwitcherCell switch is named by its row title", (tester) async {
+ final handle = tester.ensureSemantics();
+ await pump(
+ tester,
+ SettingsSwitcherCell(
+ title: "Disable service status bulletin",
+ value: true,
+ onValueChange: (_, __) {},
+ ),
+ );
+
+ expect(find.bySemanticsLabel("Disable service status bulletin"), findsOneWidget);
+ expect(
+ tester.getSemantics(find.byType(StandardSwitch)),
+ containsSemantics(
+ label: "Disable service status bulletin",
+ hasToggledState: true,
+ isToggled: true,
+ hasTapAction: true,
+ ),
+ );
+ handle.dispose();
+ });
+
+ testWidgets("SettingsSwitcherCell with onTap keeps row and switch actions apart", (tester) async {
+ final handle = tester.ensureSemantics();
+ var opened = 0;
+ bool? toggledTo;
+ await pump(
+ tester,
+ SettingsSwitcherCell(
+ title: "Tether USD (USDT)",
+ value: false,
+ onValueChange: (_, value) => toggledTo = value,
+ onTap: (_) => opened++,
+ ),
+ );
+
+ final switchNode = tester.getSemantics(find.byType(StandardSwitch));
+ expect(
+ switchNode,
+ containsSemantics(
+ label: "Tether USD (USDT)",
+ hasToggledState: true,
+ isToggled: false,
+ hasTapAction: true,
+ ),
+ );
+ switchNode.owner!.performAction(switchNode.id, SemanticsAction.tap);
+ expect(toggledTo, true);
+ expect(opened, 0);
+
+ final rowNode = tester.getSemantics(find.byType(TextButton));
+ expect(rowNode.id, isNot(switchNode.id));
+ rowNode.owner!.performAction(rowNode.id, SemanticsAction.tap);
+ expect(opened, 1);
+ handle.dispose();
+ });
+
+ testWidgets("SettingsChoicesCell options expose selected state", (tester) async {
+ final handle = tester.ensureSemantics();
+ await pump(
+ tester,
+ SettingsChoicesCell(
+ ChoicesListItem<String>(
+ title: "Fiat API",
+ items: const ["Enabled", "Tor only", "Disabled"],
+ selectedItem: "Tor only",
+ ),
+ ),
+ );
+
+ expect(
+ tester.getSemantics(find.text("Tor only")),
+ containsSemantics(
+ label: "Tor only",
+ isButton: true,
+ isSelected: true,
+ isInMutuallyExclusiveGroup: true,
+ ),
+ );
+ expect(
+ tester.getSemantics(find.text("Enabled")),
+ containsSemantics(label: "Enabled", isSelected: false, isInMutuallyExclusiveGroup: true),
+ );
+ handle.dispose();
+ });
+
+ testWidgets("Picker items expose selected state", (tester) async {
+ final handle = tester.ensureSemantics();
+ await pump(
+ tester,
+ Picker<String>(
+ items: const ["Enabled", "Tor only", "Disabled"],
+ selectedAtIndex: 0,
+ onItemSelected: (_) {},
+ isSeparated: false,
+ ),
+ );
+
+ expect(
+ tester.getSemantics(find.text("Enabled")),
+ containsSemantics(
+ label: "Enabled",
+ isButton: true,
+ isSelected: true,
+ isInMutuallyExclusiveGroup: true,
+ ),
+ );
+ expect(
+ tester.getSemantics(find.text("Tor only")),
+ containsSemantics(label: "Tor only", isSelected: false, isInMutuallyExclusiveGroup: true),
+ );
+ handle.dispose();
+ });
+}Why this scored 19/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.