Added settings under experimental

Author: gave92

src/Files.App/Services/Settings/GeneralSettingsService.cs

@@ -216,7 +216,7 @@ public bool ShowCopyPath
 			get => Get(true);
 			set => Set(value);
 		}
-		
+
 		public bool ShowCreateFolderWithSelection
 		{
 			get => Get(true);
@@ -239,6 +239,12 @@ public bool LeaveAppRunning
 			set => Set(value);
 		}
 
+		public bool IsTerminalIntegrationEnabled
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		public FileNameConflictResolveOptionType ConflictsResolveOption
 		{
 			get => (FileNameConflictResolveOptionType)Get((long)FileNameConflictResolveOptionType.GenerateNewName);

src/Files.App/Services/Settings/IGeneralSettingsService.cs

@@ -194,6 +194,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool LeaveAppRunning { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether to enable terminal integration.
+		/// </summary>
+		bool IsTerminalIntegrationEnabled { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating the default option to resolve conflicts.
 		/// </summary>

src/Files.App/Strings/en-US/Resources.resw

@@ -3743,4 +3743,7 @@
   <data name="AdaptiveLayoutDisabledNotification" xml:space="preserve">
     <value>Adaptive layout is not available when preferences are synced, the default layout has been changed to Details.</value>
   </data>
+  <data name="SettingsTerminalIntegration" xml:space="preserve">
+    <value>Enable Terminal integration</value>
+  </data>
 </root>

src/Files.App/UserControls/StatusBar.xaml

@@ -392,7 +392,7 @@
 			x:Name="TerminalPanel"
 			Grid.Column="3"
 			VerticalAlignment="Center"
-			x:Load="True"
+			x:Load="{x:Bind MainPageViewModel.IsTerminalIntegrationEnabled, Mode=OneWay}"
 			Orientation="Horizontal"
 			Spacing="4">
 

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

@@ -1,10 +1,8 @@
 using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Helpers;
 using Files.App.Utils.Terminal;
 using Files.App.Utils.Terminal.ConPTY;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.Web.WebView2.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
@@ -197,7 +195,7 @@ private Task<TerminalSize> CreateXtermViewAsync(TerminalOptions options, Termina
 			var serializedKeyBindings = JsonConvert.SerializeObject(keyBindings, serializerSettings);
 			return ExecuteScriptAsync(
 					$"createTerminal('{serializedOptions}', '{serializedTheme}', '{serializedKeyBindings}')")
-				.ContinueWith(t => JsonConvert.DeserializeObject<TerminalSize>(t.Result));
+				.ContinueWith(t => JsonConvert.DeserializeObject<TerminalSize>(t.Result)!);
 		}
 
 		private void WebViewControl_NavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
@@ -445,20 +443,6 @@ private async void TerminalView_ActualThemeChanged(Microsoft.UI.Xaml.FrameworkEl
 			serializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
 			var profile = _mainPageModel.TerminalSelectedProfile;
 			var theme = new DefaultValueProvider().GetPreInstalledThemes().First(x => x.Id == profile.TerminalThemeId);
-			var backgroundColor = ActualTheme switch
-			{
-				Microsoft.UI.Xaml.ElementTheme.Dark => "#000000",
-				_ => "#FFFFFF"
-			};
-			var foregroundColor = ActualTheme switch
-			{
-				Microsoft.UI.Xaml.ElementTheme.Dark => "#FFFFFF",
-				_ => "#000000"
-			};
-			theme.Colors.Background = backgroundColor;
-			theme.Colors.Foreground = foregroundColor;
-			theme.Colors.CursorAccent = backgroundColor;
-			theme.Colors.Cursor = foregroundColor;
 
 			WebViewControl.CoreWebView2.Profile.PreferredColorScheme = (ActualTheme == Microsoft.UI.Xaml.ElementTheme.Dark) ? CoreWebView2PreferredColorScheme.Dark : CoreWebView2PreferredColorScheme.Light;
 

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -21,6 +21,7 @@ public sealed class MainPageViewModel : ObservableObject
 		private INetworkDrivesService NetworkDrivesService { get; } = Ioc.Default.GetRequiredService<INetworkDrivesService>();
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private IResourcesService ResourcesService { get; } = Ioc.Default.GetRequiredService<IResourcesService>();
+		private IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
 		private DrivesViewModel DrivesViewModel { get; } = Ioc.Default.GetRequiredService<DrivesViewModel>();
 
 		// Properties
@@ -82,6 +83,17 @@ public MainPageViewModel()
 					SetTerminalFolder?.Invoke(currentFolder);
 			});
 			TerminalSelectedProfile = TerminalProfiles[0];
+			GeneralSettingsService.PropertyChanged += GeneralSettingsService_PropertyChanged;
+		}
+
+		private void GeneralSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof(IGeneralSettingsService.IsTerminalIntegrationEnabled))
+			{
+				OnPropertyChanged(nameof(IsTerminalIntegrationEnabled));
+				if (!IsTerminalIntegrationEnabled)
+					IsTerminalViewOpen = false;
+			}
 		}
 
 		// Methods
@@ -233,6 +245,8 @@ private void ExecuteNavigateToNumberedTabKeyboardAcceleratorCommand(KeyboardAcce
 
 		public List<ShellProfile> TerminalProfiles => new DefaultValueProvider().GetPreinstalledShellProfiles().ToList();
 
+		public bool IsTerminalIntegrationEnabled => GeneralSettingsService.IsTerminalIntegrationEnabled;
+
 		private bool _isTerminalViewOpen;
 		public bool IsTerminalViewOpen
 		{
@@ -244,7 +258,11 @@ public bool IsTerminalViewOpen
 		public ShellProfile TerminalSelectedProfile
 		{
 			get => _terminalSelectedProfile;
-			set => SetProperty(ref _terminalSelectedProfile, value);
+			set
+			{
+				if (value is not null)
+					SetProperty(ref _terminalSelectedProfile, value);
+			}
 		}
 	}
 }

src/Files.App/ViewModels/Settings/AdvancedViewModel.cs

@@ -324,6 +324,20 @@ public bool LeaveAppRunning
 			}
 		}
 
+		public bool IsTerminalIntegrationEnabled
+		{
+			get => UserSettingsService.GeneralSettingsService.IsTerminalIntegrationEnabled;
+			set
+			{
+				if (value != UserSettingsService.GeneralSettingsService.IsTerminalIntegrationEnabled)
+				{
+					UserSettingsService.GeneralSettingsService.IsTerminalIntegrationEnabled = value;
+
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		public async Task OpenFilesOnWindowsStartupAsync()
 		{
 			var stateMode = await ReadState();

src/Files.App/Views/Settings/AdvancedPage.xaml

@@ -178,6 +178,20 @@
 					</i:Interaction.Behaviors>
 				</ToggleSwitch>
 			</local:SettingsBlockControl>
+
+			<!--  Enable terminal integration  -->
+			<local:SettingsBlockControl
+				x:Name="TerminalIntegrationSettingsBlockControl"
+				Title="{helpers:ResourceString Name=SettingsTerminalIntegration}"
+				HorizontalAlignment="Stretch">
+				<local:SettingsBlockControl.Icon>
+					<FontIcon Glyph="&#xE756;" />
+				</local:SettingsBlockControl.Icon>
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=SettingsTerminalIntegration}"
+					IsOn="{x:Bind ViewModel.IsTerminalIntegrationEnabled, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</local:SettingsBlockControl>
 		</StackPanel>
 	</Grid>
 </Page>