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
@@ -1,6 +1,6 @@
 using System.Windows;
 using System.Windows.Media;
-using Artemis.Core.Utilities;
+using Artemis.Core;
 using Humanizer;

 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
@@ -1,9 +1,8 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Artemis.Core.Models.Profile.LayerProperties;
-using Artemis.Core.Utilities;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.Core;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
@@ -42,7 +41,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
                if (desiredPosition > TimeSpan.Zero)
                    newKeyframe.Position = desiredPosition;
            }
-            
+
            LayerPropertyKeyframe.LayerProperty.AddKeyframe(newKeyframe);
            _profileEditorService.UpdateSelectedProfileElement();
        }
@@ -100,6 +99,11 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
            set => SetAndNotify(ref _timestamp, value);
        }

+        public void Dispose()
+        {
+            BaseLayerPropertyKeyframe.PropertyChanged -= BaseLayerPropertyKeyframeOnPropertyChanged;
+        }
+
        public void Update(int pixelsPerSecond)
        {
            _pixelsPerSecond = pixelsPerSecond;
@@ -182,10 +186,5 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
        }

        #endregion
-
-        public void Dispose()
-        {
-            BaseLayerPropertyKeyframe.PropertyChanged -= BaseLayerPropertyKeyframeOnPropertyChanged;
-        }
    }
 }
@@ -5,8 +5,6 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline"
             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:layerProperties="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             xmlns:layerProperties1="clr-namespace:Artemis.UI.Screens.ProfileEditor.LayerProperties"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800"
@@ -58,11 +56,11 @@
                <Style TargetType="ContentPresenter">
                    <Setter Property="VerticalAlignment" Value="Stretch" />
                    <Setter Property="HorizontalAlignment" Value="Stretch" />
-                </Style >
+                </Style>
            </ItemsControl.ItemContainerStyle>
            <ItemsControl.Resources>
                <DataTemplate DataType="{x:Type layerProperties1:LayerPropertyGroupViewModel}">
-                    <ContentControl s:View.Model="{Binding TimelinePropertyGroupViewModel}" IsTabStop="False" HorizontalAlignment="Stretch"/>
+                    <ContentControl s:View.Model="{Binding TimelinePropertyGroupViewModel}" IsTabStop="False" HorizontalAlignment="Stretch" />
                </DataTemplate>
                <DataTemplate DataType="{x:Type layerProperties1:LayerPropertyViewModel}">
                    <ContentControl s:View.Model="{Binding TimelinePropertyBaseViewModel}" IsTabStop="False" HorizontalAlignment="Stretch" />
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
@@ -30,7 +30,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
            {
                var keyframes = LayerPropertyViewModel.LayerProperty.Keyframes.ToList();
                var toRemove = TimelineKeyframeViewModels.Where(t => !keyframes.Contains(t.BaseLayerPropertyKeyframe)).ToList();
-                foreach (var timelineKeyframeViewModel in toRemove) 
+                foreach (var timelineKeyframeViewModel in toRemove)
                    timelineKeyframeViewModel.Dispose();

                TimelineKeyframeViewModels.RemoveRange(toRemove);
@@ -57,7 +57,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline

        private void DisposeKeyframeViewModels()
        {
-            foreach (var timelineKeyframeViewModel in TimelineKeyframeViewModels) 
+            foreach (var timelineKeyframeViewModel in TimelineKeyframeViewModels)
                timelineKeyframeViewModel.Dispose();
            TimelineKeyframeViewModels.Clear();
        }
@@ -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.LayerProperties.Timeline"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
             xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
@@ -17,11 +16,11 @@
    <StackPanel Orientation="Horizontal" Visibility="{Binding SegmentEnabled, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
        <StackPanel.ContextMenu>
            <ContextMenu>
-                <MenuItem Header="Repeat main segment" 
+                <MenuItem Header="Repeat main segment"
                          IsCheckable="True"
-                          IsChecked="{Binding Data.RepeatSegment, Source={StaticResource DataContextProxy}}" 
-                          Visibility="{Binding Data.IsMainSegment, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Source={StaticResource DataContextProxy}}"/>
-                <MenuItem Header="Disable segment" Command="{s:Action DisableSegment}"/>
+                          IsChecked="{Binding Data.RepeatSegment, Source={StaticResource DataContextProxy}}"
+                          Visibility="{Binding Data.IsMainSegment, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Source={StaticResource DataContextProxy}}" />
+                <MenuItem Header="Disable segment" Command="{s:Action DisableSegment}" />
            </ContextMenu>
        </StackPanel.ContextMenu>

@@ -86,8 +85,8 @@
                                                    <QuadraticEase EasingMode="EaseInOut" />
                                                </DoubleAnimation.EasingFunction>
                                            </DoubleAnimation>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" >
-                                                <DiscreteObjectKeyFrame KeyTime="00:00:0.25" Value="{x:Static Visibility.Collapsed}"/>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)">
+                                                <DiscreteObjectKeyFrame KeyTime="00:00:0.25" Value="{x:Static Visibility.Collapsed}" />
                                            </ObjectAnimationUsingKeyFrames>
                                        </Storyboard>
                                    </BeginStoryboard>
