Meta - Code cleanup

2026-11-12 20:06:33 +00:00 · 2020-06-13 22:27:51 +02:00
1 parent b2ab142dbd
commit 58a964b872
@@ -16,8 +16,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract
        public abstract bool IsVisible { get; }

        public List<LayerPropertyBaseViewModel> Children { get; set; }
+        public abstract void Dispose();

        public abstract List<BaseLayerPropertyKeyframe> GetKeyframes(bool expandedOnly);
-        public abstract void Dispose();
    }
 }
@@ -30,7 +30,7 @@
                 Visibility="{Binding HasLayerEffectDescriptors, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
            <ListBox.ItemTemplate>
                <DataTemplate DataType="{x:Type layerEffect:LayerEffectDescriptor}">
-                    <Border Padding="8" BorderThickness="0 0 0 1" BorderBrush="{DynamicResource MaterialDesignDivider}" VerticalAlignment="Stretch" 
+                    <Border Padding="8" BorderThickness="0 0 0 1" BorderBrush="{DynamicResource MaterialDesignDivider}" VerticalAlignment="Stretch"
                            behaviors:MouseBehaviour.MouseUpCommand="{x:Static materialDesign:Transitioner.MoveFirstCommand}">
                        <Grid>
                            <Grid.ColumnDefinitions>
@@ -136,7 +136,7 @@
                        </Border>
                    </ScrollViewer>

-                    <materialDesign:TransitionerSlide >
+                    <materialDesign:TransitionerSlide>
                        <materialDesign:TransitionerSlide.BackwardWipe>
                            <materialDesign:CircleWipe />
                        </materialDesign:TransitionerSlide.BackwardWipe>
@@ -8,7 +8,6 @@ using Artemis.Core.Events;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Models.Profile.LayerProperties.Attributes;
-using Artemis.Core.Plugins.LayerBrush.Abstract;
 using Artemis.Core.Services;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject.Factories;
@@ -62,6 +61,21 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
        public EffectsViewModel EffectsViewModel { get; set; }
        public TimelineViewModel TimelineViewModel { get; set; }

+        #region Effects
+
+        public void ToggleAddEffect()
+        {
+            if (DateTime.Now - _lastToggle < TimeSpan.FromMilliseconds(500))
+                return;
+
+            _lastToggle = DateTime.Now;
+            PropertyTreeIndex = PropertyTreeIndex == 0 ? 1 : 0;
+            if (PropertyTreeIndex == 1)
+                EffectsViewModel.PopulateDescriptors();
+        }
+
+        #endregion
+
        protected override void OnInitialActivate()
        {
            PopulateProperties(ProfileEditorService.SelectedProfileElement);
@@ -115,10 +129,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties

        private void PopulateProperties(ProfileElement profileElement)
        {
-            if (SelectedFolder != null)
-            {
-                SelectedFolder = null;
-            }
+            if (SelectedFolder != null) SelectedFolder = null;

            if (SelectedLayer != null)
            {
@@ -133,9 +144,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
            _brushPropertyGroup = null;

            if (profileElement is Folder folder)
-            {
                SelectedFolder = folder;
-            }
            else if (profileElement is Layer layer)
            {
                SelectedLayer = layer;
@@ -389,20 +398,5 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
        }

        #endregion
-
-        #region Effects
-
-        public void ToggleAddEffect()
-        {
-            if (DateTime.Now - _lastToggle < TimeSpan.FromMilliseconds(500))
-                return;
-
-            _lastToggle = DateTime.Now;
-            PropertyTreeIndex = PropertyTreeIndex == 0 ? 1 : 0;
-            if (PropertyTreeIndex == 1)
-                EffectsViewModel.PopulateDescriptors();
-        }
-
-        #endregion
    }
 }
@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.UI.Exceptions;
+using Artemis.UI.PropertyInput;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree;
-using Artemis.UI.PropertyInput;
 using Artemis.UI.Shared.PropertyInput;
 using Artemis.UI.Shared.Services.Interfaces;
 using Humanizer;
@@ -16,7 +16,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline

        public static readonly DependencyProperty PixelsPerSecondProperty = DependencyProperty.Register(nameof(PixelsPerSecond), typeof(int), typeof(PropertyTimelineHeader),
            new FrameworkPropertyMetadata(default(int), FrameworkPropertyMetadataOptions.AffectsRender));
-        
+
        public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.Register(nameof(HorizontalOffset), typeof(double), typeof(PropertyTimelineHeader),
            new FrameworkPropertyMetadata(default(double), FrameworkPropertyMetadataOptions.AffectsRender));

@@ -4,7 +4,6 @@ using System.Windows;
 using System.Windows.Input;
 using Artemis.Core.Models.Profile.LayerProperties;
 using Artemis.Core.Utilities;
-using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;

@@ -41,8 +41,7 @@
                             StrokeThickness="0"
                             Width="10"
                             Height="10"
-                             Margin="-5,6,0,0">
-                    </Ellipse>
+                             Margin="-5,6,0,0" />
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
@@ -55,15 +54,15 @@
            <ItemsControl.Resources>
                <DataTemplate DataType="{x:Type layerProperties:LayerPropertyGroupViewModel}">
                    <ContentControl s:View.Model="{Binding TimelinePropertyGroupViewModel}"
-                                        VerticalContentAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        IsTabStop="False" />
+                                    VerticalContentAlignment="Stretch"
+                                    HorizontalContentAlignment="Stretch"
+                                    IsTabStop="False" />
                </DataTemplate>
                <DataTemplate DataType="{x:Type layerProperties:LayerPropertyViewModel}">
                    <ContentControl s:View.Model="{Binding TimelinePropertyBaseViewModel}"
-                                        VerticalContentAlignment="Stretch"
-                                        HorizontalContentAlignment="Stretch"
-                                        IsTabStop="False" />
+                                    VerticalContentAlignment="Stretch"
+                                    HorizontalContentAlignment="Stretch"
+                                    IsTabStop="False" />
                </DataTemplate>
            </ItemsControl.Resources>
        </ItemsControl>
@@ -2,7 +2,6 @@
 using System.Linq;
 using Artemis.UI.Exceptions;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Abstract;
-using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;

@@ -23,17 +22,6 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
            _profileEditorService.PixelsPerSecondChanged += ProfileEditorServiceOnPixelsPerSecondChanged;
        }

