Merge pull request #506 from emoacht/develop

Develop

Author: emoacht

Source/Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.11"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.12"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"

Source/Monitorian.Core/Properties/AssemblyInfo.cs

@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.11.0")]
-[assembly: AssemblyFileVersion("4.4.11.0")]
+[assembly: AssemblyVersion("4.4.12.0")]
+[assembly: AssemblyFileVersion("4.4.12.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

Source/Monitorian.Core/Views/UISettings.cs

@@ -16,7 +16,8 @@ namespace Monitorian.Core.Views
 	/// </remarks>
 	public static class UISettings
 	{
-		private static Windows.UI.ViewManagement.UISettings _uiSettings;
+		// UISettings.ColorValuesChanged is not supported in desktop apps.
+		// https://learn.microsoft.com/en-us/windows/apps/desktop/modernize/desktop-to-uwp-supported-api#unsupported-members
 
 		/// <summary>
 		/// Gets the system accent color.
@@ -42,56 +43,12 @@ public static class UISettings
 		/// <returns></returns>
 		public static Color GetBackgroundColor() => GetUIColor(Windows.UI.ViewManagement.UIColorType.Background);
 
+		private static Windows.UI.ViewManagement.UISettings _uiSettings;
+
 		private static Color GetUIColor(Windows.UI.ViewManagement.UIColorType colorType)
 		{
-			var value = (_uiSettings ?? new Windows.UI.ViewManagement.UISettings()).GetColorValue(colorType);
+			var value = (_uiSettings ??= new Windows.UI.ViewManagement.UISettings()).GetColorValue(colorType);
 			return Color.FromArgb(value.A, value.R, value.G, value.B);
 		}
-
-		private static readonly object _lock = new();
-
-		/// <summary>
-		/// Occurs when colors have changed.
-		/// </summary>
-		/// <remarks>
-		/// UISettings.ColorValuesChanged event seems not to fire when this assembly is packaged.
-		/// </remarks>
-		public static event EventHandler ColorsChanged
-		{
-			add
-			{
-				lock (_lock)
-				{
-					_colorsChanged += value;
-
-					if (_uiSettings is null)
-					{
-						_uiSettings = new Windows.UI.ViewManagement.UISettings();
-						_uiSettings.ColorValuesChanged += OnColorValuesChanged;
-					}
-				}
-			}
-			remove
-			{
-				lock (_lock)
-				{
-					_colorsChanged -= value;
-					if (_colorsChanged is not null)
-						return;
-
-					if (_uiSettings is not null)
-					{
-						_uiSettings.ColorValuesChanged -= OnColorValuesChanged;
-						_uiSettings = null;
-					}
-				}
-			}
-		}
-		private static event EventHandler _colorsChanged;
-
-		private static void OnColorValuesChanged(Windows.UI.ViewManagement.UISettings sender, object args)
-		{
-			_colorsChanged?.Invoke(sender, EventArgs.Empty);
-		}
 	}
 }

Source/Monitorian/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.4.11.0")]
-[assembly: AssemblyFileVersion("4.4.11.0")]
+[assembly: AssemblyVersion("4.4.12.0")]
+[assembly: AssemblyFileVersion("4.4.12.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]