Merge pull request #134 from Rekkonnect/dev/stuff/a

Various code improvements and minor features

Author: Rekkonnect

Syndiesis.InternalGenerators/SolidColorFieldGenerator.cs

@@ -79,7 +79,7 @@ public void AppendHeaderText()
             const string header = """
                 using Color = Avalonia.Media.Color;
                 using SolidColorBrush = Avalonia.Media.SolidColorBrush;
-                using LazilyUpdatedSolidBrush = Syndiesis.LazilyUpdatedSolidBrush;
+                using LazilyUpdatedSolidBrush = Syndiesis.ColorHelpers.LazilyUpdatedSolidBrush;
                 using JsonIncludeAttribute = System.Text.Json.Serialization.JsonIncludeAttribute;
 
 

Syndiesis/AppSettings.cs

@@ -34,26 +34,35 @@ public sealed class AppSettings
 
     public int RecursiveExpansionDepth = 4;
 
+    public double CodeFontSize = 12;
+
     public AnalysisNodeKind DefaultAnalysisTab = AnalysisNodeKind.Syntax;
     public AnalysisViewKind DefaultAnalysisView = AnalysisViewKind.Tree;
     #endregion
 
+    #region Events
+    public static event Action? SettingsLoaded;
+    #endregion
+
     #region Persistence
     public static async Task<bool> TryLoad(string path = DefaultPath)
     {
         try
         {
             var json = await File.ReadAllTextAsync(path);
-            var returned = await Dispatcher.UIThread.InvokeAsync(() =>
+            var settings = await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 return JsonSerializer.Deserialize<AppSettings>(
                     json, AppSettingsSerialization.DefaultOptions);
             });
-            if (returned is null)
+            if (settings is null)
                 return false;
 
-            Instance = returned;
+            Instance = settings;
             Log.Information($"Settings loaded from '{path}'");
+
+            _ = Dispatcher.UIThread.InvokeAsync(
+                () => SettingsLoaded?.Invoke());
             return true;
         }
         catch (Exception ex)

Syndiesis/AppSettingsSerialization.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+using Garyon.Objects;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Syndiesis;
@@ -20,12 +21,12 @@ private static JsonSerializerOptions GetDefaultOptions()
             IgnoreReadOnlyProperties = true,
             Converters =
             {
-                new AvaloniaColorJsonConverter(),
+                Singleton<AvaloniaColorJsonConverter>.Instance,
             }
         };
     }
 
-    public class AvaloniaColorJsonConverter : JsonConverter<Color>
+    private sealed class AvaloniaColorJsonConverter : JsonConverter<Color>
     {
         public override Color Read(
             ref Utf8JsonReader reader,
@@ -34,7 +35,7 @@ public override Color Read(
         {
             if (reader.TokenType is not JsonTokenType.String)
                 return default;
-            return Avalonia.Media.Color.Parse(reader.GetString()!);
+            return Color.Parse(reader.GetString()!);
         }
 
         public override void Write(

Syndiesis/FixedUpdatedSolidBrush.cs …s/ColorHelpers/FixedUpdatedSolidBrush.csSyndiesis/FixedUpdatedSolidBrush.cs renamed to Syndiesis/ColorHelpers/FixedUpdatedSolidBrush.cs Syndiesis/FixedUpdatedSolidBrush.cs renamed to Syndiesis/ColorHelpers/FixedUpdatedSolidBrush.cs

@@ -1,6 +1,4 @@
-using Syndiesis.ColorHelpers;
-
-namespace Syndiesis;
+namespace Syndiesis.ColorHelpers;
 
 public sealed class FixedUpdatedSolidBrush : ILazilyUpdatedSolidBrush
 {
@@ -23,7 +21,8 @@ public FixedUpdatedSolidBrush(SolidColorBrush brush)
         _brush = brush;
     }
 
-    public LazilyUpdatedHsvTransformedSolidBrush WithHsvTransformation(HsvTransformation transformation)
+    public LazilyUpdatedHsvTransformedSolidBrush WithHsvTransformation(
+        HsvTransformation transformation)
     {
         return new(this, transformation);
     }

Syndiesis/ColorHelpers/HslTransformation.cs

@@ -1,6 +1,10 @@
 namespace Syndiesis.ColorHelpers;
 
-public readonly record struct HslTransformation(double Alpha, double Hue, double Saturation, double Lightness)
+public readonly record struct HslTransformation(
+    double Alpha = 0,
+    double Hue = 0,
+    double Saturation = 0,
+    double Lightness = 0)
     : IColorTransformation<HslColor>
 {
     public HslColor Transform(HslColor color)

Syndiesis/ILazilyUpdatedBrush.cs …esis/ColorHelpers/ILazilyUpdatedBrush.csSyndiesis/ILazilyUpdatedBrush.cs renamed to Syndiesis/ColorHelpers/ILazilyUpdatedBrush.cs Syndiesis/ILazilyUpdatedBrush.cs renamed to Syndiesis/ColorHelpers/ILazilyUpdatedBrush.cs

@@ -1,4 +1,4 @@
-namespace Syndiesis;
+namespace Syndiesis.ColorHelpers;
 
 public interface ILazilyUpdatedBrush
 {

Syndiesis/ILazilyUpdatedSolidBrush.cs …ColorHelpers/ILazilyUpdatedSolidBrush.csSyndiesis/ILazilyUpdatedSolidBrush.cs renamed to Syndiesis/ColorHelpers/ILazilyUpdatedSolidBrush.cs Syndiesis/ILazilyUpdatedSolidBrush.cs renamed to Syndiesis/ColorHelpers/ILazilyUpdatedSolidBrush.cs

@@ -1,6 +1,5 @@
-namespace Syndiesis;
+namespace Syndiesis.ColorHelpers;
 
-// TODO Move to .Colors
 public interface ILazilyUpdatedSolidBrush : ILazilyUpdatedBrush
 {
     public Color Color { get; }

Syndiesis/LazilyUpdatedGradientBrush.cs …lorHelpers/LazilyUpdatedGradientBrush.csSyndiesis/LazilyUpdatedGradientBrush.cs renamed to Syndiesis/ColorHelpers/LazilyUpdatedGradientBrush.cs Syndiesis/LazilyUpdatedGradientBrush.cs renamed to Syndiesis/ColorHelpers/LazilyUpdatedGradientBrush.cs

@@ -1,6 +1,5 @@
-namespace Syndiesis;
+namespace Syndiesis.ColorHelpers;
 
-// TODO Move to .Colors
 public sealed class LazilyUpdatedGradientBrush : ILazilyUpdatedBrush
 {
     private readonly LinearGradientBrush _brush;

Syndiesis/LazilyUpdatedGradientStop.cs …olorHelpers/LazilyUpdatedGradientStop.csSyndiesis/LazilyUpdatedGradientStop.cs renamed to Syndiesis/ColorHelpers/LazilyUpdatedGradientStop.cs Syndiesis/LazilyUpdatedGradientStop.cs renamed to Syndiesis/ColorHelpers/LazilyUpdatedGradientStop.cs

@@ -1,6 +1,5 @@
-namespace Syndiesis;
+namespace Syndiesis.ColorHelpers;
 
-// TODO Move to .Colors
 public sealed class LazilyUpdatedGradientStop(GradientStop stop)
 {
     private readonly GradientStop _stop = stop;

Syndiesis/LazilyUpdatedSolidBrush.cs …/ColorHelpers/LazilyUpdatedSolidBrush.csSyndiesis/LazilyUpdatedSolidBrush.cs renamed to Syndiesis/ColorHelpers/LazilyUpdatedSolidBrush.cs Syndiesis/LazilyUpdatedSolidBrush.cs renamed to Syndiesis/ColorHelpers/LazilyUpdatedSolidBrush.cs

@@ -1,8 +1,5 @@
-using Syndiesis.ColorHelpers;
+namespace Syndiesis.ColorHelpers;
 
-namespace Syndiesis;
-
-// TODO Move to .Colors
 public sealed class LazilyUpdatedSolidBrush : ILazilyUpdatedSolidBrush
 {
     private readonly SolidColorBrush _brush = new();