Added a few more controls and extracted runtime

src/PixiEditor.AvaloniaUI/Animation/Animators.cs

@@ -1,5 +1,4 @@
-using Avalonia.Markup.Xaml;
-using Avalonia.Media;
+using Avalonia.Media;
 using Avalonia.Styling;
 
 namespace PixiEditor.AvaloniaUI.Animation;

src/PixiEditor.AvaloniaUI/Exceptions/CorruptedFileException.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.Exceptions;
 

src/PixiEditor.AvaloniaUI/Exceptions/InvalidFileTypeException.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.Exceptions;
 

src/PixiEditor.AvaloniaUI/Exceptions/MissingFileException.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Serialization;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.Exceptions;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/ActiveToolToZoomModeConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using PixiEditor.AvaloniaUI.ViewModels.Tools.Tools;
-using PixiEditor.UI.Common.Converters;
 using PixiEditor.Zoombox;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;

src/PixiEditor.AvaloniaUI/Helpers/Converters/BlendModeToStringConverter.cs

@@ -2,7 +2,6 @@
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.Extensions.Common.Localization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 internal class BlendModeToStringConverter : SingleInstanceConverter<BlendModeToStringConverter>

src/PixiEditor.AvaloniaUI/Helpers/Converters/BoolToIntConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

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

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/EnumBooleanConverter.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

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

@@ -1,5 +1,4 @@
 using PixiEditor.AvaloniaUI.Models.Dialogs;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

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

@@ -3,7 +3,6 @@ using System.Globalization;
 using System.IO;
 using Avalonia.Media;
 using PixiEditor.AvaloniaUI.Models.Files;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/GenericColorToMediaColorConverter.cs

@@ -2,7 +2,6 @@
 using Avalonia.Media;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.Extensions.Palettes;
-using PixiEditor.UI.Common.Converters;
 using BackendColor = PixiEditor.DrawingApi.Core.ColorsImpl.Color;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;

src/PixiEditor.AvaloniaUI/Helpers/Converters/ImagePathToBitmapConverter.cs

@@ -2,10 +2,8 @@
 using System.IO;
 using System.Reflection;
 using Avalonia;
-using Avalonia.Data;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/IndentConverter.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
 using Avalonia.Controls;
 using Avalonia.Data;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/IntToViewportRectConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using Avalonia;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/IsEqualConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/IsSelectionToolConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using PixiEditor.AvaloniaUI.ViewModels.Tools.Tools;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/KeyToStringConverter.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
 using Avalonia.Input;
 using PixiEditor.Extensions.Common.Localization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/ModifierFlagToModifiersConverter.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Avalonia.Input;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/MultiplyConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using Avalonia;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 internal class MultiplyConverter : SingleInstanceConverter<MultiplyConverter>

src/PixiEditor.AvaloniaUI/Helpers/Converters/NullToVisibilityConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/PaletteItemsToWidthConverter.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using PixiEditor.DrawingApi.Core.ColorsImpl;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/PaletteViewerWidthToVisibilityConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/RadiansToDegreesConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/ReciprocalConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using Avalonia;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 internal class ReciprocalConverter : SingleInstanceConverter<ReciprocalConverter>

src/PixiEditor.AvaloniaUI/Helpers/Converters/ScaleToBitmapScalingModeConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using Avalonia.Media.Imaging;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/StructureMemberSelectionTypeToColorConverter.cs

@@ -1,7 +1,6 @@
 using System.Globalization;
 using Avalonia.Media;
 using PixiEditor.AvaloniaUI.Models.Layers;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 internal class StructureMemberSelectionTypeToColorConverter : SingleInstanceConverter<StructureMemberSelectionTypeToColorConverter>

src/PixiEditor.AvaloniaUI/Helpers/Converters/SubtractConverter.cs

@@ -1,5 +1,4 @@
 using System.Globalization;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

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

@@ -1,7 +1,6 @@
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Converters/ZoomModeToHitTestVisibleConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using Avalonia;
-using PixiEditor.UI.Common.Converters;
 using PixiEditor.Zoombox;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;

