Feature: Added a setting to hide the System Tray icon (#15947)

Co-authored-by: hishitetsu <[email protected]>

Author: yaira2

src/Files.App/App.xaml.cs

@@ -18,7 +18,7 @@ namespace Files.App
 	/// </summary>
 	public partial class App : Application
 	{
-		private static SystemTrayIcon? SystemTrayIcon { get; set; }
+		public static SystemTrayIcon? SystemTrayIcon { get; private set; }
 
 		public static TaskCompletionSource? SplashScreenLoadingTCS { get; private set; }
 		public static string? OutputPath { get; set; }
@@ -132,14 +132,18 @@ async Task ActivateAsync()
 					SplashScreenLoadingTCS = null;
 
 					// Create a system tray icon
-					SystemTrayIcon = new SystemTrayIcon().Show();
+					SystemTrayIcon = new SystemTrayIcon();
+					if (userSettingsService.GeneralSettingsService.ShowSystemTrayIcon)
+						SystemTrayIcon.Show();
 
 					_ = MainWindow.Instance.InitializeApplicationAsync(appActivationArguments.Data);
 				}
 				else
 				{
 					// Create a system tray icon
-					SystemTrayIcon = new SystemTrayIcon().Show();
+					SystemTrayIcon = new SystemTrayIcon();
+					if (userSettingsService.GeneralSettingsService.ShowSystemTrayIcon)
+						SystemTrayIcon.Show();
 
 					// Sleep current instance
 					Program.Pool = new(0, 1, $"Files-{AppLifecycleHelper.AppEnvironment}-Instance");

src/Files.App/Data/Contracts/IGeneralSettingsService.cs

@@ -234,6 +234,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// Gets or sets a value indicating whether or not to leave app running in the background.
 		/// </summary>
 		bool LeaveAppRunning { get; set; }
+		
+		/// <summary>
+		/// Gets or sets a value indicating whether or not to show Files in the system tray.
+		/// </summary>
+		bool ShowSystemTrayIcon { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating the default option to resolve conflicts.

src/Files.App/Helpers/Application/AppLifecycleHelper.cs

@@ -93,6 +93,8 @@ static Task OptionalTaskAsync(Task task, bool condition)
 
 				return Task.CompletedTask;
 			}
+
+			generalSettingsService.PropertyChanged += GeneralSettingsService_PropertyChanged;
 		}
 
 		/// <summary>
@@ -361,5 +363,22 @@ public static bool IsAutoHideTaskbarEnabled()
 			// The least significant bit of the 9th byte controls the auto-hide setting																		
 			return value != null && ((value[8] & 0x01) == 1);
 		}
+
+		/// <summary>
+		/// Updates the visibility of the system tray icon
+		/// </summary>
+		private static void GeneralSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (sender is not IGeneralSettingsService generalSettingsService)
+				return;
+
+			if (e.PropertyName == nameof(IGeneralSettingsService.ShowSystemTrayIcon))
+			{
+				if (generalSettingsService.ShowSystemTrayIcon)
+					App.SystemTrayIcon?.Show();
+				else
+					App.SystemTrayIcon?.Hide();
+			}
+		}
 	}
 }

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

@@ -291,6 +291,12 @@ public bool LeaveAppRunning
 			set => Set(value);
 		}
 
+		public bool ShowSystemTrayIcon
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
 		public FileNameConflictResolveOptionType ConflictsResolveOption
 		{
 			get => (FileNameConflictResolveOptionType)Get((long)FileNameConflictResolveOptionType.GenerateNewName);

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

@@ -3905,4 +3905,7 @@
   <data name="Vertical" xml:space="preserve">
     <value>Vertical</value>
   </data>
+  <data name="ShowSystemTrayIcon" xml:space="preserve">
+    <value>Show Files icon in the System Tray</value>
+  </data>
 </root>

src/Files.App/Utils/Taskbar/SystemTrayIcon.cs

@@ -1,15 +1,15 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Runtime.InteropServices;
 using System.Drawing;
+using System.Runtime.InteropServices;
+using Windows.ApplicationModel;
 using Windows.Foundation;
+using Windows.System;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
-using Windows.ApplicationModel;
-using Windows.System;
 
 namespace Files.App.Utils.Taskbar
 {

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

@@ -333,6 +333,20 @@ public bool LeaveAppRunning
 				}
 			}
 		}
+		
+		public bool ShowSystemTrayIcon
+		{
+			get => UserSettingsService.GeneralSettingsService.ShowSystemTrayIcon;
+			set
+			{
+				if (value != UserSettingsService.GeneralSettingsService.ShowSystemTrayIcon)
+				{
+					UserSettingsService.GeneralSettingsService.ShowSystemTrayIcon = value;
+
+					OnPropertyChanged();
+				}
+			}
+		}
 
 		public async Task OpenFilesOnWindowsStartupAsync()
 		{

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

@@ -129,6 +129,17 @@
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</local:SettingsBlockControl>
 
+			<!--  System Tray Icon  -->
+			<local:SettingsBlockControl Title="{helpers:ResourceString Name=ShowSystemTrayIcon}" HorizontalAlignment="Stretch">
+				<local:SettingsBlockControl.Icon>
+					<FontIcon Glyph="&#xE75B;" />
+				</local:SettingsBlockControl.Icon>
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=ShowSystemTrayIcon}"
+					IsOn="{x:Bind ViewModel.ShowSystemTrayIcon, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</local:SettingsBlockControl>
+
 			<!--  Experimental Settings  -->
 			<TextBlock
 				Padding="0,16,0,4"