organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

accessibility: Add semantics to SimpleDialog

This commit is contained in:
Calcitem 2021-08-31 00:39:21 +08:00
parent 3df86003e2
commit 3dfd5f00e2
No known key found for this signature in database
GPG Key ID: F2F7C29E054CFB80
2 changed files with 225 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
src/ui/flutter_app/lib/widgets/game_page.dart
View File

@ -714,47 +714,49 @@ class _GamePageState extends State<GamePage>
context: context,
backgroundColor: Colors.transparent,
builder: (BuildContext context) {
return SimpleDialog(
backgroundColor: Colors.transparent,
children: <Widget>[
SimpleDialogOption(
child: Text(
S.of(context).newGame,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
return Semantics(
label: S.of(context).game,
child: SimpleDialog(
backgroundColor: Colors.transparent,
children: <Widget>[
SimpleDialogOption(
child: Text(
S.of(context).newGame,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onStartNewGameButtonPressed,
),
onPressed: onStartNewGameButtonPressed,
),
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).importGame,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).importGame,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onImportGameButtonPressed,
),
onPressed: onImportGameButtonPressed,
),
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).exportGame,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).exportGame,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onExportGameButtonPressed,
),
onPressed: onExportGameButtonPressed,
),
SizedBox(height: AppTheme.sizedBoxHeight),
Config.screenReaderSupport
? SimpleDialogOption(
child: Text(
S.of(context).close,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: () => Navigator.of(context).pop(),
)
: SizedBox(height: 1),
/*
SizedBox(height: AppTheme.sizedBoxHeight),
Config.screenReaderSupport
? SimpleDialogOption(
child: Text(
S.of(context).close,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: () => Navigator.of(context).pop(),
)
: SizedBox(height: 1),
/*
SizedBox(height: AppTheme.sizedBoxHeight),
Config.experimentsEnabled
? SimpleDialogOption(
@ -793,7 +795,7 @@ class _GamePageState extends State<GamePage>
)
: SizedBox(height: 1),
*/
/*
/*
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
@ -804,7 +806,8 @@ class _GamePageState extends State<GamePage>
onPressed: onAutoReplayButtonPressed,
),
*/
],
],
),
);
},
);
@ -822,90 +825,93 @@ class _GamePageState extends State<GamePage>
context: context,
backgroundColor: Colors.transparent,
builder: (BuildContext context) {
return SimpleDialog(
backgroundColor: Colors.transparent,
children: <Widget>[
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).takeBack,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
return Semantics(
label: S.of(context).move,
child: SimpleDialog(
backgroundColor: Colors.transparent,
children: <Widget>[
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).takeBack,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onTakeBackButtonPressed,
),
onPressed: onTakeBackButtonPressed,
),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).stepForward,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).stepForward,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onStepForwardButtonPressed,
),
onPressed: onStepForwardButtonPressed,
),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).takeBackAll,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).takeBackAll,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onTakeBackAllButtonPressed,
),
onPressed: onTakeBackAllButtonPressed,
),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).stepForwardAll,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SimpleDialogOption(
child: Text(
S.of(context).stepForwardAll,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onStepForwardAllButtonPressed,
),
onPressed: onStepForwardAllButtonPressed,
),
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).showMoveList,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
Config.isHistoryNavigationToolbarShown
? SizedBox(height: 1)
: SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).showMoveList,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onMoveListButtonPressed,
),
onPressed: onMoveListButtonPressed,
),
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).moveNow,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
SizedBox(height: AppTheme.sizedBoxHeight),
SimpleDialogOption(
child: Text(
S.of(context).moveNow,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: onMoveNowButtonPressed,
),
onPressed: onMoveNowButtonPressed,
),
SizedBox(height: AppTheme.sizedBoxHeight),
Config.screenReaderSupport
? SimpleDialogOption(
child: Text(
S.of(context).close,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: () => Navigator.of(context).pop(),
)
: SizedBox(height: 1),
],
SizedBox(height: AppTheme.sizedBoxHeight),
Config.screenReaderSupport
? SimpleDialogOption(
child: Text(
S.of(context).close,
style: AppTheme.simpleDialogOptionTextStyle,
textAlign: TextAlign.center,
),
onPressed: () => Navigator.of(context).pop(),
)
: SizedBox(height: 1),
],
),
);
},
);

193
src/ui/flutter_app/lib/widgets/rule_settings_page.dart
View File

@ -212,42 +212,45 @@ class _RuleSettingsPageState extends State<RuleSettingsPage> {
showModalBottomSheet(
context: context,
builder: (BuildContext context) => Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('9'),
groupValue: Config.piecesCount,
value: 9,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('10'),
groupValue: Config.piecesCount,
value: 10,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('11'),
groupValue: Config.piecesCount,
value: 11,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('12'),
groupValue: Config.piecesCount,
value: 12,
onChanged: callback,
),
ListItemDivider(),
],
builder: (BuildContext context) => Semantics(
label: S.of(context).piecesCount,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('9'),
groupValue: Config.piecesCount,
value: 9,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('10'),
groupValue: Config.piecesCount,
value: 10,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('11'),
groupValue: Config.piecesCount,
value: 11,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('12'),
groupValue: Config.piecesCount,
value: 12,
onChanged: callback,
),
ListItemDivider(),
],
),
),
);
}
@ -269,42 +272,45 @@ class _RuleSettingsPageState extends State<RuleSettingsPage> {
showModalBottomSheet(
context: context,
builder: (BuildContext context) => Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('30'),
groupValue: Config.nMoveRule,
value: 30,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('50'),
groupValue: Config.nMoveRule,
value: 50,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('100'),
groupValue: Config.nMoveRule,
value: 100,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('200'),
groupValue: Config.nMoveRule,
value: 200,
onChanged: callback,
),
ListItemDivider(),
],
builder: (BuildContext context) => Semantics(
label: S.of(context).nMoveRule,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('30'),
groupValue: Config.nMoveRule,
value: 30,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('50'),
groupValue: Config.nMoveRule,
value: 50,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('100'),
groupValue: Config.nMoveRule,
value: 100,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('200'),
groupValue: Config.nMoveRule,
value: 200,
onChanged: callback,
),
ListItemDivider(),
],
),
),
);
}
@ -326,26 +332,29 @@ class _RuleSettingsPageState extends State<RuleSettingsPage> {
showModalBottomSheet(
context: context,
builder: (BuildContext context) => Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('3'),
groupValue: Config.flyPieceCount,
value: 3,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('4'),
groupValue: Config.flyPieceCount,
value: 4,
onChanged: callback,
),
ListItemDivider(),
],
builder: (BuildContext context) => Semantics(
label: S.of(context).flyPieceCount,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('3'),
groupValue: Config.flyPieceCount,
value: 3,
onChanged: callback,
),
ListItemDivider(),
RadioListTile(
activeColor: AppTheme.switchListTileActiveColor,
title: Text('4'),
groupValue: Config.flyPieceCount,
value: 4,
onChanged: callback,
),
ListItemDivider(),
],
),
),
);
}