From eaa7601b43a7f85e1f208494b11c2e5ddc8945c8 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Tue, 7 Jan 2025 11:52:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fix=20button=20semantics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset_picker_builder_delegate.dart | 28 ++++++++----------- .../asset_picker_viewer_builder_delegate.dart | 9 +----- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/lib/src/delegates/asset_picker_builder_delegate.dart b/lib/src/delegates/asset_picker_builder_delegate.dart index ab76bbc7..4665754e 100644 --- a/lib/src/delegates/asset_picker_builder_delegate.dart +++ b/lib/src/delegates/asset_picker_builder_delegate.dart @@ -618,14 +618,7 @@ abstract class AssetPickerBuilderDelegate { Navigator.maybeOf(context)?.maybePop(); }, tooltip: MaterialLocalizations.of(context).closeButtonTooltip, - icon: Icon( - Icons.close, - semanticLabel: switch (Theme.of(context).platform) { - TargetPlatform.android => - MaterialLocalizations.of(context).closeButtonTooltip, - _ => null, - }, - ), + icon: const Icon(Icons.close), ), ); } @@ -693,14 +686,17 @@ abstract class AssetPickerBuilderDelegate { ), ); - final Widget accessLimitedButton = GestureDetector( - onTap: () { - permissionOverlayDisplay.value = false; - }, - child: ScaleText( - textDelegate.accessLimitedAssets, - style: TextStyle(color: interactiveTextColor(context)), - semanticsLabel: semanticsTextDelegate.accessLimitedAssets, + final Widget accessLimitedButton = Semantics( + label: semanticsTextDelegate.accessLimitedAssets, + button: true, + child: GestureDetector( + onTap: () { + permissionOverlayDisplay.value = false; + }, + child: ScaleText( + textDelegate.accessLimitedAssets, + style: TextStyle(color: interactiveTextColor(context)), + ), ), ); diff --git a/lib/src/delegates/asset_picker_viewer_builder_delegate.dart b/lib/src/delegates/asset_picker_viewer_builder_delegate.dart index a0a186fd..3d75ce5c 100644 --- a/lib/src/delegates/asset_picker_viewer_builder_delegate.dart +++ b/lib/src/delegates/asset_picker_viewer_builder_delegate.dart @@ -733,14 +733,7 @@ class DefaultAssetPickerViewerBuilderDelegate Navigator.maybeOf(context)?.maybePop(); }, tooltip: MaterialLocalizations.of(context).backButtonTooltip, - icon: Icon( - Icons.arrow_back_ios_new, - semanticLabel: switch (Theme.of(context).platform) { - TargetPlatform.android => - MaterialLocalizations.of(context).backButtonTooltip, - _ => null, - }, - ), + icon: const Icon(Icons.arrow_back_ios_new), ), ), centerTitle: true, From 4c555c1238d33cc311de802e747e7a72b83a9232 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Tue, 7 Jan 2025 11:52:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20Exclude=20example=20emoji=20?= =?UTF-8?q?from=20semantics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/lib/widgets/method_list_view.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/example/lib/widgets/method_list_view.dart b/example/lib/widgets/method_list_view.dart index 4ec06924..7fa87cfd 100644 --- a/example/lib/widgets/method_list_view.dart +++ b/example/lib/widgets/method_list_view.dart @@ -40,9 +40,11 @@ class _MethodListViewState extends State { width: 48, height: 48, child: Center( - child: Text( - model.icon, - style: const TextStyle(fontSize: 28.0), + child: ExcludeSemantics( + child: Text( + model.icon, + style: const TextStyle(fontSize: 28.0), + ), ), ), ),