disabledTextColor and final types

Fix disabled color for icons Add ContextMenuTheme type for final variables
ubuntu-flutter-community · Jul 14, 2022 · 726decb · 726decb
1 parent 55259a6
commit 726decb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/lib/widgets/context_menu/context_menu.dart b/lib/widgets/context_menu/context_menu.dart
@@ -51,7 +51,8 @@ void openContextMenu(
   Offset position,
   List<BaseContextMenuEntry> entries,
 ) {
-  final menuTheme = Theme.of(context).extension<ContextMenuTheme>()!;
+  final ContextMenuTheme menuTheme =
+      Theme.of(context).extension<ContextMenuTheme>()!;
 
   showMenu(
     context: context,

diff --git a/lib/widgets/context_menu/context_menu_entry.dart b/lib/widgets/context_menu/context_menu_entry.dart
@@ -64,7 +64,8 @@ class ContextMenuEntry extends BaseContextMenuEntry {
 class _ContextMenuEntryState extends State<ContextMenuEntry> {
   @override
   Widget build(BuildContext context) {
-    final menuTheme = Theme.of(context).extension<ContextMenuTheme>()!;
+    final ContextMenuTheme menuTheme =
+        Theme.of(context).extension<ContextMenuTheme>()!;
 
     return InkWell(
       onTap: widget.enabled
@@ -84,7 +85,7 @@ class _ContextMenuEntryState extends State<ContextMenuEntry> {
                   size: menuTheme.iconSize,
                   color: widget.enabled
                       ? menuTheme.iconColor
-                      : menuTheme.disabledTextColor,
+                      : menuTheme.disabledIconColor,
                 ),
                 child: widget.leading!,
               ),

diff --git a/lib/widgets/context_menu/context_sub_menu_entry.dart b/lib/widgets/context_menu/context_sub_menu_entry.dart
@@ -37,7 +37,8 @@ class ContextSubMenuEntry extends BaseContextMenuEntry {
 class _ContextSubMenuEntryState extends State<ContextSubMenuEntry> {
   @override
   Widget build(BuildContext context) {
-    final menuTheme = Theme.of(context).extension<ContextMenuTheme>()!;
+    final ContextMenuTheme menuTheme =
+        Theme.of(context).extension<ContextMenuTheme>()!;
 
     return InkWell(
       onTap: widget.enabled
@@ -63,7 +64,7 @@ class _ContextSubMenuEntryState extends State<ContextSubMenuEntry> {
                   size: menuTheme.iconSize,
                   color: widget.enabled
                       ? menuTheme.iconColor
-                      : menuTheme.disabledTextColor,
+                      : menuTheme.disabledIconColor,
                 ),
                 child: widget.leading!,
               ),
@@ -86,7 +87,7 @@ class _ContextSubMenuEntryState extends State<ContextSubMenuEntry> {
                 size: menuTheme.iconSize,
                 color: widget.enabled
                     ? menuTheme.iconColor
-                    : menuTheme.disabledTextColor,
+                    : menuTheme.disabledIconColor,
               ),
               child: const Icon(Icons.chevron_right),
             )