Revert "accessibility: Add semantics to CustomDrawerIcon"

To fix custom drawer icon cannot shown on general settings. This reverts commit 5a29289.
calcitem · Apr 16, 2024 · b4e687d · b4e687d
1 parent 4982352
commit b4e687d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/src/ui/flutter_app/lib/appearance_settings/widgets/appearance_settings_page.dart b/src/ui/flutter_app/lib/appearance_settings/widgets/appearance_settings_page.dart
@@ -394,16 +394,10 @@ class AppearanceSettingsPage extends StatelessWidget {
         resizeToAvoidBottomInset: false,
         backgroundColor: AppTheme.lightBackgroundColor,
         appBar: AppBar(
-          leading: Semantics(
-            label: S.of(context).menu,
-            child: CustomDrawerIcon.of(context)?.drawerIcon,
-          ),
-          title: Semantics(
-            header: true,
-            child: Text(
-              S.of(context).appearance,
-              style: AppTheme.appBarTheme.titleTextStyle,
-            ),
+          leading: CustomDrawerIcon.of(context)?.drawerIcon,
+          title: Text(
+            S.of(context).appearance,
+            style: AppTheme.appBarTheme.titleTextStyle,
           ),
         ),
         body: SettingsList(

diff --git a/src/ui/flutter_app/lib/general_settings/widgets/general_settings_page.dart b/src/ui/flutter_app/lib/general_settings/widgets/general_settings_page.dart
@@ -440,10 +440,7 @@ class GeneralSettingsPage extends StatelessWidget {
         resizeToAvoidBottomInset: false,
         backgroundColor: AppTheme.lightBackgroundColor,
         appBar: AppBar(
-          leading: Semantics(
-            label: S.of(context).menu,
-            child: CustomDrawerIcon.of(context)?.drawerIcon,
-          ),
+          leading: CustomDrawerIcon.of(context)?.drawerIcon,
           title: Text(
             S.of(context).generalSettings,
             style: AppTheme.appBarTheme.titleTextStyle,

diff --git a/src/ui/flutter_app/lib/misc/about_page.dart b/src/ui/flutter_app/lib/misc/about_page.dart
@@ -136,10 +136,7 @@ class AboutPage extends StatelessWidget {
         resizeToAvoidBottomInset: false,
         backgroundColor: AppTheme.aboutPageBackgroundColor,
         appBar: AppBar(
-          leading: Semantics(
-            label: S.of(context).menu,
-            child: CustomDrawerIcon.of(context)?.drawerIcon,
-          ),
+          leading: CustomDrawerIcon.of(context)?.drawerIcon,
           title: Text(
             S.of(context).about,
             style: AppTheme.appBarTheme.titleTextStyle,

diff --git a/src/ui/flutter_app/lib/misc/how_to_play_screen.dart b/src/ui/flutter_app/lib/misc/how_to_play_screen.dart
@@ -16,10 +16,7 @@ class HowToPlayScreen extends StatelessWidget {
         appBar: AppBar(
           elevation: 0.0,
           backgroundColor: DB().colorSettings.darkBackgroundColor,
-          leading: Semantics(
-            label: S.of(context).menu,
-            child: CustomDrawerIcon.of(context)?.drawerIcon,
-          ),
+          leading: CustomDrawerIcon.of(context)?.drawerIcon,
           title: Text(
             S.of(context).howToPlay,
             style: AppTheme.helpTextStyle,

diff --git a/src/ui/flutter_app/lib/rule_settings/widgets/rule_settings_page.dart b/src/ui/flutter_app/lib/rule_settings/widgets/rule_settings_page.dart
@@ -435,10 +435,7 @@ class RuleSettingsPage extends StatelessWidget {
         resizeToAvoidBottomInset: false,
         backgroundColor: AppTheme.lightBackgroundColor,
         appBar: AppBar(
-          leading: Semantics(
-            label: S.of(context).menu,
-            child: CustomDrawerIcon.of(context)?.drawerIcon,
-          ),
+          leading: CustomDrawerIcon.of(context)?.drawerIcon,
           title: Text(
             S.of(context).ruleSettings,
             style: AppTheme.appBarTheme.titleTextStyle,