diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart index f6a3c74a2..5050324ba 100644 --- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart +++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_view/new_wallet_recovery_phrase_view.dart @@ -140,7 +140,7 @@ class _NewWalletRecoveryPhraseViewState child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Copy Button. Copies The Recovery Phrase To Clipboard.", + semanticsLabel: "Copy Button. Copies The Recovery Phrase To Clipboard.", color: Theme.of(context) .extension()! .background, diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart index 85e1c1063..50c8bc1eb 100644 --- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart +++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart @@ -87,7 +87,7 @@ class _NewWalletRecoveryPhraseWarningViewState right: 10, ), child: AppBarIconButton( - label: "Question Button. Openes A Dialog For Recovery Phrase Explanation.", + semanticsLabel: "Question Button. Opens A Dialog For Recovery Phrase Explanation.", icon: SvgPicture.asset( Assets.svg.circleQuestion, width: 20, diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart index ca3a4f394..7c7ae4523 100644 --- a/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart +++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart @@ -636,7 +636,7 @@ class _RestoreWalletViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "View QR Code Button. Opens Camera To Scan QR Code For Restoring Wallet.", + semanticsLabel: "View QR Code Button. Opens Camera To Scan QR Code For Restoring Wallet.", key: const Key("restoreWalletViewQrCodeButton"), size: 36, shadows: const [], @@ -663,7 +663,7 @@ class _RestoreWalletViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Paste Button. Pastes From Clipboard For Restoring Wallet.", + semanticsLabel: "Paste Button. Pastes From Clipboard For Restoring Wallet.", key: const Key("restoreWalletPasteButton"), size: 36, shadows: const [], diff --git a/lib/pages/home_view/home_view.dart b/lib/pages/home_view/home_view.dart index e9c839452..9e8f7fde1 100644 --- a/lib/pages/home_view/home_view.dart +++ b/lib/pages/home_view/home_view.dart @@ -191,7 +191,7 @@ class _HomeViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Notifications Button. Takes To Notifications Page.", + semanticsLabel: "Notifications Button. Takes To Notifications Page.", key: const Key("walletsViewAlertsButton"), size: 36, shadows: const [], @@ -255,7 +255,7 @@ class _HomeViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Settings Button. Takes To Settings Page.", + semanticsLabel: "Settings Button. Takes To Settings Page.", key: const Key("walletsViewSettingsButton"), size: 36, shadows: const [], diff --git a/lib/pages/pinpad_views/lock_screen_view.dart b/lib/pages/pinpad_views/lock_screen_view.dart index f99f3ddfc..f0978bd21 100644 --- a/lib/pages/pinpad_views/lock_screen_view.dart +++ b/lib/pages/pinpad_views/lock_screen_view.dart @@ -248,7 +248,7 @@ class _LockscreenViewState extends ConsumerState { ), CustomPinPut( customKey: CustomKey( - customKeyLabel: Platform.isIOS + semanticsLabel: Platform.isIOS ? "Face ID Button. Checks Face ID." : "Fingerprint Button. Checks Fingerprint." , diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart index b74dc5a33..9800c9c38 100644 --- a/lib/pages/receive_view/receive_view.dart +++ b/lib/pages/receive_view/receive_view.dart @@ -143,7 +143,7 @@ class _ReceiveViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Adress List Pop-up Button. Opens A Pop-up For Adress List Button.", + semanticsLabel: "Address List Pop-up Button. Opens A Pop-up For Adress List Button.", key: const Key("walletNetworkSettingsAddNewNodeViewButton"), size: 36, shadows: const [], diff --git a/lib/pages/send_view/send_view.dart b/lib/pages/send_view/send_view.dart index 479c931ae..6f09a647f 100644 --- a/lib/pages/send_view/send_view.dart +++ b/lib/pages/send_view/send_view.dart @@ -981,7 +981,7 @@ class _SendViewState extends ConsumerState { children: [ _addressToggleFlag ? TextFieldIconButton( - label: "Clear Button. Clears The Address Field Input.", + semanticsLabel: "Clear Button. Clears The Address Field Input.", key: const Key( "sendViewClearAddressFieldButtonKey"), onTap: () { @@ -998,7 +998,7 @@ class _SendViewState extends ConsumerState { child: const XIcon(), ) : TextFieldIconButton( - label: "Paste Button. Pastes From Clipboard To Address Field Input.", + semanticsLabel: "Paste Button. Pastes From Clipboard To Address Field Input.", key: const Key( "sendViewPasteAddressFieldButtonKey"), onTap: () async { @@ -1048,7 +1048,7 @@ class _SendViewState extends ConsumerState { ), if (sendToController.text.isEmpty) TextFieldIconButton( - label: "Address Book Button. Opens Address Book For Address Field.", + semanticsLabel: "Address Book Button. Opens Address Book For Address Field.", key: const Key( "sendViewAddressBookButtonKey"), onTap: () { @@ -1061,7 +1061,7 @@ class _SendViewState extends ConsumerState { ), if (sendToController.text.isEmpty) TextFieldIconButton( - label: "Scan QR Button. Opens Camera For Scanning QR Code.", + semanticsLabel: "Scan QR Button. Opens Camera For Scanning QR Code.", key: const Key( "sendViewScanQrButtonKey"), onTap: () async { diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart index 649464722..de7775629 100644 --- a/lib/pages/wallet_view/wallet_view.dart +++ b/lib/pages/wallet_view/wallet_view.dart @@ -473,7 +473,7 @@ class _WalletViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Network Button. Takes To Network Status Page.", + semanticsLabel: "Network Button. Takes To Network Status Page.", key: const Key("walletViewRadioButton"), size: 36, shadows: const [], @@ -503,7 +503,7 @@ class _WalletViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Notifications Button. Takes To Notifications Page.", + semanticsLabel: "Notifications Button. Takes To Notifications Page.", key: const Key("walletViewAlertsButton"), size: 36, shadows: const [], @@ -571,7 +571,7 @@ class _WalletViewState extends ConsumerState { child: AspectRatio( aspectRatio: 1, child: AppBarIconButton( - label: "Settings Button. Takes To Wallet Settings Page.", + semanticsLabel: "Settings Button. Takes To Wallet Settings Page.", key: const Key("walletViewSettingsButton"), size: 36, shadows: const [], diff --git a/lib/widgets/custom_buttons/app_bar_icon_button.dart b/lib/widgets/custom_buttons/app_bar_icon_button.dart index 7c3980bb8..71d8910d0 100644 --- a/lib/widgets/custom_buttons/app_bar_icon_button.dart +++ b/lib/widgets/custom_buttons/app_bar_icon_button.dart @@ -13,7 +13,7 @@ class AppBarIconButton extends StatelessWidget { // this.circularBorderRadius = 10.0, this.size = 36.0, this.shadows = const [], - this.label = "Button", + this.semanticsLabel = "Button", }) : super(key: key); final Widget icon; @@ -22,7 +22,7 @@ class AppBarIconButton extends StatelessWidget { // final double circularBorderRadius; final double size; final List shadows; - final String label; + final String semanticsLabel; @override Widget build(BuildContext context) { @@ -36,7 +36,7 @@ class AppBarIconButton extends StatelessWidget { ), child: Semantics( excludeSemantics: true, - label: label, + label: semanticsLabel, child: MaterialButton( splashColor: Theme.of(context).extension()!.highlight, padding: EdgeInsets.zero, @@ -59,14 +59,14 @@ class AppBarBackButton extends StatelessWidget { this.isCompact = false, this.size, this.iconSize, - this.label = "Back Button. Takes Back To Previous Page.", + this.semanticsLabel = "Back Button. Takes Back To Previous Page.", }) : super(key: key); final VoidCallback? onPressed; final bool isCompact; final double? size; final double? iconSize; - final String label; + final String semanticsLabel; @override Widget build(BuildContext context) { @@ -79,7 +79,7 @@ class AppBarBackButton extends StatelessWidget { ) : const EdgeInsets.all(10), child: AppBarIconButton( - label: label, + semanticsLabel: semanticsLabel, size: size ?? (isDesktop ? isCompact diff --git a/lib/widgets/custom_pin_put/pin_keyboard.dart b/lib/widgets/custom_pin_put/pin_keyboard.dart index 954bd257c..fc1c58ea6 100644 --- a/lib/widgets/custom_pin_put/pin_keyboard.dart +++ b/lib/widgets/custom_pin_put/pin_keyboard.dart @@ -202,12 +202,12 @@ class CustomKey extends StatelessWidget { Key? key, required this.onPressed, this.iconAssetName, - this.customKeyLabel = "Button", + this.semanticsLabel = "Button", }) : super(key: key); final VoidCallback onPressed; final String? iconAssetName; - final String customKeyLabel; + final String semanticsLabel; @override Widget build(BuildContext context) { @@ -220,7 +220,7 @@ class CustomKey extends StatelessWidget { shadows: const [], ), child: Semantics( - label: customKeyLabel, + label: semanticsLabel, excludeSemantics: true, child: MaterialButton( // splashColor: Theme.of(context).extension()!.highlight, diff --git a/lib/widgets/textfield_icon_button.dart b/lib/widgets/textfield_icon_button.dart index 9be08ef56..df231a781 100644 --- a/lib/widgets/textfield_icon_button.dart +++ b/lib/widgets/textfield_icon_button.dart @@ -8,7 +8,7 @@ class TextFieldIconButton extends StatefulWidget { this.onTap, required this.child, this.color = Colors.transparent, - this.label = "Button", + this.semanticsLabel = "Button", }) : super(key: key); final double width; @@ -16,7 +16,7 @@ class TextFieldIconButton extends StatefulWidget { final VoidCallback? onTap; final Widget child; final Color color; - final String label; + final String semanticsLabel; @override State createState() => _TextFieldIconButtonState(); @@ -39,7 +39,7 @@ class _TextFieldIconButtonState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(100), child: Semantics( - label: widget.label, + label: widget.semanticsLabel, excludeSemantics: true, child: RawMaterialButton( constraints: BoxConstraints(