-        private void LayerPropertyOnKeyframeModified(object sender, EventArgs e)
-        {
-            UpdateKeyframes();
-        }
-
-        private void ProfileEditorServiceOnPixelsPerSecondChanged(object sender, EventArgs e)
-        {
-            foreach (var timelineKeyframeViewModel in TimelineKeyframeViewModels)
-                timelineKeyframeViewModel.Update(_profileEditorService.PixelsPerSecond);
-        }
-
        public LayerPropertyViewModel<T> LayerPropertyViewModel { get; }

        public override void UpdateKeyframes()
@@ -53,9 +41,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
                );
            }
            else
-            {
                TimelineKeyframeViewModels.Clear();
-            }

            foreach (var timelineKeyframeViewModel in TimelineKeyframeViewModels)
                timelineKeyframeViewModel.Update(_profileEditorService.PixelsPerSecond);
@@ -68,6 +54,17 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
            LayerPropertyViewModel.LayerProperty.KeyframeRemoved -= LayerPropertyOnKeyframeModified;
            LayerPropertyViewModel.LayerProperty.KeyframesToggled -= LayerPropertyOnKeyframeModified;
        }
+
+        private void LayerPropertyOnKeyframeModified(object sender, EventArgs e)
+        {
+            UpdateKeyframes();
+        }
+
+        private void ProfileEditorServiceOnPixelsPerSecondChanged(object sender, EventArgs e)
+        {
+            foreach (var timelineKeyframeViewModel in TimelineKeyframeViewModels)
+                timelineKeyframeViewModel.Update(_profileEditorService.PixelsPerSecond);
+        }
    }

    public abstract class TimelinePropertyViewModel : IDisposable
@@ -82,8 +79,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
        public TimelineViewModel TimelineViewModel { get; set; }
        public BindableCollection<TimelineKeyframeViewModel> TimelineKeyframeViewModels { get; set; }

-        public abstract void UpdateKeyframes();
-
        public abstract void Dispose();
+
+        public abstract void UpdateKeyframes();
    }
 }
@@ -130,7 +130,7 @@
                    ToolTip="Rename"
                    Width="24"
                    Height="24"
-                    VerticalAlignment="Center" 
+                    VerticalAlignment="Center"
                    Command="{s:Action RenameEffect}">
                <materialDesign:PackIcon Kind="RenameBox" Height="16" Width="16" />
            </Button>
@@ -140,11 +140,11 @@
                    ToolTip="Remove"
                    Width="24"
                    Height="24"
-                    VerticalAlignment="Center" 
+                    VerticalAlignment="Center"
                    Command="{s:Action DeleteEffect}">
                <materialDesign:PackIcon Kind="TrashCan" Height="16" Width="16" />
            </Button>
-            
+
        </Grid>
    </StackPanel>
 </UserControl>
@@ -8,9 +8,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Tree
 {
    public class TreePropertyGroupViewModel
    {
-        private readonly IProfileEditorService _profileEditorService;
-        private readonly ILayerService _layerService;
        private readonly IDialogService _dialogService;
+        private readonly ILayerService _layerService;
+        private readonly IProfileEditorService _profileEditorService;

        public TreePropertyGroupViewModel(LayerPropertyBaseViewModel layerPropertyBaseViewModel,
            IProfileEditorService profileEditorService, ILayerService layerService, IDialogService dialogService)