Feature: Added support for assigning keyboard shortcuts to change the app theme (#18372)

Author: yair100

src/Files.App/Actions/Global/BaseAppThemeAction.cs

@@ -0,0 +1,48 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml;
+
+namespace Files.App.Actions
+{
+	internal abstract class BaseAppThemeAction : ObservableObject
+	{
+		protected IAppThemeModeService AppThemeModeService { get; } = Ioc.Default.GetRequiredService<IAppThemeModeService>();
+
+		protected BaseAppThemeAction()
+		{
+			AppThemeModeService.AppThemeModeChanged += AppThemeModeService_AppThemeModeChanged;
+		}
+
+		protected static ElementTheme ResolveSystemThemeFallback()
+			=> Application.Current.RequestedTheme is ApplicationTheme.Dark
+				? ElementTheme.Dark
+				: ElementTheme.Light;
+
+		protected ElementTheme GetEffectiveTheme()
+		{
+			var requestedTheme = AppThemeModeService.AppThemeMode;
+			if (requestedTheme is ElementTheme.Light or ElementTheme.Dark)
+				return requestedTheme;
+
+			if (MainWindow.Instance?.Content is FrameworkElement rootElement)
+			{
+				var actualTheme = rootElement.ActualTheme;
+				if (actualTheme is ElementTheme.Light or ElementTheme.Dark)
+					return actualTheme;
+			}
+
+			return ResolveSystemThemeFallback();
+		}
+
+		protected void SetTheme(ElementTheme appTheme)
+		{
+			AppThemeModeService.AppThemeMode = appTheme;
+		}
+
+		private void AppThemeModeService_AppThemeModeChanged(object? sender, EventArgs e)
+		{
+			OnPropertyChanged(nameof(IAction.IsExecutable));
+		}
+	}
+}

src/Files.App/Actions/Global/SetDarkThemeAction.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml;
+
+namespace Files.App.Actions
+{
+	[GeneratedRichCommand]
+	internal sealed partial class SetDarkThemeAction : BaseAppThemeAction, IAction
+	{
+		public string Label
+			=> $"{Strings.DarkTheme.GetLocalizedResource()} Theme";
+
+		public string Description
+			=> Strings.SwitchToDarkThemeDescription.GetLocalizedResource();
+
+		public RichGlyph Glyph
+			=> new("\uE790");
+
+		public ActionCategory Category
+			=> ActionCategory.Theme;
+
+		public bool IsExecutable
+			=> AppThemeModeService.AppThemeMode is not ElementTheme.Dark;
+
+		public Task ExecuteAsync(object? parameter = null)
+		{
+			SetTheme(ElementTheme.Dark);
+			return Task.CompletedTask;
+		}
+	}
+}

src/Files.App/Actions/Global/SetDefaultThemeAction.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml;
+
+namespace Files.App.Actions
+{
+	[GeneratedRichCommand]
+	internal sealed partial class SetDefaultThemeAction : BaseAppThemeAction, IAction
+	{
+		public string Label
+			=> Strings.DefaultTheme.GetLocalizedResource();
+
+		public string Description
+			=> Strings.SwitchToDefaultThemeDescription.GetLocalizedResource();
+
+		public RichGlyph Glyph
+			=> new("\uE790");
+
+		public ActionCategory Category
+			=> ActionCategory.Theme;
+
+		public bool IsExecutable
+			=> AppThemeModeService.AppThemeMode is not ElementTheme.Default;
+
+		public Task ExecuteAsync(object? parameter = null)
+		{
+			SetTheme(ElementTheme.Default);
+			return Task.CompletedTask;
+		}
+	}
+}

src/Files.App/Actions/Global/SetLightThemeAction.cs

@@ -0,0 +1,32 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml;
+
+namespace Files.App.Actions
+{
+	[GeneratedRichCommand]
+	internal sealed partial class SetLightThemeAction : BaseAppThemeAction, IAction
+	{
+		public string Label
+			=> $"{Strings.LightTheme.GetLocalizedResource()} Theme";
+
+		public string Description
+			=> Strings.SwitchToLightThemeDescription.GetLocalizedResource();
+
+		public RichGlyph Glyph
+			=> new("\uE790");
+
+		public ActionCategory Category
+			=> ActionCategory.Theme;
+
+		public bool IsExecutable
+			=> AppThemeModeService.AppThemeMode is not ElementTheme.Light;
+
+		public Task ExecuteAsync(object? parameter = null)
+		{
+			SetTheme(ElementTheme.Light);
+			return Task.CompletedTask;
+		}
+	}
+}

src/Files.App/Actions/Global/ToggleAppThemeAction.cs

@@ -0,0 +1,43 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml;
+
+namespace Files.App.Actions
+{
+	[GeneratedRichCommand]
+	internal sealed partial class ToggleAppThemeAction : BaseAppThemeAction, IAction
+	{
+		public string Label
+			=> Strings.ToggleTheme.GetLocalizedResource();
+
+		public string Description
+			=> Strings.ToggleThemeDescription.GetLocalizedResource();
+
+		public HotKey HotKey
+			=> new(Keys.T, KeyModifiers.CtrlAlt);
+
+		public RichGlyph Glyph
+			=> new("\uE790");
+
+		public ActionCategory Category
+			=> ActionCategory.Theme;
+
+		public Task ExecuteAsync(object? parameter = null)
+		{
+			var selectedTheme = AppThemeModeService.AppThemeMode;
+			var nextTheme = selectedTheme switch
+			{
+				ElementTheme.Light => ElementTheme.Dark,
+				ElementTheme.Dark => ElementTheme.Light,
+				ElementTheme.Default => GetEffectiveTheme() is ElementTheme.Dark
+					? ElementTheme.Light
+					: ElementTheme.Dark,
+				_ => ElementTheme.Light,
+			};
+
+			SetTheme(nextTheme);
+			return Task.CompletedTask;
+		}
+	}
+}

src/Files.App/Converters/ActionCategoryConverter.cs

@@ -27,6 +27,7 @@ public static string ToLocalizedCategoryPath(ActionCategory category)
 				ActionCategory.Sorting => Strings.SortBy.GetLocalizedResource(),
 				ActionCategory.Start => Strings.Start.GetLocalizedResource(),
 				ActionCategory.Window => Strings.Window.GetLocalizedResource(),
+				ActionCategory.Theme => Strings.SettingsAppearanceTheme.GetLocalizedResource(),
 				ActionCategory.DualPane => Strings.DualPaneCategory.GetLocalizedResource(),
 				_ => Strings.General.GetLocalizedResource(),
 			};

