From 91564e0933945bd297da679f8279080e41861d53 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 1 Sep 2021 21:17:20 +1000
Subject: [PATCH] remove null state from action keyword Enabled status

---
 .../Views/ActionKeywordSetting.xaml                    |  2 +-
 .../Views/ActionKeywordSetting.xaml.cs                 | 10 +++++-----
 .../Views/ExplorerSettings.xaml.cs                     |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
index 19ff624b0..a497d2b26 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml
@@ -31,7 +31,7 @@
                   Margin="10" Grid.Row="0" Grid.Column="2" Content="{DynamicResource plugin_explorer_actionkeyword_enabled}"
                   Width="auto"
                   VerticalAlignment="Center" IsChecked="{Binding Enabled}"
-                  Visibility="{Binding Visible}"/>
+                  Visibility="{Binding EnabledVisibility}"/>
         <Button Name="DownButton"
                 Click="OnDoneButtonClick" Grid.Row="1" Grid.Column="2"
                 Margin="10 0 10 0" Width="80" Height="35"
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
index 18703e5ea..ceb743089 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml.cs
@@ -23,18 +23,18 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             set
             {
                 // Set Enable to be true if user change ActionKeyword
-                if (Enabled is not null)
-                    Enabled = true;
+                Enabled = true;
                 _actionKeyword = value;
             }
         }
 
-        public bool? Enabled { get; set; }
+        public bool Enabled { get; set; }
 
         private string _actionKeyword;
 
-        public Visibility Visible =>
-            CurrentActionKeyword.Enabled is not null ? Visibility.Visible : Visibility.Collapsed;
+        public Visibility EnabledVisibility 
+            => CurrentActionKeyword.KeywordProperty == Settings.ActionKeyword.FileContentSearchActionKeyword
+                ? Visibility.Collapsed : Visibility.Visible;
 
         public ActionKeywordSetting(SettingsViewModel settingsViewModel,
             ActionKeywordView selectedActionKeyword)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
index 0c3799cee..abcae97ab 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -325,7 +325,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views
         }
 
         public string Description { get; private init; }
-        public string Color => Enabled ?? true ? "Black" : "Gray";
+        public string Color => Enabled ? "Black" : "Gray";
 
         internal Settings.ActionKeyword KeywordProperty { get; }
 
@@ -335,11 +335,10 @@ namespace Flow.Launcher.Plugin.Explorer.Views
             set => _settings.SetActionKeyword(KeywordProperty, value);
         }
 
-        public bool? Enabled
+        public bool Enabled
         {
             get => _settings.GetActionKeywordEnabled(KeywordProperty);
-            set => _settings.SetActionKeywordEnabled(KeywordProperty,
-                value ?? throw new ArgumentException("Unexpected null value"));
+            set => _settings.SetActionKeywordEnabled(KeywordProperty, value);
         }
     }
 }
\ No newline at end of file