src/PixiEditor.AvaloniaUI/Helpers/Converters/ZoomToViewportConverter.cs

@@ -1,6 +1,5 @@
 using System.Globalization;
 using Avalonia;
-using PixiEditor.UI.Common.Converters;
 
 namespace PixiEditor.AvaloniaUI.Helpers.Converters;
 

src/PixiEditor.AvaloniaUI/Helpers/Extensions/MethodExtension.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 

src/PixiEditor.AvaloniaUI/Helpers/ServiceCollectionHelpers.cs

@@ -1,10 +1,9 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-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.ExtensionServices;
 using PixiEditor.AvaloniaUI.Models.Handlers;
 using PixiEditor.AvaloniaUI.Models.Handlers.Tools;
 using PixiEditor.AvaloniaUI.Models.IO.PaletteParsers;
@@ -15,7 +14,6 @@ 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;
@@ -23,6 +21,7 @@ using PixiEditor.Extensions.IO;
 using PixiEditor.Extensions.LayoutBuilding;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Extensions.Palettes.Parsers;
+using PixiEditor.Extensions.Runtime;
 using PixiEditor.Extensions.Windowing;
 using ViewModelMain = PixiEditor.AvaloniaUI.ViewModels.ViewModelMain;
 

src/PixiEditor.AvaloniaUI/Initialization/ClassicDesktopEntry.cs

@@ -7,11 +7,12 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Threading;
 using PixiEditor.AvaloniaUI.Helpers;
-using PixiEditor.AvaloniaUI.Models.AppExtensions;
 using PixiEditor.AvaloniaUI.Models.Controllers;
 using PixiEditor.AvaloniaUI.Models.ExceptionHandling;
+using PixiEditor.AvaloniaUI.Models.IO;
 using PixiEditor.AvaloniaUI.Views;
 using PixiEditor.AvaloniaUI.Views.Dialogs;
+using PixiEditor.Extensions.Runtime;
 using PixiEditor.OperatingSystem;
 using PixiEditor.Platform;
 using PixiEditor.Windows;