@@ -96,7 +95,7 @@
                                    <BeginStoryboard>
                                        <Storyboard>
                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)">
-                                                <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Visible}"/>
+                                                <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Visible}" />
                                            </ObjectAnimationUsingKeyFrames>
                                            <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0.0" To="1.0" Duration="0:0:0.25" />
                                        </Storyboard>
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Artemis.Core.Models.Profile;
-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.Screens.ProfileEditor.LayerProperties.Timeline
@@ -14,9 +14,9 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
    public class TimelineSegmentViewModel : PropertyChangedBase, IDisposable
    {
        private bool _draggingSegment;
-        private bool _showSegmentName;
-        private bool _showRepeatButton;
        private bool _showDisableButton;
+        private bool _showRepeatButton;
+        private bool _showSegmentName;

        public TimelineSegmentViewModel(IProfileEditorService profileEditorService, SegmentViewModelType segment)
        {
@@ -49,8 +49,8 @@
              X2="{Binding StartSegmentEndPosition}"
              Y1="0"
              Y2="{Binding ActualHeight, ElementName=TimelineContainerGrid}"
-              HorizontalAlignment="Left" 
-              Visibility="{Binding StartSegmentEnabled, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
+              HorizontalAlignment="Left"
+              Visibility="{Binding StartSegmentEnabled, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />
        <Line Stroke="{StaticResource PrimaryHueDarkBrush}"
              Opacity="0.5"
              StrokeDashArray="4 2"
@@ -65,7 +65,7 @@
              X2="{Binding EndSegmentEndPosition}"
              Y1="0"
              Y2="{Binding ActualHeight, ElementName=TimelineContainerGrid}"
-              Visibility="{Binding EndSegmentEnabled, Converter={x:Static s:BoolToVisibilityConverter.Instance}}"/>
+              Visibility="{Binding EndSegmentEnabled, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />

        <!-- Multi-selection rectangle -->
        <Path x:Name="MultiSelectionPath"
@@ -7,10 +7,10 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shapes;
-using Artemis.Core.Models.Profile;
+using Artemis.Core;
 using Artemis.UI.Screens.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Shared.Services.Interfaces;
-using Artemis.UI.Shared.Utilities;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
@@ -63,6 +63,20 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
            SelectedProfileElement.PropertyChanged -= SelectedProfileElementOnPropertyChanged;
        }

+        public void Update()
+        {
+            foreach (var layerPropertyGroupViewModel in LayerPropertyGroups)
+            {
+                layerPropertyGroupViewModel.TimelinePropertyGroupViewModel.UpdateKeyframes();
+
+                foreach (var layerPropertyBaseViewModel in layerPropertyGroupViewModel.GetAllChildren())
+                {
+                    if (layerPropertyBaseViewModel is LayerPropertyViewModel layerPropertyViewModel)
+                        layerPropertyViewModel.TimelinePropertyBaseViewModel.UpdateKeyframes();
+                }
+            }
+        }
+
        private void SelectedProfileElementOnPropertyChanged(object sender, PropertyChangedEventArgs e)
        {
            if (e.PropertyName == nameof(_profileEditorService.SelectedProfileElement.StartSegmentLength))
@@ -90,20 +104,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.Timeline
            }
        }

-        public void Update()
-        {
-            foreach (var layerPropertyGroupViewModel in LayerPropertyGroups)
-            {
-                layerPropertyGroupViewModel.TimelinePropertyGroupViewModel.UpdateKeyframes();
-
-                foreach (var layerPropertyBaseViewModel in layerPropertyGroupViewModel.GetAllChildren())
-                {
-                    if (layerPropertyBaseViewModel is LayerPropertyViewModel layerPropertyViewModel)
-                        layerPropertyViewModel.TimelinePropertyBaseViewModel.UpdateKeyframes();
-                }
-            }
-        }
-
        private void ProfileEditorServiceOnPixelsPerSecondChanged(object sender, EventArgs e)
        {
            NotifyOfPropertyChange(nameof(StartSegmentWidth));