Rewrite with AvaloniaUI

.editorconfig

@@ -9,6 +9,8 @@ charset = utf-8
 end_of_line = crlf
 insert_final_newline = true
 trim_trailing_whitespace = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
 
 # C# files
 [*.csproj]
@@ -421,18 +423,6 @@ dotnet_diagnostic.SA1602.severity = none
 dotnet_diagnostic.SA1649.severity = none
 dotnet_diagnostic.SA1633.severity = none
 
-dotnet_diagnostic.WTG1001.severity = warning
-dotnet_diagnostic.WTG1002.severity = warning
-dotnet_diagnostic.WTG1011.severity = warning
-dotnet_diagnostic.WTG1009.severity = none
-dotnet_diagnostic.WTG1012.severity = warning
-dotnet_diagnostic.WTG1013.severity = none
-dotnet_diagnostic.WTG3001.severity = warning
-dotnet_diagnostic.WTG3002.severity = warning
-dotnet_diagnostic.WTG3003.severity = warning
-dotnet_diagnostic.WTG3005.severity = warning
-dotnet_diagnostic.WTG3006.severity = warning
-dotnet_diagnostic.WTG3008.severity = warning
-dotnet_diagnostic.WTG3011.severity = warning
+dotnet_diagnostic.RCS1217.severity = none
 
 dotnet_diagnostic.RS0030.severity = error

.gitignore

@@ -351,4 +351,3 @@ MigrationBackup/
 
 # MonoGame
 *.xnb
-*.png

AvaGui/App.axaml

@@ -0,0 +1,17 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="AvaGui.App"
+             xmlns:local="using:AvaGui"
+             RequestedThemeVariant="Default">
+	<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
+
+	<Application.DataTemplates>
+		<local:ViewLocator/>
+	</Application.DataTemplates>
+
+	<Application.Styles>
+		<FluentTheme />
+		<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
+	</Application.Styles>
+
+</Application>

AvaGui/App.axaml.cs

