CodeGenerator fixed and almost made stuff run

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Dialogs/SizeUnit.cs

@@ -1,3 +0,0 @@
-namespace PixiEditor.Models.Enums;
-
-public enum SizeUnit { Pixel, Percentage }

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/DocumentPassthroughActions/RefreshViewport_PassthroughAction.cs

@@ -1,7 +0,0 @@
-using PixiEditor.ChangeableDocument.Actions;
-using PixiEditor.ChangeableDocument.ChangeInfos;
-using PixiEditor.Models.Position;
-
-namespace PixiEditor.Models.DocumentPassthroughActions;
-
-internal record class RefreshViewport_PassthroughAction(ViewportInfo Info) : IAction, IChangeInfo;

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Handlers/IHandler.cs

@@ -1,6 +0,0 @@
-namespace PixiEditor.Models.Containers;
-
-public interface IHandler
-{
-    
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Handlers/ISearchHandler.cs

@@ -1,6 +0,0 @@
-namespace PixiEditor.Models.Containers;
-
-internal interface ISearchHandler : IHandler
-{
-    public void OpenSearchWindow(string searchQuery);
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Palettes/PaletteFileType.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditor.Models.DataHolders.Palettes;
-
-public enum PaletteFileType
-{
-    JascPal
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Models/Rendering/RenderInfos/IRenderInfo.cs

@@ -1,5 +0,0 @@
-namespace PixiEditor.Models.Rendering.RenderInfos;
-#nullable enable
-public interface IRenderInfo
-{
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/PixiEditor.Avalonia.csproj

@@ -1,59 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
-
-
-    <ItemGroup>
-      <AvaloniaResource Include="Assets\**" />
-      <AvaloniaResource Include="Data\**" />
-      <AvaloniaResource Include="Data\Languages\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="ByteSize" Version="2.1.1" />
-        <PackageReference Include="CLSEncoderDecoder" Version="1.0.0" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-        <PackageReference Include="DiscordRichPresence" Version="1.1.3.18" />
-        <PackageReference Include="Dock.Avalonia" Version="11.0.0" />
-        <PackageReference Include="Dock.Model.Avalonia" Version="11.0.0" />
-        <PackageReference Include="Hardware.Info" Version="11.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="PixiEditor.Parser" Version="3.3.0" />
-        <PackageReference Include="PixiEditor.Parser.Skia" Version="3.0.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\ChunkyImageLib\ChunkyImageLib.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.ChangeableDocument.Gen\PixiEditor.ChangeableDocument.Gen.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.ChangeableDocument\PixiEditor.ChangeableDocument.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.DrawingApi.Core\PixiEditor.DrawingApi.Core.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.DrawingApi.Skia\PixiEditor.DrawingApi.Skia.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.Extensions\PixiEditor.Extensions.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.OperatingSystem\PixiEditor.OperatingSystem.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.Platform.MSStore\PixiEditor.Platform.MSStore.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.Platform.Standalone\PixiEditor.Platform.Standalone.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.Platform.Steam\PixiEditor.Platform.Steam.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.Platform\PixiEditor.Platform.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.UI.Common\PixiEditor.UI.Common.csproj" />
-      <ProjectReference Include="..\..\PixiEditor.UpdateModule\PixiEditor.UpdateModule.csproj" />
-      <ProjectReference Include="..\..\PixiEditorGen\PixiEditorGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    </ItemGroup>
-  
-    <ItemGroup>
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
-    </ItemGroup>
-  
-    <ItemGroup>
-      <Folder Include="Views\Buttons\" />
-    </ItemGroup>
-  
-</Project>

src/PixiEditor.Avalonia/PixiEditor.Avalonia/ViewModels/Tools/ToolSettings/Toolbars/EmptyToolbar.cs

@@ -1,5 +0,0 @@
-namespace PixiEditor.ViewModels.SubViewModels.Tools.ToolSettings.Toolbars;
-
-internal class EmptyToolbar : Toolbar
-{
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/MainView.axaml.cs

@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using Avalonia.Controls;
-using Avalonia.Dialogs;
-using Avalonia.Interactivity;
-using Avalonia.Platform.Storage;
-
-namespace PixiEditor.Avalonia.Views;
-
-public partial class MainView : UserControl
-{
-    public MainView()
-    {
-        InitializeComponent();
-    }
-
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Views/Overlays/BrushShapeOverlay/BrushShape.cs

@@ -1,13 +0,0 @@
-using PixiEditor;
-using PixiEditor.Views;
-using PixiEditor.Views.UserControls;
-using PixiEditor.Views.UserControls.Overlays.BrushShapeOverlay;
-
-namespace PixiEditor.Views.UserControls.Overlays.BrushShapeOverlay;
-internal enum BrushShape
-{
-    Hidden,
-    Pixel,
-    Square,
-    Circle
-}

src/PixiEditor.Avalonia/PixiEditor.Avalonia.Browser/PixiEditor.Avalonia.Browser.csproj → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI.Browser/PixiEditor.AvaloniaUI.Browser.csproj

@@ -4,6 +4,7 @@
         <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
         <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
+        <RootNamespace>PixiEditor.Avalonia.Browser</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
@@ -15,6 +16,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\PixiEditor.Avalonia\PixiEditor.Avalonia.csproj"/>
+        <ProjectReference Include="..\PixiEditor.AvaloniaUI\PixiEditor.AvaloniaUI.csproj" />
     </ItemGroup>
 </Project>

src/PixiEditor.Avalonia/PixiEditor.Avalonia.Browser/Program.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI.Browser/Program.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Browser;
 using PixiEditor.Avalonia;
+using PixiEditor.AvaloniaUI;
 
 [assembly: SupportedOSPlatform("browser")]
 

src/PixiEditor.Avalonia/PixiEditor.Avalonia.Desktop/PixiEditor.Avalonia.Desktop.csproj → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI.Desktop/PixiEditor.AvaloniaUI.Desktop.csproj

@@ -7,6 +7,7 @@
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <RootNamespace>PixiEditor.Avalonia.Desktop</RootNamespace>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -20,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\PixiEditor.Avalonia\PixiEditor.Avalonia.csproj"/>
+        <ProjectReference Include="..\PixiEditor.AvaloniaUI\PixiEditor.AvaloniaUI.csproj" />
     </ItemGroup>
 
   <ItemGroup>

src/PixiEditor.Avalonia/PixiEditor.Avalonia.Desktop/Program.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI.Desktop/Program.cs

@@ -1,5 +1,6 @@
 using System;
 using Avalonia;
+using PixiEditor.AvaloniaUI;
 
 namespace PixiEditor.Avalonia.Desktop;
 

src/PixiEditor.Avalonia/PixiEditor.Avalonia/App.axaml → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/App.axaml

@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:themes="clr-namespace:PixiEditor.UI.Common.Themes;assembly=PixiEditor.UI.Common"
-             x:Class="PixiEditor.Avalonia.App"
+             x:Class="PixiEditor.AvaloniaUI.App"
              RequestedThemeVariant="Dark">
              <!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
 

src/PixiEditor.Avalonia/PixiEditor.Avalonia/App.axaml.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/App.axaml.cs

@@ -1,9 +1,9 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using PixiEditor.Initialization;
+using PixiEditor.AvaloniaUI.Initialization;
 
-namespace PixiEditor.Avalonia;
+namespace PixiEditor.AvaloniaUI;
 
 public partial class App : Application
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/BuildConstants.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/BuildConstants.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor;
+namespace PixiEditor.AvaloniaUI;
 
 public static class BuildConstants
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Exceptions/CorruptedFileException.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Exceptions/CorruptedFileException.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
 
-namespace PixiEditor.Avalonia.Exceptions.Exceptions;
+namespace PixiEditor.AvaloniaUI.Exceptions;
 
 [Serializable]
 internal class CorruptedFileException : RecoverableException

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Exceptions/DependencyNotFoundException.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Exceptions/DependencyNotFoundException.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Avalonia.Exceptions.Exceptions;
+namespace PixiEditor.AvaloniaUI.Exceptions;
 
 public class DependencyNotFoundException : Exception
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Exceptions/InvalidFileTypeException.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Exceptions/InvalidFileTypeException.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
 
-namespace PixiEditor.Avalonia.Exceptions.Exceptions;
+namespace PixiEditor.AvaloniaUI.Exceptions;
 
 internal class InvalidFileTypeException : RecoverableException
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Exceptions/MissingFileException.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Exceptions/MissingFileException.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
 
-namespace PixiEditor.Avalonia.Exceptions.Exceptions;
+namespace PixiEditor.AvaloniaUI.Exceptions;
 
 internal class MissingFileException : RecoverableException
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Exceptions/RecoverableException.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Exceptions/RecoverableException.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
 
-namespace PixiEditor.Avalonia.Exceptions.Exceptions;
+namespace PixiEditor.AvaloniaUI.Exceptions;
 
 public class RecoverableException : Exception
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/GlobalUsings.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/GlobalUsings.cs

@@ -3,9 +3,6 @@ global using System;
 global using OneOf.Types;
 //global using PixiEditor.ChangeableDocument.Actions.Generated;
 //global using PixiEditor.Helpers.Extensions;
-global using PixiEditor.Models.Commands.Attributes.Evaluators;
-global using PixiEditor.Models.Commands.Search;
-global using PixiEditor.ViewModels;
 //global using PixiEditor.ViewModels.SubViewModels.Main;
 global using SkiaSharp;
 

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Behaviours/ClearFocusOnClickBehavior.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Behaviours/ClearFocusOnClickBehavior.cs

@@ -1,11 +1,10 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Xaml.Interactivity;
-using PixiEditor.Models.Controllers;
+using PixiEditor.AvaloniaUI.Models.Controllers;
 
-namespace PixiEditor.Helpers.Behaviours;
+namespace PixiEditor.AvaloniaUI.Helpers.Behaviours;
 
 internal class ClearFocusOnClickBehavior : Behavior<Control>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Behaviours/GlobalShortcutFocusBehavior.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Behaviours/GlobalShortcutFocusBehavior.cs

@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Xaml.Interactivity;
-using PixiEditor.Models.Controllers;
+using PixiEditor.AvaloniaUI.Models.Controllers;
 
-namespace PixiEditor.Helpers.Behaviours;
+namespace PixiEditor.AvaloniaUI.Helpers.Behaviours;
 
 internal class GlobalShortcutFocusBehavior : Behavior<Control>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Behaviours/TextBoxFocusBehavior.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Behaviours/TextBoxFocusBehavior.cs

@@ -4,7 +4,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Xaml.Interactivity;
 
-namespace PixiEditor.Helpers.Behaviours;
+namespace PixiEditor.AvaloniaUI.Helpers.Behaviours;
 
 internal class TextBoxFocusBehavior : Behavior<TextBox>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ChangeInfoListOptimizer.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/ChangeInfoListOptimizer.cs

@@ -2,7 +2,7 @@
 using PixiEditor.ChangeableDocument.ChangeInfos;
 using PixiEditor.ChangeableDocument.ChangeInfos.Drawing;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 #nullable enable
 internal class ChangeInfoListOptimizer

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Collections/ActionDisplayList.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Collections/ActionDisplayList.cs

@@ -2,9 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using PixiEditor.Extensions.Common.Localization;
-using PixiEditor.Models.Localization;
 
-namespace PixiEditor.Helpers.Collections;
+namespace PixiEditor.AvaloniaUI.Helpers.Collections;
 
 public class ActionDisplayList : IEnumerable<KeyValuePair<string, LocalizedString>>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ColorHelper.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/ColorHelper.cs

@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
-using System.Windows;
 using Avalonia.Input;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 public class ColorHelper
 {
@@ -17,7 +16,6 @@ public class ColorHelper
     public static bool ParseAnyFormat(string value, [NotNullWhen(true)] out DrawingApi.Core.ColorsImpl.Color? result)
     {
         bool hex = Regex.IsMatch(value, "^#?([a-fA-F0-9]{8}|[a-fA-F0-9]{6}|[a-fA-F0-9]{3})$");
-
         if (hex)
         {
             result = DrawingApi.Core.ColorsImpl.Color.Parse(value);

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/CommandLineHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/CommandLineHelpers.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace PixiEditor.Helpers.UI;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 public static class CommandLineHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Constants/ClipboardDataFormats.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Constants/ClipboardDataFormats.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Avalonia.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers.Constants;
 
 public static class ClipboardDataFormats
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/CountToVisibilityConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/CountToVisibilityConverter.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
-using System.Windows;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal class CountToVisibilityConverter : SingleInstanceConverter<CountToVisibilityConverter>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/EnumToStringConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/EnumToStringConverter.cs

@@ -1,7 +1,6 @@
-using PixiEditor.Models.Enums;
-using System;
+using PixiEditor.AvaloniaUI.Models.Dialogs;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal class EnumToStringConverter : SingleInstanceConverter<EnumToStringConverter>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/EqualityBoolToIsVisibleConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/EqualityBoolToIsVisibleConverter.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
-using System.Windows;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal class EqualityBoolToIsVisibleConverter : MarkupConverter
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/FileExtensionToColorConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/FileExtensionToColorConverter.cs

@@ -1,12 +1,10 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Windows.Media;
 using Avalonia.Media;
-using PixiEditor.Models.Enums;
-using PixiEditor.Models.Files;
+using PixiEditor.AvaloniaUI.Models.Files;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal class FileExtensionToColorConverter :
     SingleInstanceConverter<FileExtensionToColorConverter>

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/JsonConverters/DefaultUnknownEnumConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/JsonConverters/DefaultUnknownEnumConverter.cs

@@ -2,7 +2,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters.JsonConverters;
 
 public class DefaultUnknownEnumConverter : StringEnumConverter
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/MarkupConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/MarkupConverter.cs

@@ -2,7 +2,7 @@
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal abstract class MarkupConverter : MarkupExtension, IValueConverter
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/SingleInstanceConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/SingleInstanceConverter.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 /// <summary>
 /// Use this if you want to share the same converter over the whole application. <para/> Do not use this if your converter has properties.

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/SingleInstanceMultiValueConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/SingleInstanceMultiValueConverter.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal abstract class SingleInstanceMultiValueConverter<TThis> : MarkupConverter, IMultiValueConverter
     where TThis : SingleInstanceMultiValueConverter<TThis>

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/ToolSizeToIntConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/ToolSizeToIntConverter.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal class ToolSizeToIntConverter
     : SingleInstanceConverter<ToolSizeToIntConverter>

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Converters/WidthToBitmapScalingModeConverter.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Converters/WidthToBitmapScalingModeConverter.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
 using Avalonia;
-using Avalonia.Data.Converters;
 using Avalonia.Media.Imaging;
 
-namespace PixiEditor.Helpers.Converters;
+namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 
 internal class WidthToBitmapScalingModeConverter : SingleInstanceMultiValueConverter<WidthToBitmapScalingModeConverter>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/CrashHelper.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/CrashHelper.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 using System.IO;
 using System.Net.Http;
 using System.Runtime.CompilerServices;
@@ -7,9 +6,9 @@ using System.Text;
 using System.Threading.Tasks;
 using ByteSizeLib;
 using Hardware.Info;
-using PixiEditor.Models.DataHolders;
+using PixiEditor.AvaloniaUI.Models.ExceptionHandling;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal class CrashHelper
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/DesignCommandHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/DesignCommandHelpers.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using PixiEditor.Models.Commands;
-using PixiEditor.Models.Commands.Exceptions;
-using CommandAttribute = PixiEditor.Models.Commands.Attributes.Commands.Command;
+using PixiEditor.AvaloniaUI.Models.Commands;
+using PixiEditor.AvaloniaUI.Models.Commands.Exceptions;
+using CommandAttribute = PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands.Command;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 /// <summary>
 /// Helps with debugging when using XAML

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/DocumentViewModelBuilder.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/DocumentViewModelBuilder.cs

@@ -4,15 +4,14 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using ChunkyImageLib;
 using ChunkyImageLib.DataHolders;
-using PixiEditor.DrawingApi.Core.ColorsImpl;
+using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.Extensions.Palettes;
-using PixiEditor.Helpers.Extensions;
 using PixiEditor.Parser;
 using BlendMode = PixiEditor.ChangeableDocument.Enums.BlendMode;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal class DocumentViewModelBuilder : ChildrenBuilder
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/ApplicationExtensions.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/ApplicationExtensions.cs

@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 
-namespace PixiEditor.Avalonia.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 public static class ApplicationExtensions
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/BitmapExtensions.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/BitmapExtensions.cs

@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
 
-namespace PixiEditor.Avalonia.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 public static class BitmapExtensions
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/ColorHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/ColorHelpers.cs

@@ -1,9 +1,8 @@
-using System.Windows.Media;
-using Avalonia.Media;
+using Avalonia.Media;
 using PixiEditor.Extensions.Palettes;
 using BackendColor = PixiEditor.DrawingApi.Core.ColorsImpl.Color;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 internal static class ColorHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/DataObjectExtensions.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/DataObjectExtensions.cs

@@ -2,7 +2,7 @@
 using Avalonia.Input;
 using PixiEditor.DrawingApi.Core.Numerics;
 
-namespace PixiEditor.Avalonia.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 public static class DataObjectExtensions
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/DictionaryHelper.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/DictionaryHelper.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace PixiEditor.Avalonia.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 internal static class DictionaryHelper
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/DirectoryExtensions.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/DirectoryExtensions.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 internal static class DirectoryExtensions
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/FileTypeExtensions.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/FileTypeExtensions.cs

@@ -1,7 +1,7 @@
-using PixiEditor.DrawingApi.Core.Surface;
-using PixiEditor.Models.Files;
+using PixiEditor.AvaloniaUI.Models.Files;
+using PixiEditor.DrawingApi.Core.Surface;
 
-namespace PixiEditor.Avalonia.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 public static class FileTypeExtensions
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/LockedFramebufferExtensions.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/LockedFramebufferExtensions.cs

@@ -2,7 +2,7 @@
 using Avalonia.Platform;
 using PixiEditor.DrawingApi.Core.Numerics;
 
-namespace PixiEditor.Avalonia.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 public static class LockedFramebufferExtensions
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/PixelFormatHelper.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/PixelFormatHelper.cs

@@ -1,8 +1,7 @@
-using System.Windows.Media;
-using Avalonia.Platform;
+using Avalonia.Platform;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 internal static class PixelFormatHelper
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/Extensions/PixiParserDocumentEx.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/Extensions/PixiParserDocumentEx.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using ChunkyImageLib;
+using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Parser;
 using PixiEditor.Parser.Deprecated;
-using PixiEditor.ViewModels.SubViewModels.Document;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers.Extensions;
 
 internal static class PixiParserDocumentEx
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/IFolderHandlerFactory.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/IFolderHandlerFactory.cs

@@ -1,7 +1,7 @@
-using PixiEditor.Models.Containers;
-using PixiEditor.Models.DocumentModels;
+using PixiEditor.AvaloniaUI.Models.DocumentModels;
+using PixiEditor.AvaloniaUI.Models.Handlers;
 
-namespace PixiEditor.Avalonia.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal interface IFolderHandlerFactory
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ILayerHandlerFactory.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/ILayerHandlerFactory.cs

@@ -1,7 +1,7 @@
-using PixiEditor.Models.Containers;
-using PixiEditor.Models.DocumentModels;
+using PixiEditor.AvaloniaUI.Models.DocumentModels;
+using PixiEditor.AvaloniaUI.Models.Handlers;
 
-namespace PixiEditor.Avalonia.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal interface ILayerHandlerFactory
 {

src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/IconEvaluators.cs

@@ -0,0 +1,52 @@
+using System.Globalization;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
+using PixiEditor.AvaloniaUI.Models.Commands.Commands;
+using PixiEditor.AvaloniaUI.Models.Commands.Search;
+
+namespace PixiEditor.Helpers;
+
+internal static class IconEvaluators
+{
+    private static readonly FontFamily segeoMdl2 = new FontFamily("Segoe MDL2 Assets");
+
+    [Evaluator.Icon("PixiEditor.FontIcon")]
+    public static IImage GetFontIcon(object parameter)
+    {
+        string symbolCode = GetIconName(parameter);
+
+        var textBlock = new TextBlock
+        {
+            FontFamily = segeoMdl2,
+            Foreground = Brushes.White,
+            Text = char.ConvertFromUtf32(int.Parse(symbolCode, NumberStyles.HexNumber)),
+        };
+
+        var brush = new VisualBrush
+        {
+            Visual = textBlock,
+            Stretch = Stretch.Uniform
+        };
+
+        var drawing = new GeometryDrawing
+        {
+            Brush = brush,
+            Geometry = new RectangleGeometry(
+                new Rect(0, 0, 32, 32))
+        };
+
+        return new DrawingImage(drawing);
+    }
+
+    private static string GetIconName(object parameter)
+    {
+        return parameter switch
+        {
+            Command command => command.IconPath,
+            CommandSearchResult cmdResult => cmdResult.Command.IconPath,
+            _ => throw new NotImplementedException($"Parameter typeof {parameter.GetType()} has not been implemented yet.")
+        };
+    }
+}

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/InputKeyHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/InputKeyHelpers.cs

@@ -1,11 +1,7 @@
-using System.Globalization;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Windows.Input;
-using Avalonia.Input;
+using Avalonia.Input;
 using PixiEditor.OperatingSystem;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class InputKeyHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/MarkupExtensions/LocalizationExtension.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/MarkupExtensions/LocalizationExtension.cs

@@ -2,7 +2,7 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers.MarkupExtensions;
 
 public class LocalizationExtension : MarkupExtension
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/PaletteHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/PaletteHelpers.cs

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
 using Avalonia.Platform.Storage;
 using PixiEditor.Extensions.Palettes.Parsers;
-using PixiEditor.Models.IO;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class PaletteHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ProcessHelper.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/ProcessHelper.cs

@@ -1,12 +1,7 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Security.Principal;
-using System.Windows.Input;
-using Hardware.Info;
+using System.Diagnostics;
 using PixiEditor.OperatingSystem;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class ProcessHelper
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/SerializableDocumentEx.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/SerializableDocumentEx.cs

@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using ChunkyImageLib;
-using PixiEditor.DrawingApi.Core.ColorsImpl;
+using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Parser;
 using PixiEditor.Parser.Collections.Deprecated;
 using PixiEditor.Parser.Deprecated;
-using PixiEditor.ViewModels.SubViewModels.Document;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class SerializableDocumentEx
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/ServiceCollectionHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/ServiceCollectionHelpers.cs

@@ -1,28 +1,27 @@
 using Microsoft.Extensions.DependencyInjection;
-using PixiEditor.Avalonia.ViewModels;
+using PixiEditor.AvaloniaUI.Models.AppExtensions;
+using PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
+using PixiEditor.AvaloniaUI.Models.Commands;
+using PixiEditor.AvaloniaUI.Models.Controllers;
+using PixiEditor.AvaloniaUI.Models.Handlers;
+using PixiEditor.AvaloniaUI.Models.IO.PaletteParsers;
+using PixiEditor.AvaloniaUI.Models.IO.PaletteParsers.JascPalFile;
+using PixiEditor.AvaloniaUI.Models.Localization;
+using PixiEditor.AvaloniaUI.Models.Palettes;
+using PixiEditor.AvaloniaUI.Models.Preferences;
+using PixiEditor.AvaloniaUI.ViewModels.Document;
+using PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
+using PixiEditor.AvaloniaUI.ViewModels.SubViewModels.AdditionalContent;
+using PixiEditor.AvaloniaUI.ViewModels.Tools;
+using PixiEditor.AvaloniaUI.ViewModels.Tools.Tools;
 using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Common.UserPreferences;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Extensions.Palettes.Parsers;
 using PixiEditor.Extensions.Windowing;
-using PixiEditor.Models.AppExtensions;
-using PixiEditor.Models.AppExtensions.Services;
-using PixiEditor.Models.Commands;
-using PixiEditor.Models.Containers;
-using PixiEditor.Models.Controllers;
-using PixiEditor.Models.DataProviders;
-using PixiEditor.Models.IO.PaletteParsers;
-using PixiEditor.Models.IO.PaletteParsers.JascPalFile;
-using PixiEditor.Models.Localization;
-using PixiEditor.Models.Preferences;
-using PixiEditor.ViewModels.SubViewModels;
-using PixiEditor.ViewModels.SubViewModels.AdditionalContent;
-using PixiEditor.ViewModels.SubViewModels.Document;
-using PixiEditor.ViewModels.SubViewModels.Main;
-using PixiEditor.ViewModels.SubViewModels.Tools;
-using PixiEditor.ViewModels.SubViewModels.Tools.Tools;
+using ViewModelMain = PixiEditor.AvaloniaUI.ViewModels.ViewModelMain;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class ServiceCollectionHelpers
 {
@@ -52,6 +51,7 @@ internal static class ServiceCollectionHelpers
         .AddSingleton<RegistryViewModel>()
         .AddSingleton(static x => new DiscordViewModel(x.GetService<ViewModelMain>(), "764168193685979138"))
         .AddSingleton<DebugViewModel>()
+        .AddSingleton<ISearchHandler, SearchViewModel>()
         .AddSingleton<SearchViewModel>()
         .AddSingleton<AdditionalContentViewModel>()
         .AddSingleton(x => new ExtensionsViewModel(x.GetService<ViewModelMain>(), extensionLoader))
@@ -60,21 +60,21 @@ internal static class ServiceCollectionHelpers
         .AddSingleton<CommandController>()
         .AddSingleton<DocumentManagerViewModel>()
         // Tools
-        .AddSingleton<ToolViewModel, MoveViewportToolViewModel>()
-        .AddSingleton<ToolViewModel, RotateViewportToolViewModel>()
-        .AddSingleton<ToolViewModel, MoveToolViewModel>()
-        .AddSingleton<ToolViewModel, PenToolViewModel>()
-        .AddSingleton<ToolViewModel, SelectToolViewModel>()
-        .AddSingleton<ToolViewModel, MagicWandToolViewModel>()
-        .AddSingleton<ToolViewModel, LassoToolViewModel>()
-        .AddSingleton<ToolViewModel, FloodFillToolViewModel>()
-        .AddSingleton<ToolViewModel, LineToolViewModel>()
-        .AddSingleton<ToolViewModel, EllipseToolViewModel>()
-        .AddSingleton<ToolViewModel, RectangleToolViewModel>()
-        .AddSingleton<ToolViewModel, EraserToolViewModel>()
-        .AddSingleton<ToolViewModel, ColorPickerToolViewModel>()
-        .AddSingleton<ToolViewModel, BrightnessToolViewModel>()
-        .AddSingleton<ToolViewModel, ZoomToolViewModel>()
+        .AddSingleton<IToolHandler, MoveViewportToolViewModel>()
+        .AddSingleton<IToolHandler, RotateViewportToolViewModel>()
+        .AddSingleton<IToolHandler, MoveToolViewModel>()
+        .AddSingleton<IToolHandler, PenToolViewModel>()
+        .AddSingleton<IToolHandler, SelectToolViewModel>()
+        .AddSingleton<IToolHandler, MagicWandToolViewModel>()
+        .AddSingleton<IToolHandler, LassoToolViewModel>()
+        .AddSingleton<IToolHandler, FloodFillToolViewModel>()
+        .AddSingleton<IToolHandler, LineToolViewModel>()
+        .AddSingleton<IToolHandler, EllipseToolViewModel>()
+        .AddSingleton<IToolHandler, RectangleToolViewModel>()
+        .AddSingleton<IToolHandler, EraserToolViewModel>()
+        .AddSingleton<IToolHandler, ColorPickerToolViewModel>()
+        .AddSingleton<IToolHandler, BrightnessToolViewModel>()
+        .AddSingleton<IToolHandler, ZoomToolViewModel>()
         // Palette Parsers
         .AddSingleton<PaletteFileParser, JascFileParser>()
         .AddSingleton<PaletteFileParser, ClsFileParser>()

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/StringHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/StringHelpers.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace PixiEditor.Helpers.Extensions;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class StringHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/StructureHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/StructureHelpers.cs

@@ -1,11 +1,6 @@
-using Avalonia;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
-using PixiEditor.DrawingApi.Core.Numerics;
-using PixiEditor.DrawingApi.Core.Surface;
-using PixiEditor.DrawingApi.Core.Surface.ImageData;
+using PixiEditor.DrawingApi.Core.Numerics;
 
-namespace PixiEditor.Avalonia.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 public static class StructureHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/SupportedFilesHelper.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/SupportedFilesHelper.cs

@@ -2,11 +2,10 @@
 using System.IO;
 using System.Linq;
 using Avalonia.Platform.Storage;
-using PixiEditor.Models.Enums;
-using PixiEditor.Models.Files;
-using PixiEditor.Models.IO;
+using PixiEditor.AvaloniaUI.Models.Files;
+using PixiEditor.AvaloniaUI.Models.IO;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal class SupportedFilesHelper
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/SurfaceHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/SurfaceHelpers.cs

@@ -1,17 +1,10 @@
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Avalonia;
-using Avalonia.Media.Imaging;
-using Avalonia.Platform;
+using Avalonia.Media.Imaging;
 using ChunkyImageLib;
-using PixiEditor.Avalonia.Helpers;
-using PixiEditor.Avalonia.Helpers.Extensions;
+using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
-using PixiEditor.Helpers.Extensions;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 public static class SurfaceHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/UI/ExecutionTrigger.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/UI/ExecutionTrigger.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers.UI;
 
 internal class ExecutionTrigger<T>
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/UI/Hyperlink.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/UI/Hyperlink.cs

@@ -1,10 +1,9 @@
-using System.ComponentModel;
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using PixiEditor.OperatingSystem;
 
-namespace PixiEditor.Avalonia.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers.UI;
 
 public class Hyperlink : AvaloniaObject
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/VersionHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/VersionHelpers.cs

@@ -1,9 +1,7 @@
-using System;
-using System.Diagnostics;
-using System.Reflection;
+using System.Reflection;
 using System.Text;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class VersionHelpers
 {

src/PixiEditor.Avalonia/PixiEditor.Avalonia/Helpers/WriteableBitmapHelpers.cs → src/PixiEditor.Avalonia/PixiEditor.AvaloniaUI/Helpers/WriteableBitmapHelpers.cs

@@ -1,12 +1,12 @@
 using Avalonia;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using PixiEditor.Avalonia.Helpers.Extensions;
+using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 
-namespace PixiEditor.Avalonia.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class WriteableBitmapHelpers
 {