Cleanup

src/PixiEditor.AvaloniaUI/Helpers/IconEvaluators.cs

@@ -6,7 +6,7 @@ using PixiEditor.AvaloniaUI.Models.Commands.Attributes.Evaluators;
 using PixiEditor.AvaloniaUI.Models.Commands.Commands;
 using PixiEditor.AvaloniaUI.Models.Commands.Search;
 
-namespace PixiEditor.Helpers;
+namespace PixiEditor.AvaloniaUI.Helpers;
 
 internal static class IconEvaluators
 {

src/PixiEditor.AvaloniaUI/Styles/PixiEditor.Layers.axaml

@@ -1,6 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:ui="clr-namespace:PixiEditor.Helpers.UI"
                     xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
                     xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters">
 

src/PixiEditor.AvaloniaUI/ViewModels/MainVM.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Avalonia.Markup.Xaml;
-using PixiEditor.ViewModels;
 
 namespace PixiEditor.AvaloniaUI.ViewModels;
 internal class MainVM : MarkupExtension

src/PixiEditor.AvaloniaUI/ViewModels/MainVmEnum.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.ViewModels;
+namespace PixiEditor.AvaloniaUI.ViewModels;
 
 enum MainVmEnum
 {

src/PixiEditor.AvaloniaUI/ViewModels/ToolVM.cs

@@ -1,8 +1,7 @@
 using System.Linq;
 using Avalonia.Markup.Xaml;
-using PixiEditor.AvaloniaUI.ViewModels;
 
-namespace PixiEditor.ViewModels;
+namespace PixiEditor.AvaloniaUI.ViewModels;
 
 internal class ToolVM : MarkupExtension
 {

src/PixiEditor.AvaloniaUI/Views/Dialogs/Debugging/Localization/LocalizationDebugWindow.axaml

@@ -10,7 +10,6 @@
                          xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
                          xmlns:main="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.SubViewModels"
                          xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
-                         xmlns:globalization="clr-namespace:System.Globalization;assembly=System.Runtime"
                          xmlns:localization1="clr-namespace:PixiEditor.AvaloniaUI.Views.Dialogs.Debugging.Localization"
                          mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                          Width="600"
@@ -38,10 +37,9 @@
                 <ColumnDefinition />
                 <ColumnDefinition Width="120" />
             </Grid.ColumnDefinitions>
-            <TextBlock ui:Translator.Key="API_KEY" Margin="0,0,5,0"></TextBlock>
+            <TextBlock ui:Translator.Key="API_KEY" Margin="0,0,5,0" />
             <TextBox Grid.Column="1" TextChanged="ApiKeyChanged"
-                     Text="{Binding ApiKey}">
-            </TextBox>
+                     Text="{Binding ApiKey}" />
             <Button Margin="5,0,0,0" Grid.Column="2"
                     ui:Translator.Key="LOG_IN"
                     Command="{Binding LoadApiKeyCommand}" />
@@ -99,8 +97,7 @@
                     <TextBlock ui:Translator.Key="SELECT_A_LANGUAGE"
                                IsVisible="{Binding SelectedItem, ElementName=LanguageComboBox, Converter={converters:NullToVisibilityConverter}}"
                                Margin="5,0,0,0" VerticalAlignment="Center"
-                               IsHitTestVisible="False">
-                    </TextBlock>
+                               IsHitTestVisible="False" />
                 </Grid>
             </Grid>
             <Border Padding="5"

src/PixiEditor.AvaloniaUI/Views/Dialogs/ResizeCanvasPopup.axaml

@@ -5,7 +5,6 @@
                          xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                          xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                          xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-                         xmlns:windows="clr-namespace:PixiEditor.AvaloniaUI.Views.Windows"
                          xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input"
                          xmlns:dialogs="clr-namespace:PixiEditor.AvaloniaUI.Views.Dialogs"
                          mc:Ignorable="d"

src/PixiEditor.AvaloniaUI/Views/Dock/DocumentTemplate.axaml

@@ -2,13 +2,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:userControls="clr-namespace:PixiEditor.Views.UserControls"
-             xmlns:viewModels="clr-namespace:PixiEditor.ViewModels"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
-             xmlns:document="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Document"
              xmlns:viewModels1="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
-             xmlns:subViewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.SubViewModels"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:palettes1="clr-namespace:PixiEditor.AvaloniaUI.Views.Palettes"
              xmlns:viewportControls="clr-namespace:PixiEditor.AvaloniaUI.Views.Main.ViewportControls"

src/PixiEditor.AvaloniaUI/Views/Input/AnchorPointPicker.axaml

@@ -4,7 +4,6 @@
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                      xmlns:views="clr-namespace:PixiEditor.Views"
                       xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
                       xmlns:controls="https://github.com/avaloniaui"
                       xmlns:enums="clr-namespace:PixiEditor.ChangeableDocument.Enums;assembly=PixiEditor.ChangeableDocument"

src/PixiEditor.AvaloniaUI/Views/Input/SizeInput.axaml

@@ -4,7 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:views="clr-namespace:PixiEditor.Views"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:behaviours="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Behaviours"

src/PixiEditor.AvaloniaUI/Views/Input/SizePicker.axaml

@@ -4,11 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:local="clr-namespace:PixiEditor.Views"
-             xmlns:enums="clr-namespace:PixiEditor.Models.Enums"
-             xmlns:userControls="clr-namespace:PixiEditor.Views.UserControls"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input"
              xmlns:converters1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              mc:Ignorable="d" Background="Transparent"

src/PixiEditor.AvaloniaUI/Views/Layers/FolderControl.axaml

@@ -4,7 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:behaviours="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Behaviours"
@@ -39,7 +38,7 @@
                 <RowDefinition Height="10"/>
             </Grid.RowDefinitions>
             <Grid DragDrop.AllowDrop="True" helpers:DragDropEvents.DragEnter="Grid_DragEnter" helpers:DragDropEvents.Drop="Grid_Drop_Top" helpers:DragDropEvents.DragLeave="Grid_DragLeave" Grid.Row="0" Grid.ColumnSpan="3" Background="Transparent" Panel.ZIndex="3"/>
-            <Grid IsVisible="True" x:Name="middleDropGrid" Grid.Row="1" DragDrop.AllowDrop="True" Panel.ZIndex="2" Background="Transparent" helpers:DragDropEvents.DragEnter="Grid_CenterEnter" helpers:DragDropEvents.Drop="Grid_Drop_Center" helpers:DragDropEvents.DragLeave="Grid_CenterLeave"></Grid>
+            <Grid IsVisible="True" x:Name="middleDropGrid" Grid.Row="1" DragDrop.AllowDrop="True" Panel.ZIndex="2" Background="Transparent" helpers:DragDropEvents.DragEnter="Grid_CenterEnter" helpers:DragDropEvents.Drop="Grid_Drop_Center" helpers:DragDropEvents.DragLeave="Grid_CenterLeave" />
             <Grid x:Name="centerGrid" Grid.Row="0" Grid.RowSpan="3" Background="Transparent">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="24"/>

src/PixiEditor.AvaloniaUI/Views/Layers/LayerControl.axaml

@@ -4,8 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:PixiEditor.Views.UserControls"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:helpers="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"

src/PixiEditor.AvaloniaUI/Views/Layers/LayersManager.axaml

@@ -4,19 +4,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:vws="clr-namespace:PixiEditor.Views" 
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
-             xmlns:userControls="clr-namespace:PixiEditor.Views.UserControls"
              xmlns:uiExt="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:converters1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:layers="clr-namespace:PixiEditor.AvaloniaUI.Views.Layers"
              xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
              xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input"
              xmlns:behaviours="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Behaviours"
-             xmlns:ui="clr-namespace:PixiEditor.Helpers.UI"
              xmlns:docVm="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Document"
              xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
+             xmlns:panels="clr-namespace:PixiEditor.AvaloniaUI.Views.Panels"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="250" x:Name="layersManager">
     <UserControl.Resources>
@@ -102,8 +99,7 @@
                     DockPanel.Dock="Left"
                     Margin="0,0,5,0"
                     Width="80"
-                    SelectedBlendMode="{Binding DataContext.ActiveDocument.SelectedStructureMember.BlendModeBindable, Mode=TwoWay, ElementName=layersManager}">
-                </input:BlendModeComboBox>
+                    SelectedBlendMode="{Binding DataContext.ActiveDocument.SelectedStructureMember.BlendModeBindable, Mode=TwoWay, ElementName=layersManager}" />
                 <input:NumberInput
                     Min="0" Max="100"
                     x:Name="numberInput"
@@ -150,7 +146,7 @@
                       ItemsSource="{Binding DataContext.ActiveDocument.StructureRoot.Children, ElementName=layersManager}">
                 <TreeView.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <ui:ReversedOrderStackPanel />
+                        <panels:ReversedOrderStackPanel />
                     </ItemsPanelTemplate>
                 </TreeView.ItemsPanel>
                 <TreeView.Resources>
@@ -175,7 +171,7 @@
                     </DataTemplate>
                 </TreeView.DataTemplates>
             </TreeView>
-            <Border Name="dropBorder" ui1:DragDropEvents.DragEnter="Grid_DragEnter" ui1:DragDropEvents.DragLeave="Grid_DragLeave" DragDrop.AllowDrop="True" ui1:DragDropEvents.Drop="Grid_Drop" Background="Transparent" BorderThickness="0, 5, 0, 0"></Border>
+            <Border Name="dropBorder" ui1:DragDropEvents.DragEnter="Grid_DragEnter" ui1:DragDropEvents.DragLeave="Grid_DragLeave" DragDrop.AllowDrop="True" ui1:DragDropEvents.Drop="Grid_Drop" Background="Transparent" BorderThickness="0, 5, 0, 0" />
         </DockPanel>
     </Grid>
 </UserControl>

src/PixiEditor.AvaloniaUI/Views/Layers/ReferenceLayer.axaml

@@ -8,7 +8,6 @@
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:behaviours="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Behaviours"
              xmlns:cmds="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
-             xmlns:decorators="clr-namespace:PixiEditor.AvaloniaUI.Views.Decorators"
              xmlns:controls="clr-namespace:PixiEditor.UI.Common.Controls;assembly=PixiEditor.UI.Common"
              mc:Ignorable="d"
              d:DesignHeight="60" d:DesignWidth="350" VerticalAlignment="Center" x:Name="uc">

src/PixiEditor.AvaloniaUI/Views/Main/MainTitleBar.axaml

@@ -8,8 +8,6 @@
              xmlns:viewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
              xmlns:dialogs="clr-namespace:PixiEditor.AvaloniaUI.Views.Dialogs"
              xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input;assembly=PixiEditor.UI.Common"
-             xmlns:avaloniaUi="clr-namespace:PixiEditor.AvaloniaUI"
-             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="PixiEditor.AvaloniaUI.Views.Main.MainTitleBar">
     <Grid>

src/PixiEditor.AvaloniaUI/Views/Main/Navigation.axaml

@@ -5,7 +5,6 @@
              xmlns:viewportControls="clr-namespace:PixiEditor.AvaloniaUI.Views.Main.ViewportControls"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input"
-             xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              Name="uc"

src/PixiEditor.AvaloniaUI/Views/Main/Tools/ToolPickerButton.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:handlers="clr-namespace:PixiEditor.AvaloniaUI.Models.Handlers"
              xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"

src/PixiEditor.AvaloniaUI/Views/Main/Tools/ToolsPicker.axaml

@@ -3,13 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:tools="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Tools"
-             xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-             xmlns:handlers="clr-namespace:PixiEditor.AvaloniaUI.Models.Handlers"
-             xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
-             xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
              xmlns:tools1="clr-namespace:PixiEditor.AvaloniaUI.Views.Main.Tools"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="PixiEditor.AvaloniaUI.Views.Main.ToolsPicker" Name="picker">
+             x:Class="PixiEditor.AvaloniaUI.Views.Main.Tools.ToolsPicker" Name="picker">
     <Border CornerRadius="{DynamicResource ControlCornerRadius}"
             BorderBrush="{DynamicResource ThemeBorderMidBrush}"
             BorderThickness="{DynamicResource ThemeBorderThickness}"

src/PixiEditor.AvaloniaUI/Views/Main/Tools/ToolsPicker.axaml.cs

@@ -3,7 +3,7 @@ using Avalonia;
 using Avalonia.Controls;
 using PixiEditor.AvaloniaUI.Models.Handlers;
 
-namespace PixiEditor.AvaloniaUI.Views.Main;
+namespace PixiEditor.AvaloniaUI.Views.Main.Tools;
 
 internal partial class ToolsPicker : UserControl
 {

src/PixiEditor.AvaloniaUI/Views/Main/ViewportControls/FixedViewport.axaml

@@ -4,7 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:local="clr-namespace:PixiEditor.Views.UserControls"
              xmlns:converters1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              xmlns:ui="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
              mc:Ignorable="d"

src/PixiEditor.AvaloniaUI/Views/Main/ViewportControls/Viewport.axaml

@@ -5,27 +5,21 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:local="clr-namespace:PixiEditor.Views.UserControls"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-    xmlns:uc="clr-namespace:PixiEditor.Views.UserControls"
-    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-    xmlns:views="clr-namespace:PixiEditor.Views"
     xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
     xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
     xmlns:zoombox="clr-namespace:PixiEditor.Zoombox;assembly=PixiEditor.Zoombox"
-    xmlns:subviews="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Document"
     xmlns:brushShapeOverlay="clr-namespace:PixiEditor.AvaloniaUI.Views.Overlays.BrushShapeOverlay"
     xmlns:viewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
     xmlns:symmetryOverlay="clr-namespace:PixiEditor.AvaloniaUI.Views.Overlays.SymmetryOverlay"
-    xmlns:overlays="clr-namespace:PixiEditor.Views.UserControls.Overlays"
     xmlns:lineToolOverlay="clr-namespace:PixiEditor.AvaloniaUI.Views.Overlays.LineToolOverlay"
     xmlns:transformOverlay="clr-namespace:PixiEditor.AvaloniaUI.Views.Overlays.TransformOverlay"
-    xmlns:main="clr-namespace:PixiEditor.AvaloniaUI.Views.Main"
-    xmlns:viewModels1="clr-namespace:PixiEditor.ViewModels"
     xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
     xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
     xmlns:visuals="clr-namespace:PixiEditor.AvaloniaUI.Views.Visuals"
     xmlns:viewportControls="clr-namespace:PixiEditor.AvaloniaUI.Views.Main.ViewportControls"
+    xmlns:overlays="clr-namespace:PixiEditor.AvaloniaUI.Views.Overlays"
+    xmlns:selectionOverlay="clr-namespace:PixiEditor.AvaloniaUI.Views.Overlays.SelectionOverlay"
     mc:Ignorable="d"
     x:Name="vpUc"
     d:DesignHeight="450"
@@ -52,9 +46,9 @@
                                         PassEventArgsToCommand="True"/>
             </EventTriggerBehavior>-->
         </Interaction.Behaviors>
-        <views:TogglableFlyout Margin="5" IconPath="/Images/Settings.png" ui:Translator.TooltipKey="VIEWPORT_SETTINGS"
+        <overlays:TogglableFlyout Margin="5" IconPath="/Images/Settings.png" ui:Translator.TooltipKey="VIEWPORT_SETTINGS"
                                ZIndex="2" HorizontalAlignment="Right" VerticalAlignment="Top">
-            <views:TogglableFlyout.Child>
+            <overlays:TogglableFlyout.Child>
                 <Border BorderThickness="1" CornerRadius="5" Padding="5" Background="#C8202020" ZIndex="2">
         <StackPanel Orientation="Vertical">
             <StackPanel Orientation="Horizontal">
@@ -119,8 +113,8 @@
             </StackPanel>
         </StackPanel>
         </Border>
-            </views:TogglableFlyout.Child>
-        </views:TogglableFlyout>
+            </overlays:TogglableFlyout.Child>
+        </overlays:TogglableFlyout>
         <zoombox:Zoombox
             Tag="{Binding ElementName=vpUc}"
             x:Name="zoombox"
@@ -283,7 +277,7 @@
                             DragEndCommand="{xaml:Command PixiEditor.Document.EndDragSymmetry, UseProvided=True}"
                             DragStartCommand="{xaml:Command PixiEditor.Document.StartDragSymmetry, UseProvided=True}"
                             FlowDirection="LeftToRight" />
-                        <overlays:SelectionOverlay
+                        <selectionOverlay:SelectionOverlay
                             Focusable="False"
                             ShowFill="{Binding ToolsSubViewModel.ActiveTool, Source={viewModels:MainVM}, Converter={converters:IsSelectionToolConverter}}"
                             Path="{Binding Document.SelectionPathBindable}"

src/PixiEditor.AvaloniaUI/Views/MainView.axaml

@@ -4,13 +4,6 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModels1="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
              xmlns:main1="clr-namespace:PixiEditor.AvaloniaUI.Views.Main"
-             xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-             xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
-             xmlns:userControls="clr-namespace:PixiEditor.Views.UserControls"
-             xmlns:viewModels="clr-namespace:PixiEditor.ViewModels"
-             xmlns:dock="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Dock"
-             xmlns:zoombox="clr-namespace:PixiEditor.Zoombox;assembly=PixiEditor.Zoombox"
-             xmlns:layers="clr-namespace:PixiEditor.AvaloniaUI.Views.Layers"
              xmlns:tools="clr-namespace:PixiEditor.AvaloniaUI.Views.Main.Tools"
              xmlns:commandSearch="clr-namespace:PixiEditor.AvaloniaUI.Views.Main.CommandSearch"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -31,7 +24,7 @@
                 </Grid.RowDefinitions>
 
                 <tools:Toolbar Grid.Row="0" DataContext="{Binding .}" />
-                <main1:ToolsPicker ZIndex="2" Grid.Row="1"
+                <tools:ToolsPicker ZIndex="2" Grid.Row="1"
                                    Margin="10 0 0 0"
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="Center"

src/PixiEditor.AvaloniaUI/Views/NewsFeed/NewsItem.axaml

@@ -4,8 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-             xmlns:gl="clr-namespace:System.Globalization;assembly=System.Runtime"
              xmlns:ui="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
              xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"

src/PixiEditor.AvaloniaUI/Views/Overlays/LineToolOverlay/LineToolOverlayAnchor.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Views.UserControls.Overlays.LineToolOverlay;
+namespace PixiEditor.AvaloniaUI.Views.Overlays.LineToolOverlay;
 internal enum LineToolOverlayAnchor
 {
     Start,

src/PixiEditor.AvaloniaUI/Views/Overlays/SelectionOverlay/SelectionOverlay.cs

@@ -7,7 +7,7 @@ using Avalonia.Styling;
 using PixiEditor.AvaloniaUI.Animation;
 using PixiEditor.DrawingApi.Core.Surface.Vector;
 
-namespace PixiEditor.Views.UserControls.Overlays;
+namespace PixiEditor.AvaloniaUI.Views.Overlays.SelectionOverlay;
 #nullable enable
 internal class SelectionOverlay : Control
 {
@@ -63,7 +63,7 @@ internal class SelectionOverlay : Control
     {
         IsHitTestVisible = false;
 
-        Animation animation = new Animation()
+        Avalonia.Animation.Animation animation = new Avalonia.Animation.Animation()
         {
             Duration = new TimeSpan(0, 0, 0, 2, 0),
             IterationCount = IterationCount.Infinite,

src/PixiEditor.AvaloniaUI/Views/Overlays/TogglableFlyout.axaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="PixiEditor.Views.TogglableFlyout"
+<UserControl x:Class="PixiEditor.AvaloniaUI.Views.Overlays.TogglableFlyout"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/PixiEditor.AvaloniaUI/Views/Overlays/TogglableFlyout.axaml.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 
-namespace PixiEditor.Views;
+namespace PixiEditor.AvaloniaUI.Views.Overlays;
 
 public partial class TogglableFlyout : UserControl
 {

src/PixiEditor.AvaloniaUI/Views/Palettes/ColorReplacer.axaml

@@ -4,7 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:behaviours="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Behaviours"
-             xmlns:markupExtensions="clr-namespace:PixiEditor.AvaloniaUI.Helpers.MarkupExtensions"
              xmlns:colorPicker="clr-namespace:ColorPicker;assembly=ColorPicker.AvaloniaUI"
              xmlns:palettes="clr-namespace:PixiEditor.AvaloniaUI.Views.Palettes"
              xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"

src/PixiEditor.AvaloniaUI/Views/Palettes/PaletteItem.axaml

@@ -5,8 +5,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:views="clr-namespace:PixiEditor.Views"
-             xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
+    xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input"
              xmlns:decorators="clr-namespace:PixiEditor.AvaloniaUI.Views.Decorators"
              mc:Ignorable="d"
@@ -42,8 +41,7 @@
                                    ui:Translator.Key="{Binding ElementName=paletteItem, Path=Palette.Source.Name.Key}"
                                    DockPanel.Dock="Right" HorizontalAlignment="Right"/>
             </DockPanel>
-            <TextBlock Margin="0 5 0 0">
-            </TextBlock>
+            <TextBlock Margin="0 5 0 0" />
         </StackPanel>
         <ItemsControl Margin="0 -20 0 10" Grid.Row="1" Grid.Column="0" ItemsSource="{Binding ElementName=paletteItem, Path=Palette.Colors}">
             <ItemsControl.ItemsPanel>

src/PixiEditor.AvaloniaUI/Views/Palettes/PaletteViewer.axaml

@@ -3,11 +3,8 @@
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:PixiEditor.Views.UserControls"
-             xmlns:views="clr-namespace:PixiEditor.Views"
              xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
              xmlns:palettes="clr-namespace:PixiEditor.AvaloniaUI.Views.Palettes"
-             xmlns:decorators="clr-namespace:PixiEditor.AvaloniaUI.Views.Decorators"
              xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
              xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
              d:DesignHeight="450" d:DesignWidth="300" Name="paletteControl">

src/PixiEditor.AvaloniaUI/Views/Palettes/SwatchesView.axaml

@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:system="clr-namespace:System;assembly=System.Runtime"
              xmlns:palettes="clr-namespace:PixiEditor.AvaloniaUI.Views.Palettes"
              xmlns:xaml="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.XAML"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

src/PixiEditor.AvaloniaUI/Views/Panels/ReversedOrderStackPanel.cs

@@ -2,7 +2,7 @@
 using Avalonia;
 using Avalonia.Controls;
 
-namespace PixiEditor.Helpers.UI;
+namespace PixiEditor.AvaloniaUI.Views.Panels;
 
 internal class ReversedOrderStackPanel : StackPanel
 {

src/PixiEditor.AvaloniaUI/Views/Shortcuts/ImportShortcutTemplatePopup.axaml

@@ -4,7 +4,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-    xmlns:markupExtensions="clr-namespace:PixiEditor.AvaloniaUI.Helpers.MarkupExtensions"
     xmlns:dialogs="clr-namespace:PixiEditor.AvaloniaUI.Views.Dialogs"
     xmlns:viewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
     xmlns:shortcuts="clr-namespace:PixiEditor.AvaloniaUI.Views.Shortcuts"

src/PixiEditor.AvaloniaUI/Views/Windows/HelloTherePopup.axaml

@@ -4,12 +4,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:models="clr-namespace:PixiEditor.Models"
-        xmlns:views="clr-namespace:PixiEditor.Views"
         xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-        xmlns:gif="http://wpfanimatedgif.codeplex.com"
         xmlns:system="clr-namespace:System;assembly=System.Runtime"
-        xmlns:markupExtensions="clr-namespace:PixiEditor.AvaloniaUI.Helpers.MarkupExtensions"
         xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
         xmlns:dataHolders="clr-namespace:PixiEditor.AvaloniaUI.Models.UserData"
         xmlns:panels="clr-namespace:PixiEditor.AvaloniaUI.Views.Panels"

src/PixiEditor.AvaloniaUI/Views/Windows/PalettesBrowser.axaml

@@ -6,9 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-    xmlns:markupExtensions="clr-namespace:PixiEditor.AvaloniaUI.Helpers.MarkupExtensions"
     xmlns:dialogs="clr-namespace:PixiEditor.AvaloniaUI.Views.Dialogs"
-    xmlns:viewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
     xmlns:input="clr-namespace:PixiEditor.AvaloniaUI.Views.Input"
     xmlns:behaviours="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Behaviours"
     xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"

src/PixiEditor.AvaloniaUI/Views/Windows/Settings/DiscordRichPresencePreview.axaml

@@ -25,7 +25,7 @@
                                 <Border Height="30" Width="30" Background="#FF43B581" CornerRadius="90" BorderThickness="6" BorderBrush="#292b2f">
                                     <Border.RenderTransform>
                                         <TransformGroup>
-                                            <TranslateTransform X="27" Y="27"></TranslateTransform>
+                                            <TranslateTransform X="27" Y="27" />
                                         </TransformGroup>
                                     </Border.RenderTransform>
                                 </Border>
@@ -52,7 +52,7 @@
                         <Grid Margin="0,5">
                             <StackPanel Orientation="Vertical">
                                 <TextBlock FontWeight="Bold" Foreground="White" Margin="0,0,0,10" Text="DISCORD MEMBER SINCE"/>
-                                <TextBlock Foreground="White" Text="Oct 29, 2020"></TextBlock>
+                                <TextBlock Foreground="White" Text="Oct 29, 2020" />
                             </StackPanel>
                         </Grid>
                         <Grid IsVisible="{Binding #uc.IsPlaying}" Margin="0,5, 0, 0">

src/PixiEditor.AvaloniaUI/Views/Windows/Settings/ShortcutsBinder.axaml

@@ -3,10 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="clr-namespace:PixiEditor.AvaloniaUI.Helpers.Converters"
     xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
-    xmlns:commands="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands"
-    xmlns:commands1="clr-namespace:PixiEditor.AvaloniaUI.Models.Commands.Commands"
     xmlns:viewModels="clr-namespace:PixiEditor.AvaloniaUI.ViewModels"
     xmlns:shortcuts="clr-namespace:PixiEditor.AvaloniaUI.Views.Shortcuts"
     mc:Ignorable="d"