Merge pull request #544 from emoacht/develop

Develop

Author: emoacht

Source/IconImage/DarkAppIcon.xaml

@@ -18,7 +18,8 @@
 	</UserControl.Resources>
 
 	<Grid Background="{x:Null}">
-		<Rectangle Fill="{StaticResource BackBrush}"/>
+		<!--<Rectangle Fill="{StaticResource BackBrush}"/>-->
+		<Rectangle Fill="{StaticResource BackBrush}" RadiusX="20" RadiusY="20"/>
 
 		<Grid>
 			<Border BorderBrush="{StaticResource EdgeBrush}"

Source/IconImage/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // 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.5.0.0")]
-[assembly: AssemblyFileVersion("4.5.0.0")]
+[assembly: AssemblyVersion("4.6.0.0")]
+[assembly: AssemblyFileVersion("4.6.0.0")]

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.5.1"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.6.0"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"
@@ -101,6 +101,12 @@
 					<File Id="CoreResourcesLibrary_de" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
 				</Component>
 			</Directory>
+			<Directory Id="ResourcesFolder_elGR" Name="el-GR"
+					   FileSource="$(var.Monitorian.TargetDir)el-GR">
+				<Component Id="CoreResourcesLibrary_elGR" Guid="{D8FA6F67-57B7-45AA-8C81-C323A50787DE}">
+					<File Id="CoreResourcesLibrary_elGR" Name="$(var.Monitorian.TargetName).Core.resources.dll" KeyPath="yes"/>
+				</Component>
+			</Directory>
 			<Directory Id="ResourcesFolder_es" Name="es"
 					   FileSource="$(var.Monitorian.TargetDir)es">
 				<Component Id="CoreResourcesLibrary_es" Guid="{4329EAB1-6FC9-41F4-8A6E-77FA6C67B15C}">
@@ -224,6 +230,7 @@
 			<ComponentRef Id="CoreResourcesLibrary_ar"/>
 			<ComponentRef Id="CoreResourcesLibrary_ca"/>
 			<ComponentRef Id="CoreResourcesLibrary_de"/>
+			<ComponentRef Id="CoreResourcesLibrary_elGR"/>
 			<ComponentRef Id="CoreResourcesLibrary_es"/>
 			<ComponentRef Id="CoreResourcesLibrary_fr"/>
 			<ComponentRef Id="CoreResourcesLibrary_it"/>

Source/Monitorian.Core/AppControllerCore.cs

