android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 12:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix-talkback-slide-button-accessibility (#2200)

Browse source 
* fix:talkback send slide button accessibility

* fix accessible button color
This commit is contained in:
Serhii 2025-04-14 15:30:41 +03:00 • committed by GitHub
parent ce12f517f4
commit 990feb48ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 144 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart
View file

@ -33,7 +33,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
if (titleIconPath != null)
Image.asset(titleIconPath!, height: 24, width: 24)
Image.asset(titleIconPath!, height: 24, width: 24, excludeFromSemantics: true)
else
Container(),
const SizedBox(width: 6),

13
lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart
View file

@ -223,6 +223,7 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
onSlideComplete: onSlideComplete,
buttonText: 'Swipe to send',
currentTheme: currentTheme,
accessibleNavigationModeButtonText: S.of(context).send,
),
);
}
@ -248,7 +249,10 @@ class StandardTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
return Semantics(
container: true,
label: itemTitle,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
decoration:
BoxDecoration(borderRadius: BorderRadius.circular(10), color: tileBackgroundColor),
@ -267,6 +271,7 @@ class StandardTile extends StatelessWidget {
),
],
),
),
);
}
}
@ -357,7 +362,10 @@ class AddressExpansionTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
return Semantics(
container: true,
label: name,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)),
color: tileBackgroundColor,
@ -408,6 +416,7 @@ class AddressExpansionTile extends StatelessWidget {
),
),
),
),
);
}
}

28
lib/src/widgets/standard_slide_button_widget.dart
View file

@ -1,3 +1,4 @@
import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
import 'package:cake_wallet/themes/extensions/filter_theme.dart';
import 'package:cake_wallet/themes/extensions/menu_theme.dart';
@ -12,12 +13,14 @@ class StandardSlideButton extends StatefulWidget {
this.buttonText = '',
this.height = 48.0,
required this.currentTheme,
required this.accessibleNavigationModeButtonText,
}) : super(key: key);
final VoidCallback onSlideComplete;
final String buttonText;
final double height;
final ThemeBase currentTheme;
final String accessibleNavigationModeButtonText;
@override
_StandardSlideButtonState createState() => _StandardSlideButtonState();
@ -28,11 +31,7 @@ class _StandardSlideButtonState extends State<StandardSlideButton> {
@override
Widget build(BuildContext context) {
return LayoutBuilder(builder: (context, constraints) {
final double maxWidth = constraints.maxWidth;
const double sideMargin = 4.0;
final double effectiveMaxWidth = maxWidth - 2 * sideMargin;
const double sliderWidth = 42.0;
final bool accessible = MediaQuery.of(context).accessibleNavigation;
final tileBackgroundColor = widget.currentTheme.type == ThemeType.light
? Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor
@ -40,11 +39,22 @@ class _StandardSlideButtonState extends State<StandardSlideButton> {
? Colors.black.withOpacity(0.5)
: Theme.of(context).extension<FilterTheme>()!.buttonColor;
return accessible
? PrimaryButton(
text: widget.accessibleNavigationModeButtonText,
color: Theme.of(context).primaryColor,
textColor: Colors.white,
onPressed: () => widget.onSlideComplete())
: LayoutBuilder(builder: (context, constraints) {
final double maxWidth = constraints.maxWidth;
const double sideMargin = 4.0;
final double effectiveMaxWidth = maxWidth - 2 * sideMargin;
const double sliderWidth = 42.0;
return Container(
height: widget.height,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: tileBackgroundColor),
borderRadius: BorderRadius.circular(10), color: tileBackgroundColor),
child: Stack(
alignment: Alignment.centerLeft,
children: [
@ -83,7 +93,9 @@ class _StandardSlideButtonState extends State<StandardSlideButton> {
),
alignment: Alignment.center,
child: Icon(Icons.arrow_forward,
color: widget.currentTheme.type == ThemeType.bright ? Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor : Theme.of(context).extension<FilterTheme>()!.buttonColor),
color: widget.currentTheme.type == ThemeType.bright
? Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor
: Theme.of(context).extension<FilterTheme>()!.buttonColor),
),
),
)