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
@@ -20,17 +20,17 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
            set => SetAndNotify(ref _y, value);
        }

+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
        protected virtual void Dispose(bool disposing)
        {
            if (disposing)
            {
            }
        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
    }
 }
@@ -5,8 +5,6 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             xmlns:visualization1="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
             mc:Ignorable="d"
             d:DesignHeight="450"
@@ -2,16 +2,16 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using Artemis.Core.Models.Surface;
+using Artemis.Core;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
    public class ProfileDeviceViewModel : CanvasViewModel
    {
-        private ObservableCollection<ProfileLedViewModel> _leds;
-        private ArtemisDevice _device;
        private bool _addedLeds;
+        private ArtemisDevice _device;
+        private ObservableCollection<ProfileLedViewModel> _leds;

        public ProfileDeviceViewModel(ArtemisDevice device)
        {
@@ -3,8 +3,6 @@
             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.Screens.ProfileEditor.Visualization"
-             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
             mc:Ignorable="d"
             d:DesignHeight="450"
@@ -31,26 +29,6 @@
                </DataTrigger>
            </Style.Triggers>
        </Style>
-        <Style TargetType="{x:Type Path}" x:Key="SelectedLayerStyle">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding IsSelected}" Value="False">
-                    <DataTrigger.EnterActions>
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <ColorAnimation Storyboard.TargetProperty="(Path.Stroke).(SolidColorBrush.Color)" To="#A7A7A7" Duration="0:0:0.5" />
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </DataTrigger.EnterActions>
-                    <DataTrigger.ExitActions>
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <ColorAnimation Storyboard.TargetProperty="(Path.Stroke).(SolidColorBrush.Color)" To="#00A7A7A7" Duration="0:0:0.5" />
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </DataTrigger.ExitActions>
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
    </UserControl.Resources>
    <Canvas>
        <Path Data="{Binding ShapeGeometry, Mode=OneWay}" StrokeThickness="{Binding StrokeThickness}" Style="{StaticResource SelectedShapeStyle}">
@@ -3,12 +3,10 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.LayerShapes;
-using Artemis.Core.Models.Surface;
+using Artemis.Core;
 using Artemis.UI.Extensions;
 using Artemis.UI.Services.Interfaces;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization
@@ -133,10 +131,10 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
                var shapeGeometry = Geometry.Empty;
                switch (Layer.LayerShape)
                {
-                    case Ellipse _:
+                    case EllipseShape _:
                        shapeGeometry = new EllipseGeometry(bounds);
                        break;
-                    case Rectangle _:
+                    case RectangleShape _:
                        shapeGeometry = new RectangleGeometry(bounds);
                        break;
                }
@@ -4,7 +4,6 @@
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
             xmlns:visualization1="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
             mc:Ignorable="d"
             d:DataContext="{d:DesignInstance {x:Type visualization1:ProfileLedViewModel}}"
@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Media;
-using Artemis.Core.Models.Surface;
+using Artemis.Core;
 using Artemis.UI.Extensions;
 using RGB.NET.Core;
 using Stylet;
@@ -11,11 +11,11 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
 {
    public class ProfileLedViewModel : PropertyChangedBase
    {
-        private bool _isSelected;
-        private bool _isDimmed;
-        private Geometry _displayGeometry;
-        private Geometry _strokeGeometry;
        private Color _displayColor;
+        private Geometry _displayGeometry;
+        private bool _isDimmed;
+        private bool _isSelected;
+        private Geometry _strokeGeometry;

        public ProfileLedViewModel(ArtemisLed led)
        {
@@ -5,10 +5,8 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
-             xmlns:utilities="clr-namespace:Artemis.UI.Shared.Utilities;assembly=Artemis.UI.Shared"
-             xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared"
             xmlns:visualization="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization"
+             xmlns:shared="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
             mc:Ignorable="d"
             d:DesignHeight="510.9" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance {x:Type visualization:ProfileViewModel}}">
@@ -77,9 +75,9 @@
              MouseDown="{s:Action CanvasMouseDown}"
              MouseMove="{s:Action CanvasMouseMove}"
              Cursor="{Binding ActiveToolViewModel.Cursor}"
-              utilities:SizeObserver.Observe="True"
-              utilities:SizeObserver.ObservedWidth="{Binding PanZoomViewModel.CanvasWidth, Mode=OneWayToSource}"
-              utilities:SizeObserver.ObservedHeight="{Binding PanZoomViewModel.CanvasHeight, Mode=OneWayToSource}">
+              shared:SizeObserver.Observe="True"
+              shared:SizeObserver.ObservedWidth="{Binding PanZoomViewModel.CanvasWidth, Mode=OneWayToSource}"
+              shared:SizeObserver.ObservedHeight="{Binding PanZoomViewModel.CanvasHeight, Mode=OneWayToSource}">

            <Grid.Background>
                <VisualBrush TileMode="Tile" Stretch="Uniform" Viewport="{Binding PanZoomViewModel.BackgroundViewport}" ViewportUnits="Absolute">
@@ -123,9 +121,9 @@
                    </ItemsControl.ItemContainerStyle>
                    <ItemsControl.ItemTemplate>
                        <DataTemplate>
-                            <controls:DeviceVisualizer Device="{Binding}"
-                                                       ShowColors="True"
-                                                       HighlightedLeds="{Binding DataContext.HighlightedLeds, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Mode=OneWay}" />
+                            <shared:DeviceVisualizer Device="{Binding}"
+                                                     ShowColors="True"
+                                                     HighlightedLeds="{Binding DataContext.HighlightedLeds, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Mode=OneWay}" />
                        </DataTemplate>
                    </ItemsControl.ItemTemplate>
                </ItemsControl>
@@ -3,18 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using Artemis.Core.Events;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Settings;
+using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.Core.Services.Storage.Interfaces;
 using Artemis.UI.Events;
 using Artemis.UI.Extensions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.Visualization.Tools;
 using Artemis.UI.Screens.Shared;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization
@@ -211,6 +207,11 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
            base.OnClose();
        }

+        protected override void OnActivate()
+        {
+            ApplyActiveProfile();
+        }
+
        private void OnActiveSurfaceConfigurationSelected(object sender, SurfaceConfigurationEventArgs e)
        {
            ApplySurfaceConfiguration(e.Surface);
@@ -237,11 +238,6 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization
            }
        }

-        protected override void OnActivate()
-        {
-            ApplyActiveProfile();
-        }
-
        private void ApplySurfaceConfiguration(ArtemisSurface surface)
        {
            Devices.Clear();
@@ -3,8 +3,6 @@
             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.Screens.ProfileEditor.Visualization.Tools"
-             xmlns:userControls="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.UserControls"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:tools="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.Tools"
             xmlns:userControls1="clr-namespace:Artemis.UI.Screens.ProfileEditor.Visualization.UserControls"
@@ -14,17 +12,17 @@
             d:DataContext="{d:DesignInstance {x:Type tools:EditToolViewModel}}">
    <Canvas UseLayoutRounding="False">
        <userControls1:LayerShapeControl Zoom="{Binding ProfileViewModel.PanZoomViewModel.Zoom}"
-                                        ShapePath="{Binding ShapePath}"
-                                        ShapeAnchor="{Binding ShapeAnchor}"
-                                        ShapeGeometry="{Binding ShapeGeometry}"
-                                        RotateMouseDown="{s:Action RotateMouseDown}"
-                                        RotateMouseUp="{s:Action RotateMouseUp}"
-                                        RotateMouseMove="{s:Action RotateMouseMove}"
-                                        ResizeMouseDown="{s:Action ResizeMouseDown}"
-                                        ResizeMouseUp="{s:Action ResizeMouseUp}"
-                                        ResizeMouseMove="{s:Action ResizeMouseMove}"
-                                        MoveMouseDown="{s:Action MoveMouseDown}"
-                                        MoveMouseUp="{s:Action MoveMouseUp}"
-                                        MoveMouseMove="{s:Action MoveMouseMove}" />
+                                         ShapePath="{Binding ShapePath}"
+                                         ShapeAnchor="{Binding ShapeAnchor}"
+                                         ShapeGeometry="{Binding ShapeGeometry}"
+                                         RotateMouseDown="{s:Action RotateMouseDown}"
+                                         RotateMouseUp="{s:Action RotateMouseUp}"
+                                         RotateMouseMove="{s:Action RotateMouseMove}"
+                                         ResizeMouseDown="{s:Action ResizeMouseDown}"
+                                         ResizeMouseUp="{s:Action ResizeMouseUp}"
+                                         ResizeMouseMove="{s:Action ResizeMouseMove}"
+                                         MoveMouseDown="{s:Action MoveMouseDown}"
+                                         MoveMouseUp="{s:Action MoveMouseUp}"
+                                         MoveMouseMove="{s:Action MoveMouseMove}" />
    </Canvas>
 </UserControl>
@@ -2,10 +2,10 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using Artemis.Core.Models.Profile;
+using Artemis.Core;
 using Artemis.UI.Events;
 using Artemis.UI.Services.Interfaces;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using SkiaSharp;
 using SkiaSharp.Views.WPF;
 using Stylet;
@@ -17,10 +17,10 @@ namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
        private readonly ILayerEditorService _layerEditorService;
        private SKPoint _dragOffset;
        private SKPoint _dragStart;
-        private SKPoint _topLeft;
-        private SKPath _shapePath;
        private SKPoint _shapeAnchor;
        private RectangleGeometry _shapeGeometry;
+        private SKPath _shapePath;
+        private SKPoint _topLeft;

        public EditToolViewModel(ProfileViewModel profileViewModel, IProfileEditorService profileEditorService, ILayerEditorService layerEditorService)
            : base(profileViewModel, profileEditorService)
@@ -2,9 +2,9 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using Artemis.Core.Models.Profile;
+using Artemis.Core;
 using Artemis.UI.Properties;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
@@ -2,10 +2,10 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Services.Interfaces;
+using Artemis.Core;
+using Artemis.Core.Services;
 using Artemis.UI.Properties;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
@@ -3,7 +3,6 @@
             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.Screens.ProfileEditor.Visualization.Tools"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800">
    <Grid />
@@ -1,5 +1,5 @@
 using System.Windows.Input;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {
@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 using System.Windows.Input;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.Screens.ProfileEditor.Visualization.Tools
 {