@@ -449,7 +449,6 @@ protected virtual void Update(string instanceName, int brightness)
 	protected virtual async Task UpdateMessageAsync(string deviceInstanceId, string message)
 	{
 		var monitor = Monitors.FirstOrDefault(x => string.Equals(x.DeviceInstanceId, deviceInstanceId, StringComparison.OrdinalIgnoreCase));
-		System.Diagnostics.Debug.WriteLine(message);
 		if (monitor is not null)
 		{
 			await monitor.ShowNormalMessageAsync(message, TimeSpan.FromSeconds(30));

Source/Monitorian.Core/AppKeeper.cs

@@ -21,7 +21,7 @@ public AppKeeper()
 		StartupAgent = new StartupAgent();
 	}
 
-	public Task<bool> StartAsync(StartupEventArgs e) => StartAsync(e, Enumerable.Empty<string>());
+	public Task<bool> StartAsync(StartupEventArgs e) => StartAsync(e, []);
 
 	public async Task<bool> StartAsync(StartupEventArgs e, IEnumerable<string> additionalOptions)
 	{
@@ -60,10 +60,10 @@ public void Write(string content)
 
 	#region Arguments
 
-	public static IReadOnlyList<string> StandardArguments => _standardArguments?.ToArray() ?? Array.Empty<string>();
+	public static IReadOnlyList<string> StandardArguments => _standardArguments?.ToArray() ?? [];
 	private static string[] _standardArguments;
 
-	public static IReadOnlyList<string> OtherArguments => _otherArguments?.ToArray() ?? Array.Empty<string>();
+	public static IReadOnlyList<string> OtherArguments => _otherArguments?.ToArray() ?? [];
 	private static string[] _otherArguments;
 
 	public static IEnumerable<string> EnumerateStandardOptions() =>
@@ -79,7 +79,7 @@ public static IEnumerable<string> EnumerateStandardOptions() =>
 	private async Task ParseArgumentsAsync(StartupEventArgs e, string[] standardOptions)
 	{
 		// Load persistent arguments.
-		var args = (await LoadArgumentsAsync())?.Split() ?? Array.Empty<string>();
+		var args = (await LoadArgumentsAsync())?.Split() ?? [];
 
 		// Concatenate current and persistent arguments.
 		// The first element of StartupEventArgs.Args is not executing assembly's path unlike

Source/Monitorian.Core/Helper/ExceptionExtension.cs

@@ -22,7 +22,7 @@ public static string ToDetailedString(this Exception ex)
 		{
 			innerExceptions = (ex.InnerException is not null)
 				? new Exception[] { ex.InnerException }
-				: Array.Empty<Exception>();
+				: [];
 
 			foreach (var property in EnumerateAddedProperties(ex))
 			{
@@ -61,12 +61,12 @@ private static IEnumerable<PropertyInfo> EnumerateAddedProperties(Exception ex)
 
 	private static string GetEnvironmentString(string key)
 	{
-		var method = typeof(Environment).GetMethod("GetResourceString", BindingFlags.NonPublic | BindingFlags.Static, null, new Type[] { typeof(string) }, null);
+		var method = typeof(Environment).GetMethod("GetResourceString", BindingFlags.NonPublic | BindingFlags.Static, null, [typeof(string)], null);
 
 		string buffer = null;
 		try
 		{
-			buffer = method?.Invoke(null, new object[] { key }) as string;
+			buffer = method?.Invoke(null, [key]) as string;
 		}
 		catch
 		{

Source/Monitorian.Core/Helper/OsVersion.cs

@@ -51,7 +51,7 @@ internal static class OsVersion
 
 	#region Cache
 
-	private static readonly Dictionary<string, bool> _cache = new();
+	private static readonly Dictionary<string, bool> _cache = [];
 	private static readonly object _lock = new();
 
 	private static bool IsEqualToOrGreaterThan(in int major, in int minor = 0, in int build = 0, [CallerMemberName] string propertyName = null)

Source/Monitorian.Core/Helper/SimpleSerialization.cs

@@ -66,11 +66,9 @@ public static string ConvertCollectionValue(string value) =>
 		IsPrettified ? Indent + ConvertValue(value) : value;
 }
 
-public class StringWrapper
+public class StringWrapper(string value)
 {
-	private readonly string _value;
-
-	public StringWrapper(string value) => this._value = value;
+	private readonly string _value = value;
 
 	public override string ToString() => _value;
 }

Source/Monitorian.Core/Helper/Throttle.cs

@@ -71,7 +71,7 @@ public class Throttle<T>
 {
 	protected readonly SemaphoreSlim _semaphore = new(1, 1);
 	protected readonly DispatcherTimer _timer;
-	protected readonly Queue<T> _queue = new();
+	protected readonly Queue<T> _queue = [];
 	protected readonly Action<T[]> _action;
 
 	public Throttle(TimeSpan dueTime, Action<T[]> action)

Source/Monitorian.Core/Models/DocumentService.cs

@@ -37,7 +37,7 @@ public static string BuildHtml(string fileName, string title, string body)
 			title = Path.GetFileNameWithoutExtension(fileName);
 
 		body = body?
-			.Split(new[] { "\r\n\r\n", "\n\n" /* two consecutive line breaks */ }, StringSplitOptions.RemoveEmptyEntries)
+			.Split(["\r\n\r\n", "\n\n" /* two consecutive line breaks */ ], StringSplitOptions.RemoveEmptyEntries)
 			.Select(x =>
 			{
 				var array = x.Split(Array.Empty<char>(), 2, StringSplitOptions.RemoveEmptyEntries);