@@ -97,7 +98,9 @@ internal class ClassicDesktopEntry
     {
         InitPlatform();
 
-        ExtensionLoader extensionLoader = new ExtensionLoader();
+        ExtensionLoader extensionLoader = new ExtensionLoader(Paths.ExtensionsFullPath);
+        //TODO: fetch from extension store
+        extensionLoader.AddOfficialExtension("pixieditor.supporterpack", new OfficialExtensionData("supporter-pack.snk", AdditionalContentProduct.SupporterPack));
         extensionLoader.LoadExtensions();
         
         return extensionLoader;

src/PixiEditor.AvaloniaUI/Models/Commands/Attributes/Evaluators/CanExecuteAttribute.cs

@@ -1,6 +1,4 @@
-using PixiEditor.AvaloniaUI.ViewModels.Document;
-
-namespace PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
+namespace PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
 
 internal partial class Evaluator
 {

src/PixiEditor.AvaloniaUI/Models/Commands/CommandCollection.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Avalonia.Input;
-using PixiEditor.AvaloniaUI.Models.Commands.Evaluators;
-using PixiEditor.AvaloniaUI.Models.Dialogs;
 using PixiEditor.AvaloniaUI.Models.Input;
 using PixiEditor.AvaloniaUI.Models.Structures;
 using Command = PixiEditor.AvaloniaUI.Models.Commands.Commands.Command;

src/PixiEditor.AvaloniaUI/Models/Commands/CommandController.cs

@@ -4,9 +4,6 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;

src/PixiEditor.AvaloniaUI/Models/Commands/CommandMethods.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using PixiEditor.AvaloniaUI.Models.Commands.Commands;
+using PixiEditor.AvaloniaUI.Models.Commands.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Evaluators;
 
 namespace PixiEditor.AvaloniaUI.Models.Commands;

src/PixiEditor.AvaloniaUI/Models/Commands/Commands/Command.cs

@@ -1,7 +1,5 @@
 using System.Diagnostics;
-using System.Threading.Tasks;
 using Avalonia.Media;
-using CommunityToolkit.Mvvm.ComponentModel;
 using PixiEditor.AvaloniaUI.Models.Commands.Evaluators;
 using PixiEditor.AvaloniaUI.Models.Input;
 using PixiEditor.AvaloniaUI.ViewModels;

src/PixiEditor.AvaloniaUI/Models/Commands/Evaluators/CanExecuteEvaluator.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Threading.Tasks;
-using PixiEditor.AvaloniaUI.Models.Commands.Commands;
+using PixiEditor.AvaloniaUI.Models.Commands.Commands;
 
 namespace PixiEditor.AvaloniaUI.Models.Commands.Evaluators;
 

src/PixiEditor.AvaloniaUI/Models/Commands/Evaluators/Evaluator.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Threading.Tasks;
 using PixiEditor.AvaloniaUI.Models.Commands.Commands;
 
 namespace PixiEditor.AvaloniaUI.Models.Commands.Evaluators;

src/PixiEditor.AvaloniaUI/Models/Commands/Evaluators/IconEvaluator.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Reflection;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;

src/PixiEditor.AvaloniaUI/Models/Commands/Templates/Providers/Parsers/AsepriteKeysParser.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Text;
 using System.Xml;
 using PixiEditor.AvaloniaUI.Exceptions;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.Models.Commands.Templates.Providers.Parsers;
 

src/PixiEditor.AvaloniaUI/Models/Commands/XAML/Command.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;

src/PixiEditor.AvaloniaUI/Models/Commands/XAML/Menu.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Models.Input;

src/PixiEditor.AvaloniaUI/Models/Commands/XAML/ShortcutBinding.cs

@@ -1,9 +1,7 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
-using Microsoft.Extensions.DependencyInjection;
 using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Models.Handlers;
 using PixiEditor.AvaloniaUI.Models.Input;

src/PixiEditor.AvaloniaUI/Models/Controllers/InputDevice/MouseUpdateController.cs

@@ -1,5 +1,4 @@
-using System.Timers;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 

src/PixiEditor.AvaloniaUI/Models/Controllers/InputDevice/MouseUpdateControllerSession.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Threading;
-using Avalonia;
 using Avalonia.Input;
 using Avalonia.Threading;
 

src/PixiEditor.AvaloniaUI/Models/DocumentModels/ChangeExecutionController.cs

@@ -1,9 +1,7 @@
-using System.Collections.Generic;
-using Avalonia.Input;
+using Avalonia.Input;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.AvaloniaUI.Models.DocumentModels.UpdateableChangeExecutors;
 using PixiEditor.AvaloniaUI.Models.Handlers;
-using PixiEditor.AvaloniaUI.Models.Position;
 using PixiEditor.AvaloniaUI.Models.Tools;
 using PixiEditor.AvaloniaUI.Views.Overlays.SymmetryOverlay;
 using PixiEditor.ChangeableDocument.Enums;

src/PixiEditor.AvaloniaUI/Models/DocumentModels/DocumentInternalParts.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using PixiEditor.AvaloniaUI.Models.Handlers;
+using PixiEditor.AvaloniaUI.Models.Handlers;
 using PixiEditor.ChangeableDocument;
 
 namespace PixiEditor.AvaloniaUI.Models.DocumentModels;

src/PixiEditor.AvaloniaUI/Models/DocumentModels/DocumentSizeChangedEventArgs.cs

@@ -1,5 +1,4 @@
 using PixiEditor.AvaloniaUI.Models.Handlers;
-using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.DrawingApi.Core.Numerics;
 
 namespace PixiEditor.AvaloniaUI.Models.DocumentModels;

src/PixiEditor.AvaloniaUI/Models/DocumentModels/Public/DocumentEventsModule.cs

@@ -1,7 +1,6 @@
 using Avalonia.Input;
 using PixiEditor.AvaloniaUI.Models.Events;
 using PixiEditor.AvaloniaUI.Models.Handlers;
-using PixiEditor.AvaloniaUI.Models.Position;
 using PixiEditor.AvaloniaUI.Views.Overlays.SymmetryOverlay;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;

src/PixiEditor.AvaloniaUI/Models/DocumentModels/UpdateableChangeExecutors/SymmetryExecutor.cs

@@ -1,5 +1,4 @@
-using PixiEditor.AvaloniaUI.Models.Position;
-using PixiEditor.AvaloniaUI.Models.Tools;
+using PixiEditor.AvaloniaUI.Models.Tools;
 using PixiEditor.AvaloniaUI.Views.Overlays.SymmetryOverlay;
 using PixiEditor.ChangeableDocument.Actions.Generated;
 using PixiEditor.ChangeableDocument.Enums;

src/PixiEditor.AvaloniaUI/Models/DocumentModels/UpdateableChangeExecutors/UpdateableChangeExecutor.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using Avalonia.Input;
+using Avalonia.Input;
 using ChunkyImageLib.DataHolders;
 using Microsoft.Extensions.DependencyInjection;
-using PixiEditor.AvaloniaUI.Exceptions;
 using PixiEditor.AvaloniaUI.Models.Handlers;
-using PixiEditor.AvaloniaUI.Models.Position;
 using PixiEditor.AvaloniaUI.Models.Tools;
 using PixiEditor.AvaloniaUI.Views.Overlays.SymmetryOverlay;
 using PixiEditor.ChangeableDocument.Enums;

src/PixiEditor.AvaloniaUI/Models/AppExtensions/Services/FileFilterExtensions.cs → src/PixiEditor.AvaloniaUI/Models/ExtensionServices/FileFilterExtensions.cs

@@ -1,9 +1,8 @@
 using System.Collections.Generic;
-using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 using PixiEditor.Extensions.IO;
 
-namespace PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
+namespace PixiEditor.AvaloniaUI.Models.ExtensionServices;
 
 public static class FileFilterExtensions
 {

src/PixiEditor.AvaloniaUI/Models/AppExtensions/Services/FileSystemProvider.cs → src/PixiEditor.AvaloniaUI/Models/ExtensionServices/FileSystemProvider.cs

@@ -1,9 +1,7 @@
-using Avalonia;
-using PixiEditor.AvaloniaUI.Helpers.Extensions;
-using PixiEditor.AvaloniaUI.Views;
+using PixiEditor.AvaloniaUI.Views;
 using PixiEditor.Extensions.IO;
 
-namespace PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
+namespace PixiEditor.AvaloniaUI.Models.ExtensionServices;
 
 public class FileSystemProvider : IFileSystemProvider
 {

src/PixiEditor.AvaloniaUI/Models/AppExtensions/Services/PaletteProvider.cs → src/PixiEditor.AvaloniaUI/Models/ExtensionServices/PaletteProvider.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using PixiEditor.Extensions.Palettes;
 using PixiEditor.Extensions.Palettes.Parsers;
 
-namespace PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
+namespace PixiEditor.AvaloniaUI.Models.ExtensionServices;
 
 internal sealed class PaletteProvider : IPaletteProvider
 {

src/PixiEditor.AvaloniaUI/Models/AppExtensions/Services/WindowProvider.cs → src/PixiEditor.AvaloniaUI/Models/ExtensionServices/WindowProvider.cs

@@ -2,11 +2,11 @@
 using System.Linq;
 using System.Reflection;
 using PixiEditor.AvaloniaUI.Views.Dialogs;
-using PixiEditor.Extensions;
 using PixiEditor.Extensions.Helpers;
+using PixiEditor.Extensions.Runtime;
 using PixiEditor.Extensions.Windowing;
 
-namespace PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
+namespace PixiEditor.AvaloniaUI.Models.ExtensionServices;
 
 public class WindowProvider : IWindowProvider
 {

src/PixiEditor.AvaloniaUI/Models/Handlers/IDocument.cs

@@ -2,7 +2,6 @@
 using Avalonia.Media.Imaging;
 using ChunkyImageLib.DataHolders;
 using PixiEditor.AvaloniaUI.Helpers;
-using PixiEditor.AvaloniaUI.Models.DocumentModels;
 using PixiEditor.AvaloniaUI.Models.DocumentModels.Public;
 using PixiEditor.AvaloniaUI.Models.Structures;
 using PixiEditor.AvaloniaUI.Models.Tools;

src/PixiEditor.AvaloniaUI/Models/IO/Importer.cs

@@ -2,7 +2,6 @@
 using System.IO.Compression;
 using System.Runtime.InteropServices;
 using Avalonia.Media.Imaging;
-using Avalonia.Platform;
 using ChunkyImageLib;
 using CommunityToolkit.Mvvm.ComponentModel;
 using PixiEditor.AvaloniaUI.Exceptions;
@@ -14,6 +13,7 @@ using PixiEditor.DrawingApi.Core.Surface;
 using PixiEditor.DrawingApi.Core.Surface.ImageData;
 using PixiEditor.DrawingApi.Core.Surface.PaintImpl;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 using PixiEditor.Parser;
 using PixiEditor.Parser.Deprecated;
 using Bitmap = Avalonia.Media.Imaging.Bitmap;

src/PixiEditor.AvaloniaUI/Models/IO/PaletteParsers/JascPalFile/JascFileException.cs

@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
-using PixiEditor.AvaloniaUI.Exceptions;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.Models.IO.PaletteParsers.JascPalFile;
 

src/PixiEditor.AvaloniaUI/Models/Input/Cursors.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Input;
-using Avalonia.Media.Imaging;
 using PixiEditor.AvaloniaUI.Helpers.Converters;
 
 namespace PixiEditor.AvaloniaUI.Models.Input;

src/PixiEditor.AvaloniaUI/Models/Localization/LocalizationProvider.cs

@@ -5,10 +5,10 @@ using System.Linq;
 using Avalonia.Platform;
 using Newtonsoft.Json;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
-using PixiEditor.AvaloniaUI.Models.AppExtensions;
 using PixiEditor.AvaloniaUI.Models.IO;
 using PixiEditor.Extensions;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Runtime;
 
 namespace PixiEditor.AvaloniaUI.Models.Localization;
 

src/PixiEditor.AvaloniaUI/Models/Structures/ObservableRangeCollection.cs

@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
 using Avalonia.Collections;
 
 namespace PixiEditor.AvaloniaUI.Models.Structures;

src/PixiEditor.AvaloniaUI/Models/UserData/RecentlyOpenedDocument.cs

@@ -3,10 +3,10 @@ using System.IO;
 using Avalonia;
 using Avalonia.Media.Imaging;
 using CommunityToolkit.Mvvm.ComponentModel;
-using PixiEditor.AvaloniaUI.Exceptions;
 using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.AvaloniaUI.Models.IO;
+using PixiEditor.Extensions.Exceptions;
 using PixiEditor.Parser;
 using PixiEditor.Parser.Deprecated;
 

src/PixiEditor.AvaloniaUI/PixiEditor.AvaloniaUI.csproj

@@ -51,6 +51,7 @@
       <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.Runtime\PixiEditor.Extensions.Runtime.csproj" />
       <ProjectReference Include="..\PixiEditor.Extensions.WasmRuntime\PixiEditor.Extensions.WasmRuntime.csproj" />
       <ProjectReference Include="..\PixiEditor.Extensions\PixiEditor.Extensions.csproj" />
       <ProjectReference Include="..\PixiEditor.OperatingSystem\PixiEditor.OperatingSystem.csproj" />

src/PixiEditor.AvaloniaUI/ViewLocator.cs

@@ -1,13 +1,11 @@
 using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using ColorPicker;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Dock.Model.Core;
 using PixiEditor.AvaloniaUI.ViewModels.Dock;
 using PixiEditor.AvaloniaUI.Views.Dock;
 using PixiEditor.AvaloniaUI.Views.Layers;
-using PixiEditor.AvaloniaUI.Views.Main;
 
 namespace PixiEditor.AvaloniaUI;
 

src/PixiEditor.AvaloniaUI/ViewModels/Dock/DockDocumentViewModel.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
 
 namespace PixiEditor.AvaloniaUI.ViewModels.Dock;

src/PixiEditor.AvaloniaUI/ViewModels/Dock/DockFactory.cs

@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Dock.Avalonia.Controls;
 using Dock.Model.Avalonia;
 using Dock.Model.Avalonia.Controls;
 using Dock.Model.Controls;
 using Dock.Model.Core;
-using PixiEditor.AvaloniaUI.Models.Palettes;
 using PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
 
 namespace PixiEditor.AvaloniaUI.ViewModels.Dock;

src/PixiEditor.AvaloniaUI/ViewModels/Dock/PixiEditorDocumentDock.cs

@@ -1,11 +1,8 @@
-using System.Collections.Specialized;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
 using Dock.Model.Avalonia.Controls;
-using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
-using PixiEditor.DrawingApi.Core.Numerics;
 
 namespace PixiEditor.AvaloniaUI.ViewModels.Dock;
 

src/PixiEditor.AvaloniaUI/ViewModels/Dock/SwatchesDockViewModel.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using Avalonia;
+using Avalonia;
 using Dock.Model.Avalonia.Controls;
 using PixiEditor.AvaloniaUI.ViewModels.Document;
 

src/PixiEditor.AvaloniaUI/ViewModels/Document/DocumentManagerViewModel.cs

@@ -5,7 +5,6 @@ using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
 using PixiEditor.AvaloniaUI.Models.Dialogs;
 using PixiEditor.AvaloniaUI.Models.Handlers;
-using PixiEditor.AvaloniaUI.Models.Position;
 using PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
 using PixiEditor.AvaloniaUI.ViewModels.Tools.Tools;
 using PixiEditor.AvaloniaUI.Views;

src/PixiEditor.AvaloniaUI/ViewModels/Document/DocumentViewModel.Serialization.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Drawing;
 using System.IO;
 using System.Linq;

src/PixiEditor.AvaloniaUI/ViewModels/Document/DocumentViewModel.cs

@@ -8,8 +8,6 @@ using Avalonia.Media.Imaging;
 using ChunkyImageLib;
 using ChunkyImageLib.DataHolders;
 using ChunkyImageLib.Operations;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.Extensions.DependencyInjection;
 using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Helpers.Collections;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
@@ -17,7 +15,6 @@ using PixiEditor.AvaloniaUI.Models.Controllers;
 using PixiEditor.AvaloniaUI.Models.DocumentModels;
 using PixiEditor.AvaloniaUI.Models.DocumentModels.Public;
 using PixiEditor.AvaloniaUI.Models.Handlers;
-using PixiEditor.AvaloniaUI.Models.Position;
 using PixiEditor.AvaloniaUI.Models.Structures;
 using PixiEditor.AvaloniaUI.Models.Tools;
 using PixiEditor.AvaloniaUI.ViewModels.Document.TransformOverlays;

src/PixiEditor.AvaloniaUI/ViewModels/MainVmEnum.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditor.ViewModels;
+namespace PixiEditor.ViewModels;
 
 enum MainVmEnum
 {

src/PixiEditor.AvaloniaUI/ViewModels/SettingsWindowViewModel.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
-using PixiEditor.AvaloniaUI.Exceptions;
 using PixiEditor.AvaloniaUI.Models.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Templates;
@@ -14,6 +13,7 @@ using PixiEditor.AvaloniaUI.ViewModels.UserPreferences;
 using PixiEditor.AvaloniaUI.Views;
 using PixiEditor.AvaloniaUI.Views.Shortcuts;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.ViewModels;
 

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/ClipboardViewModel.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
-using Avalonia.Input.Platform;
 using Avalonia.Media;
 using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/ColorsViewModel.cs

@@ -8,16 +8,15 @@ using Avalonia.Media;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.DependencyInjection;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
-using PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
 using PixiEditor.AvaloniaUI.Models.Commands.Search;
 using PixiEditor.AvaloniaUI.Models.Commands.XAML;
 using PixiEditor.AvaloniaUI.Models.Controllers;
 using PixiEditor.AvaloniaUI.Models.Dialogs;
+using PixiEditor.AvaloniaUI.Models.ExtensionServices;
 using PixiEditor.AvaloniaUI.Models.ExternalServices;
 using PixiEditor.AvaloniaUI.Models.Handlers;
 using PixiEditor.AvaloniaUI.Models.Palettes;
-using PixiEditor.AvaloniaUI.Models.Structures;
 using PixiEditor.AvaloniaUI.Views.Dialogs;
 using PixiEditor.AvaloniaUI.Views.Windows;
 using PixiEditor.Extensions.Common.Localization;

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/ExtensionsViewModel.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
-using PixiEditor.AvaloniaUI.Models.AppExtensions;
-using PixiEditor.AvaloniaUI.Models.AppExtensions.Services;
+using PixiEditor.AvaloniaUI.Models.ExtensionServices;
 using PixiEditor.AvaloniaUI.Views.Windows;
 using PixiEditor.Extensions;
+using PixiEditor.Extensions.Runtime;
 using PixiEditor.Extensions.Windowing;
 
 namespace PixiEditor.AvaloniaUI.ViewModels.SubViewModels;

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/FileViewModel.cs

@@ -9,9 +9,7 @@ using Avalonia.Input;
 using Avalonia.Platform.Storage;
 using ChunkyImageLib;
 using Newtonsoft.Json.Linq;
-using PixiEditor.AvaloniaUI.Exceptions;
 using PixiEditor.AvaloniaUI.Helpers;
-using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Controllers;
 using PixiEditor.AvaloniaUI.Models.Dialogs;
@@ -24,6 +22,7 @@ using PixiEditor.AvaloniaUI.Views.Windows;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Common.UserPreferences;
+using PixiEditor.Extensions.Exceptions;
 using PixiEditor.OperatingSystem;
 using PixiEditor.Parser;
 

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/LayersViewModel.cs

@@ -8,7 +8,6 @@ using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
-using PixiEditor.AvaloniaUI.Exceptions;
 using PixiEditor.AvaloniaUI.Helpers.Extensions;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
@@ -19,6 +18,7 @@ using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.ChangeableDocument.Enums;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Extensions.Common.Localization;
+using PixiEditor.Extensions.Exceptions;
 
 namespace PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
 #nullable enable

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/MiscViewModel.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using PixiEditor.AvaloniaUI.Helpers;
+using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Dialogs;
 using PixiEditor.OperatingSystem;

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/ToolsViewModel.cs

@@ -1,13 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using Avalonia;
 using Avalonia.Input;
-using Avalonia.Media.Imaging;
 using Microsoft.Extensions.DependencyInjection;
-using PixiEditor.AvaloniaUI.Helpers.Converters;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
 using PixiEditor.AvaloniaUI.Models.Controllers;

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/UpdateViewModel.cs

@@ -9,7 +9,6 @@ using Avalonia.Controls.ApplicationLifetimes;
 using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Dialogs;
-using PixiEditor.AvaloniaUI.Views.Dialogs;
 using PixiEditor.Extensions.Common.Localization;
 using PixiEditor.Extensions.Common.UserPreferences;
 using PixiEditor.Platform;

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/ViewOptionsViewModel.cs

@@ -1,6 +1,5 @@
 using Avalonia.Input;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
-using PixiEditor.DrawingApi.Core.Numerics;
 
 namespace PixiEditor.AvaloniaUI.ViewModels.SubViewModels;
 #nullable enable

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/WindowViewModel.cs

@@ -7,7 +7,6 @@ using PixiEditor.AvaloniaUI.ViewModels.Document;
 using PixiEditor.AvaloniaUI.Views;
 using PixiEditor.AvaloniaUI.Views.Dialogs;
 using PixiEditor.AvaloniaUI.Views.Windows;
-using PixiEditor.Views.UserControls;
 using Command = PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands.Command;
 using SettingsWindow = PixiEditor.AvaloniaUI.Views.Windows.Settings.SettingsWindow;
 

src/PixiEditor.AvaloniaUI/ViewModels/ToolVM.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using System.Windows.Markup;
 using Avalonia.Markup.Xaml;
 using PixiEditor.AvaloniaUI.ViewModels;
 

src/PixiEditor.AvaloniaUI/ViewModels/Tools/ToolSettings/Settings/ColorSetting.cs

@@ -3,7 +3,6 @@ using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.Xaml.Interactivity;
-using ColorPicker;
 using PixiEditor.AvaloniaUI.Helpers.Behaviours;
 using PixiEditor.AvaloniaUI.Views.Input;
 

src/PixiEditor.AvaloniaUI/ViewModels/Tools/Tools/BrightnessToolViewModel.cs

@@ -1,6 +1,5 @@
 using Avalonia.Input;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
-using PixiEditor.AvaloniaUI.Models.Handlers.Toolbars;
 using PixiEditor.AvaloniaUI.Models.Handlers.Tools;
 using PixiEditor.AvaloniaUI.Models.Tools;
 using PixiEditor.AvaloniaUI.ViewModels.Tools.ToolSettings.Toolbars;

src/PixiEditor.AvaloniaUI/ViewModels/Tools/Tools/PenToolViewModel.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using Avalonia.Input;
-using Avalonia.Media.Imaging;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
 using PixiEditor.AvaloniaUI.Models.Handlers.Tools;
 using PixiEditor.AvaloniaUI.Models.Input;

src/PixiEditor.AvaloniaUI/ViewModels/Tools/Tools/RectangleToolViewModel.cs

@@ -1,6 +1,5 @@
 using Avalonia.Input;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
-using PixiEditor.AvaloniaUI.Models.Handlers.Toolbars;
 using PixiEditor.AvaloniaUI.Models.Handlers.Tools;
 using PixiEditor.DrawingApi.Core.Numerics;
 using PixiEditor.Extensions.Common.Localization;

src/PixiEditor.AvaloniaUI/ViewModels/Tools/Tools/ZoomToolViewModel.cs

@@ -1,6 +1,5 @@
 using Avalonia.Input;
 using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Commands;
-using PixiEditor.AvaloniaUI.Models.Handlers;
 using PixiEditor.AvaloniaUI.Views.Overlays.BrushShapeOverlay;
 using PixiEditor.Extensions.Common.Localization;
 

src/PixiEditor.AvaloniaUI/ViewModels/ViewModelBase.cs

@@ -1,6 +1,4 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace PixiEditor.AvaloniaUI.ViewModels;
+namespace PixiEditor.AvaloniaUI.ViewModels;
 
 public class ViewModelBase : PixiObservableObject
 {

src/PixiEditor.AvaloniaUI/Views/Dialogs/AboutPopup.axaml.cs

@@ -1,7 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using PixiEditor.AvaloniaUI.Helpers;
+using PixiEditor.AvaloniaUI.Helpers;
 using PixiEditor.Extensions.Common.Localization;
 
 namespace PixiEditor.AvaloniaUI.Views.Dialogs;

src/PixiEditor.AvaloniaUI/Views/Dialogs/ConfirmationPopup.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using CommunityToolkit.Mvvm.Input;
 using PixiEditor.Extensions.Common.Localization;
 

src/PixiEditor.AvaloniaUI/Views/Dialogs/DialogTitleBar.axaml.cs

@@ -1,9 +1,7 @@
 using System.Windows.Input;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input;
 using Avalonia.Interactivity;
-using CommunityToolkit.Mvvm.Input;
 using PixiEditor.Views;
 
 namespace PixiEditor.AvaloniaUI.Views.Dialogs;

src/PixiEditor.AvaloniaUI/Views/Dialogs/ExportFilePopup.axaml.cs

@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.Input;
 using PixiEditor.AvaloniaUI.Helpers;

src/PixiEditor.AvaloniaUI/Views/Dialogs/NewFilePopup.axaml.cs

@@ -1,7 +1,5 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
-using CommunityToolkit.Mvvm.Input;
 
 namespace PixiEditor.AvaloniaUI.Views.Dialogs;
 

src/PixiEditor.AvaloniaUI/Views/Dialogs/NoticePopup.axaml.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Controls;
 using Avalonia.Interactivity;
 
 namespace PixiEditor.AvaloniaUI.Views.Dialogs;

src/PixiEditor.AvaloniaUI/Views/Dialogs/OptionPopup.axaml.cs

@@ -1,7 +1,5 @@
 using System.Collections.ObjectModel;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using CommunityToolkit.Mvvm.Input;
 
 namespace PixiEditor.AvaloniaUI.Views.Dialogs;