From 184a1b719ca8117a6d183996a1c01f720aa37f3d Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Tue, 7 Jan 2025 19:08:52 -0500
Subject: [PATCH] Code Quality: Updated existing pane toggles to prepare for
 upcoming Shelf feature

---
 .../Actions/Show/ToggleDetailsPaneAction.cs   | 22 +++++++++----------
 .../Actions/Show/TogglePreviewPaneAction.cs   | 22 +++++++++----------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/Files.App/Actions/Show/ToggleDetailsPaneAction.cs b/src/Files.App/Actions/Show/ToggleDetailsPaneAction.cs
index df548e05f890..883d12db57df 100644
--- a/src/Files.App/Actions/Show/ToggleDetailsPaneAction.cs
+++ b/src/Files.App/Actions/Show/ToggleDetailsPaneAction.cs
@@ -3,35 +3,33 @@
 
 namespace Files.App.Actions
 {
-	internal sealed class ToggleDetailsPaneAction : ObservableObject, IToggleAction
+	internal sealed class ToggleDetailsPaneAction : ObservableObject, IAction
 	{
-		private readonly InfoPaneViewModel viewModel;
+		private readonly InfoPaneViewModel infoPaneViewModel = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
 		private readonly IInfoPaneSettingsService infoPaneSettingsService = Ioc.Default.GetRequiredService<IInfoPaneSettingsService>();
 
 		public string Label
-			=> "ToggleDetailsPane".GetLocalizedResource();
+			=> Strings.ToggleDetailsPane.GetLocalizedResource();
 
 		public string Description
-			=> "ToggleDetailsPaneDescription".GetLocalizedResource();
+			=> Strings.ToggleDetailsPaneDescription.GetLocalizedResource();
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.PanelRight");
 
-		public HotKey HotKey
-			=> new(Keys.D, KeyModifiers.CtrlAlt);
+		public bool IsAccessibleGlobally
+			=> false;
 
-		public bool IsOn
-			=> viewModel.IsEnabled;
+		public bool IsExecutable
+			=> infoPaneViewModel.IsEnabled;
 
 		public ToggleDetailsPaneAction()
 		{
-			viewModel = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
-			viewModel.PropertyChanged += ViewModel_PropertyChanged;
+			infoPaneViewModel.PropertyChanged += ViewModel_PropertyChanged;
 		}
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			viewModel.IsEnabled = true;
 			infoPaneSettingsService.SelectedTab = InfoPaneTabs.Details;
 
 			return Task.CompletedTask;
@@ -40,7 +38,7 @@ public Task ExecuteAsync(object? parameter = null)
 		private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName is nameof(InfoPaneViewModel.IsEnabled))
-				OnPropertyChanged(nameof(IsOn));
+				OnPropertyChanged(nameof(IsExecutable));
 		}
 	}
 }
diff --git a/src/Files.App/Actions/Show/TogglePreviewPaneAction.cs b/src/Files.App/Actions/Show/TogglePreviewPaneAction.cs
index cdd389c98e0a..4dab997565da 100644
--- a/src/Files.App/Actions/Show/TogglePreviewPaneAction.cs
+++ b/src/Files.App/Actions/Show/TogglePreviewPaneAction.cs
@@ -3,35 +3,33 @@
 
 namespace Files.App.Actions
 {
-	internal sealed class TogglePreviewPaneAction : ObservableObject, IToggleAction
+	internal sealed class TogglePreviewPaneAction : ObservableObject, IAction
 	{
-		private readonly InfoPaneViewModel viewModel;
+		private readonly InfoPaneViewModel infoPaneViewModel = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
 		private readonly IInfoPaneSettingsService infoPaneSettingsService = Ioc.Default.GetRequiredService<IInfoPaneSettingsService>();
 
 		public string Label
-			=> "TogglePreviewPane".GetLocalizedResource();
+			=> Strings.TogglePreviewPane.GetLocalizedResource();
 
 		public string Description
-			=> "TogglePreviewPaneDescription".GetLocalizedResource();
+			=> Strings.TogglePreviewPaneDescription.GetLocalizedResource();
 
 		public RichGlyph Glyph
 			=> new(themedIconStyle: "App.ThemedIcons.PanelRight");
 
-		public HotKey HotKey
-			=> new(Keys.P, KeyModifiers.CtrlAlt);
+		public bool IsAccessibleGlobally
+			=> false;
 
-		public bool IsOn
-			=> viewModel.IsEnabled;
+		public bool IsExecutable
+			=> infoPaneViewModel.IsEnabled;
 
 		public TogglePreviewPaneAction()
 		{
-			viewModel = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
-			viewModel.PropertyChanged += ViewModel_PropertyChanged;
+			infoPaneViewModel.PropertyChanged += ViewModel_PropertyChanged;
 		}
 
 		public Task ExecuteAsync(object? parameter = null)
 		{
-			viewModel.IsEnabled = true;
 			infoPaneSettingsService.SelectedTab = InfoPaneTabs.Preview;
 
 			return Task.CompletedTask;
@@ -40,7 +38,7 @@ public Task ExecuteAsync(object? parameter = null)
 		private void ViewModel_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName is nameof(InfoPaneViewModel.IsEnabled))
-				OnPropertyChanged(nameof(IsOn));
+				OnPropertyChanged(nameof(IsExecutable));
 		}
 	}
 }