Core - Flattened namespaces

Shared UI - Flattened namespaces Shared UI - General housekeeping Project - Code cleanup
2026-11-12 11:56:30 +00:00 · 2020-09-01 00:14:08 +02:00
1 parent aa06d8c43e
commit 29d4db55db
@@ -6,7 +6,7 @@
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:dataTemplateSelectors="clr-namespace:Artemis.UI.DataTemplateSelectors"
-             xmlns:layerBrush="clr-namespace:Artemis.Core.Plugins.LayerBrushes;assembly=Artemis.Core"
+             xmlns:layerBrush="clr-namespace:Artemis.Core.LayerBrushes;assembly=Artemis.Core"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance {x:Type propertyInput:BrushPropertyInputViewModel}}">
@@ -1,19 +1,17 @@
 using System.Collections.Generic;
 using System.Linq;
-using Artemis.Core.Events;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Plugins.LayerBrushes;
-using Artemis.Core.Services.Interfaces;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.Core.LayerBrushes;
+using Artemis.Core.Services;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.PropertyInput
 {
    public class BrushPropertyInputViewModel : PropertyInputViewModel<LayerBrushReference>
    {
-        private readonly IRenderElementService _renderElementService;
        private readonly IPluginService _pluginService;
+        private readonly IRenderElementService _renderElementService;
        private List<LayerBrushDescriptor> _descriptors;

        public BrushPropertyInputViewModel(LayerProperty<LayerBrushReference> layerProperty, IProfileEditorService profileEditorService,
@@ -3,20 +3,20 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:s="https://github.com/canton7/Stylet"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
             mc:Ignorable="d"
             d:DesignHeight="25" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance propertyInput:ColorGradientPropertyInputViewModel}">
    <StackPanel Orientation="Horizontal">
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputPrefix}" />
-        <controls:GradientPicker Width="132"
-                                 Margin="0 2"
-                                 Padding="0 -1"
-                                 ColorGradient="{Binding InputValue}"
-                                 DialogClosed="{s:Action DialogClosed}"
-                                 DialogHost="PropertyTreeDialogHost" />
+        <shared:GradientPicker Width="132"
+                               Margin="0 2"
+                               Padding="0 -1"
+                               ColorGradient="{Binding InputValue}"
+                               DialogClosed="{s:Action DialogClosed}"
+                               DialogHost="PropertyTreeDialogHost" />
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputAffix}" />
    </StackPanel>
 </UserControl>
@@ -1,8 +1,7 @@
 using System;
-using Artemis.Core.Models.Profile.Colors;
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.PropertyInput
 {
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
-using Artemis.UI.Shared.Utilities;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.PropertyInput
@@ -3,10 +3,8 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             mc:Ignorable="d"
@@ -14,11 +12,11 @@
             d:DataContext="{d:DesignInstance propertyInput:FloatPropertyInputViewModel}">
    <StackPanel Orientation="Horizontal">
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputPrefix}" />
-        <controls:DraggableFloat Value="{Binding InputValue}"
-                                 materialDesign:ValidationAssist.UsePopup="True"
-                                 StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
-                                 DragStarted="{s:Action InputDragStarted}"
-                                 DragEnded="{s:Action InputDragEnded}" />
+        <shared:DraggableFloat Value="{Binding InputValue}"
+                               materialDesign:ValidationAssist.UsePopup="True"
+                               StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
+                               DragStarted="{s:Action InputDragStarted}"
+                               DragEnded="{s:Action InputDragEnded}" />
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputAffix}" />
    </StackPanel>
 </UserControl>
@@ -1,6 +1,6 @@
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using FluentValidation;
 using Stylet;

@@ -3,10 +3,8 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             mc:Ignorable="d"
@@ -14,11 +12,11 @@
             d:DataContext="{d:DesignInstance propertyInput:IntPropertyInputViewModel}">
    <StackPanel Orientation="Horizontal">
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputPrefix}" />
-        <controls:DraggableFloat Value="{Binding InputValue}"
-                                 materialDesign:ValidationAssist.UsePopup="True"
-                                 StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
-                                 DragStarted="{s:Action InputDragStarted}"
-                                 DragEnded="{s:Action InputDragEnded}" />
+        <shared:DraggableFloat Value="{Binding InputValue}"
+                               materialDesign:ValidationAssist.UsePopup="True"
+                               StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
+                               DragStarted="{s:Action InputDragStarted}"
+                               DragEnded="{s:Action InputDragEnded}" />
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputAffix}" />
    </StackPanel>
 </UserControl>
@@ -1,6 +1,6 @@
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using FluentValidation;
 using Stylet;

