Feature: Switched color customization to strings (#10869)

Author: yaira2

src/Files.App (Package)/Package.appxmanifest

@@ -9,7 +9,7 @@
          xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
          xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
          IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
-    <Identity Name="FilesDev" Publisher="CN=Files" Version="2.4.8.0" />
+    <Identity Name="FilesDev" Publisher="CN=Files" Version="2.4.9.0" />
     <Properties>
         <DisplayName>Files - Dev</DisplayName>
         <PublisherDisplayName>Yair A</PublisherDisplayName>

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

@@ -129,30 +129,30 @@ public bool BundlesWidgetExpanded
 		}
 
 		/// <inheritdoc/>
-		public UInt32 AppThemeBackgroundColor
+		public String AppThemeBackgroundColor
 		{
-			get => Get(uint.MinValue);
+			get => Get("#00000000");
 			set => Set(value);
 		}
 
 		/// <inheritdoc/>
-		public UInt32 AppThemeAddressBarBackgroundColor
+		public String AppThemeAddressBarBackgroundColor
 		{
-			get => Get(uint.MinValue);
+			get => Get("#00000000");
 			set => Set(value);
 		}
 
 		/// <inheritdoc/>
-		public UInt32 AppThemeSidebarBackgroundColor
+		public String AppThemeSidebarBackgroundColor
 		{
-			get => Get(uint.MinValue);
+			get => Get("#00000000");
 			set => Set(value);
 		}
 
 		/// <inheritdoc/>
-		public UInt32 AppThemeFileAreaBackgroundColor
+		public String AppThemeFileAreaBackgroundColor
 		{
-			get => Get(uint.MinValue);
+			get => Get("#00000000");
 			set => Set(value);
 		}
 

src/Files.App/ViewModels/SettingsViewModels/AppearanceViewModel.cs

@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.WinUI.Helpers;
 using Files.App.Extensions;
 using Files.App.Helpers;
 using Files.App.Views.SettingsPages.Appearance;
@@ -259,12 +260,12 @@ public bool ShowRecentFilesWidget
 
 		public Color AppThemeBackgroundColor
 		{
-			get => ColorHelpers.FromUint(UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor);
+			get => ColorHelper.ToColor(UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor);
 			set
 			{
-				if (ColorHelpers.ToUint(value) != UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor)
+				if (value != ColorHelper.ToColor(UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor))
 				{
-					UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor = ColorHelpers.ToUint(value);
+					UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor = value.ToString();
 
 					App.AppThemeResourcesHelper.SetAppThemeBackgroundColor(AppThemeBackgroundColor);
 					App.AppThemeResourcesHelper.ApplyResources();

src/Files.App/Views/MainPage.xaml.cs

@@ -30,6 +30,7 @@
 using Windows.Services.Store;
 using Windows.Storage;
 using Windows.UI;
+using ColorHelper = CommunityToolkit.WinUI.Helpers.ColorHelper;
 
 namespace Files.App.Views
 {
@@ -83,10 +84,10 @@ public MainPage()
 		private void LoadAppResources()
 		{
 			var useCompactStyles = UserSettingsService.AppearanceSettingsService.UseCompactStyles;
-			var appThemeBackgroundColor = ColorHelpers.FromUint(UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor);
-			var appThemeAddressBarBackgroundColor = ColorHelpers.FromUint(UserSettingsService.AppearanceSettingsService.AppThemeAddressBarBackgroundColor);
-			var appThemeSidebarBackgroundColor = ColorHelpers.FromUint(UserSettingsService.AppearanceSettingsService.AppThemeSidebarBackgroundColor);
-			var appThemeFileAreaBackgroundColor = ColorHelpers.FromUint(UserSettingsService.AppearanceSettingsService.AppThemeFileAreaBackgroundColor);
+			var appThemeBackgroundColor = ColorHelper.ToColor(UserSettingsService.AppearanceSettingsService.AppThemeBackgroundColor);
+			var appThemeAddressBarBackgroundColor = ColorHelper.ToColor(UserSettingsService.AppearanceSettingsService.AppThemeAddressBarBackgroundColor);
+			var appThemeSidebarBackgroundColor = ColorHelper.ToColor(UserSettingsService.AppearanceSettingsService.AppThemeSidebarBackgroundColor);
+			var appThemeFileAreaBackgroundColor = ColorHelper.ToColor(UserSettingsService.AppearanceSettingsService.AppThemeFileAreaBackgroundColor);
 			var appThemeFontFamily = UserSettingsService.AppearanceSettingsService.AppThemeFontFamily;
 
 			App.AppThemeResourcesHelper.SetCompactSpacing(useCompactStyles);

src/Files.Backend/Services/Settings/IAppearanceSettingsService.cs

@@ -107,22 +107,22 @@ public interface IAppearanceSettingsService : IBaseSettingsService, INotifyPrope
 		/// <summary>
 		/// Gets or sets a value for the app theme background color.
 		/// </summary>
-		UInt32 AppThemeBackgroundColor { get; set; }
+		String AppThemeBackgroundColor { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value for the app theme address bar background color.
 		/// </summary>
-		UInt32 AppThemeAddressBarBackgroundColor { get; set; }
-		
+		String AppThemeAddressBarBackgroundColor { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value for the app theme sidebar background color.
 		/// </summary>
-		UInt32 AppThemeSidebarBackgroundColor { get; set; }
+		String AppThemeSidebarBackgroundColor { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value for the app theme file area background color.
 		/// </summary>
-		UInt32 AppThemeFileAreaBackgroundColor { get; set; }
+		String AppThemeFileAreaBackgroundColor { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value for the app theme font family.