@@ -0,0 +1,29 @@
+using AvaGui.ViewModels;
+using AvaGui.Views;
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+
+namespace AvaGui
+{
+	public partial class App : Application
+	{
+		public override void Initialize()
+		{
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public override void OnFrameworkInitializationCompleted()
+		{
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+			{
+				desktop.MainWindow = new MainWindow
+				{
+					DataContext = new MainWindowViewModel(),
+				};
+			}
+
+			base.OnFrameworkInitializationCompleted();
+		}
+	}
+}

AvaGui/AvaGui.csproj

@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <StartupObject>AvaGui.Program</StartupObject>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="version.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="version.txt" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.11" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
+    <PackageReference Include="bodong.Avalonia.PropertyGrid" Version="11.0.10.1" />
+    <PackageReference Include="bodong.PropertyModels" Version="11.0.10.1" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageReference Include="ReactiveUI.Validation" Version="4.0.9" />
+    <PackageReference Include="Zenith.Core" Version="1.0.20" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
+  </ItemGroup>
+
+
+  <ItemGroup>
+    <Compile Update="Views\VehicleView.axaml.cs">
+      <DependentUpon>VehicleView.axaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>

AvaGui/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ReactiveUI />
+</Weavers>

AvaGui/FodyWeavers.xsd

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ReactiveUI" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

AvaGui/Models/FileSystemItemGroup.cs

@@ -0,0 +1,21 @@
+using Avalonia;
+using OpenLoco.ObjectEditor.Data;
+using OpenLoco.ObjectEditor.Objects;
+using System.Collections.ObjectModel;
+
+namespace AvaGui.Models
+{
+	public abstract record FileSystemItemBase(string Path, string Name, ObservableCollection<FileSystemItemBase>? SubNodes = null, PixelRect? SourceRect = null)
+	{
+		public string NameComputed
+			=> $"{Name}{(SubNodes == null ? string.Empty : $" ({SubNodes.Count})")}"; // nested interpolated string...what have i become
+	}
+
+	public record FileSystemItem(string Path, string Name, SourceGame SourceGame) : FileSystemItemBase(Path, Name, null, new PixelRect((int)SourceGame * 16, 0, 16, 16));
+
+	public record FileSystemItemGroup(string Path, ObjectType ObjectType, ObservableCollection<FileSystemItemBase> SubNodes, int SpriteOffsetIndex)
+		: FileSystemItemBase(Path, ObjectType.ToString(), SubNodes, new PixelRect(32 * SpriteOffsetIndex, 0, 32, 32));
+
+	public record FileSystemVehicleGroup(string Path, VehicleType VehicleType, ObservableCollection<FileSystemItemBase> SubNodes, int SpriteOffsetIndex)
+		: FileSystemItemBase(Path, VehicleType.ToString(), SubNodes, new PixelRect(32 * SpriteOffsetIndex, 0, 32, 32));
+}

AvaGui/Models/IUiObject.cs

@@ -0,0 +1,7 @@
+using System.ComponentModel;
+
+namespace AvaGui.Models
+{
+	[TypeConverter(typeof(ExpandableObjectConverter))]
+	public interface IUiObject { }
+}

AvaGui/Models/IUiObjectWithGraphics.cs

@@ -0,0 +1,12 @@
+using OpenLoco.ObjectEditor.Headers;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace AvaGui.Models
+{
+	[TypeConverter(typeof(TypeListConverter))]
+	public interface IUiObjectWithGraphics
+	{
+		public List<G1Element32> G1Elements { get; set; }
+	}
+}

AvaGui/Models/IndexObjectHeader.cs

@@ -0,0 +1,8 @@
+using OpenLoco.ObjectEditor.Data;
+using OpenLoco.ObjectEditor.Objects;
+using System;
+
+namespace AvaGui.Models
+{
+	public record IndexObjectHeader(string Name, ObjectType ObjectType, SourceGame SourceGame, UInt32 Checksum, VehicleType? VehicleType);
+}

AvaGui/Models/LanguageTranslation.cs

@@ -0,0 +1,29 @@
+using OpenLoco.ObjectEditor.Data;
+using ReactiveUI;
+
+namespace AvaGui.Models
+{
+	public class LanguageTranslation : ReactiveObject
+	{
+		public LanguageTranslation(LanguageId language, string translation)
+		{
+			_language = language;
+			_translation = translation;
+		}
+
+		private LanguageId _language;
+		public LanguageId Language
+		{
+			get => _language;
+			set => _ = this.RaiseAndSetIfChanged(ref _language, value);
+		}
+
+		private string _translation;
+
+		public string Translation
+		{
+			get => _translation;
+			set => _ = this.RaiseAndSetIfChanged(ref _translation, value);
+		}
+	}
+}

AvaGui/Models/NewObjectFormat.cs

@@ -0,0 +1,33 @@
+using OpenLoco.ObjectEditor.Data;
+using OpenLoco.ObjectEditor.Headers;
+using OpenLoco.ObjectEditor.Types;
+using System;
+using System.Collections.Generic;
+
+namespace AvaGui.Models
+{
+	// no encoding - just zip the whole object if necessary
+	// no checksum - its now a json object, not binary
+	public class NewObjectFormat<T>
+	{
+		public string Name { get; set; }
+		public string Author { get; set; } // new
+		public string Version { get; set; } // author-specified version
+		public DateTimeOffset LastEdit { get; set; } // last-edited UTC date is an implicit version
+
+		public SourceGame SourceGame { get; set; }
+		public ObjectType ObjectType { get; set; }
+
+		// obect properties
+		public T Object { get; set; }
+
+		public StringTable StringTable { get; set; }
+		public NewImageTable ImageTable { get; set; }
+	}
+
+	public class NewImageTable
+	{
+		public IEnumerable<G1Element32> Elements { get; set; }
+		public IEnumerable<byte[]> ElementData { get; set; } // this will actually be base-64 encoded strings, not binary data
+	}
+}