Code Quality: Removing PaneHolder to solely use PreviewPaneHolder

src/Files.App/App.xaml.cs

@@ -55,7 +55,6 @@ public partial class App : Application
 		public static StorageHistoryWrapper HistoryWrapper = new StorageHistoryWrapper();
 		public static SettingsViewModel AppSettings { get; private set; }
 		public static AppModel AppModel { get; private set; }
-		public static PaneViewModel PaneViewModel { get; private set; }
 		public static PreviewPaneViewModel PreviewPaneViewModel { get; private set; }
 		public static JumpListManager JumpList { get; private set; }
 		public static RecentItems RecentItemsManager { get; private set; }
@@ -109,7 +108,7 @@ private IServiceProvider ConfigureServices()
 				.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 				.AddSingleton<IFoldersSettingsService, FoldersSettingsService>((sp) => new FoldersSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 				.AddSingleton<IApplicationSettingsService, ApplicationSettingsService>((sp) => new ApplicationSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
-				.AddSingleton<IPaneSettingsService, PaneSettingsService>((sp) => new PaneSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
+				.AddSingleton<IPreviewPaneSettingsService, PreviewPaneSettingsService>((sp) => new PreviewPaneSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 				.AddSingleton<ILayoutSettingsService, LayoutSettingsService>((sp) => new LayoutSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 				.AddSingleton<IAppSettingsService, AppSettingsService>((sp) => new AppSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 				// Settings not related to IUserSettingsService:
@@ -149,7 +148,6 @@ private static void EnsureSettingsAndConfigurationAreBootstrapped()
 			JumpList ??= new JumpListManager();
 			RecentItemsManager ??= new RecentItems();
 			AppModel ??= new AppModel();
-			PaneViewModel ??= new PaneViewModel();
 			PreviewPaneViewModel ??= new PreviewPaneViewModel();
 			LibraryManager ??= new LibraryManager();
 			DrivesManager ??= new DrivesManager();
@@ -297,7 +295,6 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 			}
 
 			DrivesManager?.Dispose();
-			PaneViewModel?.Dispose();
 			PreviewPaneViewModel?.Dispose();
 
 			// Try to maintain clipboard data after app close

src/Files.App/BaseLayout.cs

@@ -58,7 +58,7 @@ public abstract class BaseLayout : Page, IBaseLayout, INotifyPropertyChanged
 
 		public CurrentInstanceViewModel? InstanceViewModel => ParentShellPageInstance?.InstanceViewModel;
 
-		public IPaneViewModel PaneViewModel => App.PaneViewModel;
+		public PreviewPaneViewModel PreviewPaneViewModel => App.PreviewPaneViewModel;
 
 		public AppModel AppModel => App.AppModel;
 		public DirectoryPropertiesViewModel DirectoryPropertiesViewModel { get; }
@@ -205,9 +205,9 @@ internal set
 						App.PreviewPaneViewModel.SelectedItem = value?.Count == 1 ? value.First() : null;
 
 						// check if the preview pane is open before updating the model
-						if (PaneViewModel.IsPreviewSelected)
+						if (PreviewPaneViewModel.IsEnabled)
 						{
-							bool isPaneEnabled = ((App.Window.Content as Frame)?.Content as MainPage)?.IsPaneEnabled ?? false;
+							bool isPaneEnabled = ((App.Window.Content as Frame)?.Content as MainPage)?.ShouldPreviewPaneBeActive ?? false;
 							if (isPaneEnabled)
 								App.PreviewPaneViewModel.UpdateSelectedItemPreview();
 						}
@@ -1039,7 +1039,7 @@ protected void UninitializeDrag(UIElement element)
 
 		public virtual void Dispose()
 		{
-			PaneViewModel?.Dispose();
+			PreviewPaneViewModel?.Dispose();
 			UnhookBaseEvents();
 		}
 

src/Files.App/DataModels/AppModel.cs

@@ -11,9 +11,6 @@ namespace Files.App.DataModels
 {
 	public class AppModel : ObservableObject
 	{
-		// todo: refactor PaneViewModel, this doesn't belong here
-		public IPaneViewModel PaneViewModel { get; } = new PaneViewModel();
-
 		public AppModel()
 		{
 			Clipboard.ContentChanged += Clipboard_ContentChanged;

src/Files.App/IBaseLayout.cs

@@ -21,7 +21,7 @@ public interface IBaseLayout : IDisposable
 
 		ItemManipulationModel ItemManipulationModel { get; }
 
-		IPaneViewModel PaneViewModel { get; }
+		PreviewPaneViewModel PreviewPaneViewModel { get; }
 
 		public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel { get; }
 		public DirectoryPropertiesViewModel DirectoryPropertiesViewModel { get; }

src/Files.App/ServicesImplementation/Settings/PaneSettingsService.cs → src/Files.App/ServicesImplementation/Settings/PreviewPaneSettingsService.cs

@@ -7,11 +7,11 @@
 
 namespace Files.App.ServicesImplementation.Settings
 {
-	internal sealed class PaneSettingsService : BaseObservableJsonSettings, IPaneSettingsService
+	internal sealed class PreviewPaneSettingsService : BaseObservableJsonSettings, IPreviewPaneSettingsService
 	{
-		public PaneContents Content
+		public bool IsEnabled
 		{
-			get => Get(PaneContents.None);
+			get => Get(false);
 			set => Set(value);
 		}
 
@@ -39,7 +39,7 @@ public bool ShowPreviewOnly
 			set => Set(value);
 		}
 
-		public PaneSettingsService(ISettingsSharingContext settingsSharingContext)
+		public PreviewPaneSettingsService(ISettingsSharingContext settingsSharingContext)
 		{
 			RegisterSettingsContext(settingsSharingContext);
 		}

src/Files.App/ServicesImplementation/Settings/UserSettingsService.cs

@@ -30,10 +30,10 @@ public IAppearanceSettingsService AppearanceSettingsService
 			get => GetSettingsService(ref _AppearanceSettingsService);
 		}
 
-		private IPaneSettingsService _PaneSettingsService;
-		public IPaneSettingsService PaneSettingsService
+		private IPreviewPaneSettingsService _PreviewPaneSettingsService;
+		public IPreviewPaneSettingsService PreviewPaneSettingsService
 		{
-			get => GetSettingsService(ref _PaneSettingsService);
+			get => GetSettingsService(ref _PreviewPaneSettingsService);
 		}
 
 		private ILayoutSettingsService _LayoutSettingsService;

src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs

@@ -26,16 +26,16 @@ public MediaPreview(MediaPreviewViewModel model)
 
 		private void PlayerContext_Loaded(object sender, RoutedEventArgs e)
 		{
-			PlayerContext.MediaPlayer.Volume = UserSettingsService.PaneSettingsService.MediaVolume;
+			PlayerContext.MediaPlayer.Volume = UserSettingsService.PreviewPaneSettingsService.MediaVolume;
 			PlayerContext.MediaPlayer.VolumeChanged += MediaPlayer_VolumeChanged;
 			ViewModel.TogglePlaybackRequested += TogglePlaybackRequestInvoked;
 		}
 
 		private void MediaPlayer_VolumeChanged(MediaPlayer sender, object args)
 		{
-			if (sender.Volume != UserSettingsService.PaneSettingsService.MediaVolume)
+			if (sender.Volume != UserSettingsService.PreviewPaneSettingsService.MediaVolume)
 			{
-				UserSettingsService.PaneSettingsService.MediaVolume = sender.Volume;
+				UserSettingsService.PreviewPaneSettingsService.MediaVolume = sender.Volume;
 			}
 		}
 

src/Files.App/UserControls/InnerNavigationToolbar.xaml

@@ -823,7 +823,7 @@
 				MinWidth="40"
 				AccessKey="P"
 				AutomationProperties.Name="{helpers:ResourceString Name=PreviewPaneToggle/AutomationProperties/Name}"
-				IsChecked="{x:Bind AppModel.PaneViewModel.IsPreviewSelected, Mode=TwoWay}"
+				IsChecked="{x:Bind PreviewPaneViewModel.IsEnabled, Mode=TwoWay}"
 				IsEnabled="{x:Bind ShowPreviewPaneButton, Mode=OneWay}"
 				Label="{helpers:ResourceString Name=PreviewPaneToggle/Label}"
 				LabelPosition="Collapsed"

src/Files.App/UserControls/InnerNavigationToolbar.xaml.cs

@@ -27,6 +27,8 @@ public InnerNavigationToolbar()
 
 		public AppModel AppModel => App.AppModel;
 
+		public PreviewPaneViewModel PreviewPaneViewModel => App.PreviewPaneViewModel;
+
 		public ToolbarViewModel ViewModel
 		{
 			get => (ToolbarViewModel)GetValue(ViewModelProperty);

src/Files.App/UserControls/Pane/PreviewPane.xaml.cs

@@ -9,11 +9,18 @@
 
 namespace Files.App.UserControls
 {
-	public sealed partial class PreviewPane : UserControl, IPane
+	public enum PreviewPanePositions : ushort
 	{
-		public PanePositions Position { get; private set; } = PanePositions.None;
+		None,
+		Right,
+		Bottom,
+	}
+
+	public sealed partial class PreviewPane : UserControl
+	{
+		public PreviewPanePositions Position { get; private set; } = PreviewPanePositions.None;
 
-		private IPaneSettingsService PaneSettingsService { get; } = Ioc.Default.GetService<IPaneSettingsService>();
+		private IPreviewPaneSettingsService PaneSettingsService { get; } = Ioc.Default.GetService<IPreviewPaneSettingsService>();
 
 		private PreviewPaneViewModel ViewModel => App.PreviewPaneViewModel;
 
@@ -25,12 +32,12 @@ public void UpdatePosition(double panelWidth, double panelHeight)
 		{
 			if (panelWidth > 700)
 			{
-				Position = PanePositions.Right;
+				Position = PreviewPanePositions.Right;
 				(MinWidth, MinHeight) = (150, 0);
 			}
 			else
 			{
-				Position = PanePositions.Bottom;
+				Position = PreviewPanePositions.Bottom;
 				(MinWidth, MinHeight) = (0, 140);
 			}
 		}
@@ -39,11 +46,13 @@ public void UpdatePosition(double panelWidth, double panelHeight)
 
 		private void Root_Loading(FrameworkElement sender, object args)
 			=> ViewModel.UpdateSelectedItemPreview();
+
 		private void Root_Unloaded(object sender, RoutedEventArgs e)
 		{
 			PreviewControlPresenter.Content = null;
 			Bindings.StopTracking();
 		}
+
 		private void Root_SizeChanged(object sender, SizeChangedEventArgs e)
 			=> Context.IsHorizontal = Root.ActualWidth >= Root.ActualHeight;
 

src/Files.App/ViewModels/ItemViewModel.cs

@@ -1262,7 +1262,7 @@ private async void RapidAddItemsToCollectionAsync(string path, string previousDi
 
 				AdaptiveLayoutHelpers.PredictLayoutMode(folderSettings, WorkingDirectory, filesAndFolders);
 
-				if (App.PaneViewModel.IsPreviewSelected)
+				if (App.PreviewPaneViewModel.IsEnabled)
 				{
 					// Find and select README file
 					foreach (var item in filesAndFolders)