src/Files.App/Data/Enums/ActionCategory.cs

@@ -25,6 +25,7 @@ public enum ActionCategory
 		Sorting,
 		Start,
 		Window,
+		Theme,
 		DualPane,
 	}
 }

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

@@ -309,6 +309,9 @@
   <data name="DarkTheme" xml:space="preserve">
     <value>Dark</value>
   </data>
+  <data name="DefaultTheme" xml:space="preserve">
+    <value>System Theme</value>
+  </data>
   <data name="UseSystemSetting" xml:space="preserve">
     <value>Use system setting</value>
   </data>
@@ -2453,6 +2456,21 @@
   <data name="ToggleCompactOverlayDescription" xml:space="preserve">
     <value>Toggle compact overlay mode</value>
   </data>
+  <data name="ToggleTheme" xml:space="preserve">
+    <value>Toggle Theme</value>
+  </data>
+  <data name="ToggleThemeDescription" xml:space="preserve">
+    <value>Toggle the app theme</value>
+  </data>
+  <data name="SwitchToLightThemeDescription" xml:space="preserve">
+    <value>Switch to Light Theme</value>
+  </data>
+  <data name="SwitchToDarkThemeDescription" xml:space="preserve">
+    <value>Switch to Dark Theme</value>
+  </data>
+  <data name="SwitchToDefaultThemeDescription" xml:space="preserve">
+    <value>Switch to System Theme</value>
+  </data>
   <data name="SearchDescription" xml:space="preserve">
     <value>Start search in the OmniBar</value>
   </data>