@@ -3,23 +3,20 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:artemis="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
             mc:Ignorable="d"
             d:DesignHeight="25" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance propertyInput:SKColorPropertyInputViewModel}">
    <UserControl.Resources>
-        <converters:SKColorToColorConverter x:Key="SKColorToColorConverter" />
+        <artemis:SKColorToColorConverter x:Key="SKColorToColorConverter" />
    </UserControl.Resources>
    <StackPanel Orientation="Horizontal">
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputPrefix}" />
-        <controls:ColorPicker Width="132"
-                              Margin="0 -2 0 3"
-                              Padding="0 -1"
-                              Color="{Binding InputValue, Converter={StaticResource SKColorToColorConverter}}" />
+        <artemis:ColorPicker Width="132"
+                             Margin="0 -2 0 3"
+                             Padding="0 -1"
+                             Color="{Binding InputValue, Converter={StaticResource SKColorToColorConverter}}" />
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputAffix}" />
    </StackPanel>
 </UserControl>
@@ -1,6 +1,6 @@
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using SkiaSharp;

 namespace Artemis.UI.PropertyInput
@@ -3,27 +3,25 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             xmlns:propertyInput="clr-namespace:Artemis.UI.PropertyInput"
             mc:Ignorable="d"
             d:DesignHeight="25" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance propertyInput:SKPointPropertyInputViewModel}">
    <StackPanel Orientation="Horizontal" KeyboardNavigation.IsTabStop="True">
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputPrefix}" />
-        <controls:DraggableFloat ToolTip="X-coordinate (horizontal)"
-                                 Value="{Binding X}"
-                                 StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
-                                 DragStarted="{s:Action InputDragStarted}"
-                                 DragEnded="{s:Action InputDragEnded}" />
+        <shared:DraggableFloat ToolTip="X-coordinate (horizontal)"
+                               Value="{Binding X}"
+                               StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
+                               DragStarted="{s:Action InputDragStarted}"
+                               DragEnded="{s:Action InputDragEnded}" />
        <TextBlock Margin="5 0" VerticalAlignment="Bottom">,</TextBlock>
-        <controls:DraggableFloat ToolTip="Y-coordinate (vertical)"
-                                 Value="{Binding Y}"
-                                 StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
-                                 DragStarted="{s:Action InputDragStarted}"
-                                 DragEnded="{s:Action InputDragEnded}" />
+        <shared:DraggableFloat ToolTip="Y-coordinate (vertical)"
+                               Value="{Binding Y}"
+                               StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
+                               DragStarted="{s:Action InputDragStarted}"
+                               DragEnded="{s:Action InputDragEnded}" />
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputAffix}" />
    </StackPanel>
 </UserControl>
@@ -1,8 +1,7 @@
 using System;
-using Artemis.Core.Extensions;
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using FluentValidation;
 using SkiaSharp;
 using Stylet;
@@ -6,23 +6,22 @@
             xmlns:local="clr-namespace:Artemis.UI.PropertyInput"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance local:SKSizePropertyInputViewModel}">
    <StackPanel Orientation="Horizontal">
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputPrefix}" />
-        <controls:DraggableFloat ToolTip="Height"
-                                 Value="{Binding Height}"
-                                 StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
-                                 DragStarted="{s:Action InputDragStarted}"
-                                 DragEnded="{s:Action InputDragEnded}" />
+        <shared:DraggableFloat ToolTip="Height"
+                               Value="{Binding Height}"
+                               StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
+                               DragStarted="{s:Action InputDragStarted}"
+                               DragEnded="{s:Action InputDragEnded}" />
        <TextBlock Margin="5 0" VerticalAlignment="Bottom">,</TextBlock>
-        <controls:DraggableFloat ToolTip="Width"
-                                 Value="{Binding Width}"
-                                 StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
-                                 DragStarted="{s:Action InputDragStarted}"
-                                 DragEnded="{s:Action InputDragEnded}" />
+        <shared:DraggableFloat ToolTip="Width"
+                               Value="{Binding Width}"
+                               StepSize="{Binding LayerProperty.PropertyDescription.InputStepSize}"
+                               DragStarted="{s:Action InputDragStarted}"
+                               DragEnded="{s:Action InputDragEnded}" />
        <TextBlock Width="10" Text="{Binding LayerProperty.PropertyDescription.InputAffix}" />
    </StackPanel>
 </UserControl>
@@ -1,12 +1,10 @@
 using System;
-using Artemis.Core.Extensions;
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.UI.Shared.PropertyInput;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using FluentValidation;
-// using PropertyChanged;
 using SkiaSharp;
-using Stylet;
+using Stylet; // using PropertyChanged;

 namespace Artemis.UI.PropertyInput
 {