UI - My poor UI :< I regret starting this refactor

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertyViewModel.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Artemis.Core.Models.Profile.LayerProperties;
+using Artemis.Core.Utilities;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.PropertyTree.PropertyInput;
 using Artemis.UI.Services.Interfaces;
 using Ninject;
@@ -9,31 +10,30 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
 {
-    public class LayerPropertyViewModel : PropertyChangedBase
+    public class LayerPropertyViewModel<T> : LayerPropertyViewModel
     {
         private readonly IKernel _kernel;
         private readonly IProfileEditorService _profileEditorService;
         private bool _keyframesEnabled;
         private bool _isExpanded;
 
-        public LayerPropertyViewModel(BaseLayerProperty layerProperty, LayerPropertyViewModel parent, IKernel kernel, IProfileEditorService profileEditorService)
+        public LayerPropertyViewModel(LayerProperty<T> layerProperty, LayerPropertyViewModel parent, IKernel kernel, IProfileEditorService profileEditorService)
         {
             _kernel = kernel;
             _profileEditorService = profileEditorService;
-            _keyframesEnabled = layerProperty.IsUsingKeyframes;
+            _keyframesEnabled = layerProperty.KeyframesEnabled;
 
             LayerProperty = layerProperty;
             Parent = parent;
             Children = new List<LayerPropertyViewModel>();
-            IsExpanded = layerProperty.ExpandByDefault;
+
+            // TODO: Get from attribute
+            IsExpanded = false;
 
             Parent?.Children.Add(this);
         }
 
-        public BaseLayerProperty LayerProperty { get; }
-
-        public LayerPropertyViewModel Parent { get; }
-        public List<LayerPropertyViewModel> Children { get; }
+        public LayerProperty<T> LayerProperty { get; }
 
         public bool IsExpanded
         {
@@ -58,7 +58,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
         public PropertyInputViewModel GetPropertyInputViewModel()
         {
             // If the type is an enum type, search for Enum instead.
-            var type = LayerProperty.Type;
+            var type = typeof(T);
             if (type.IsEnum)
                 type = typeof(Enum);
 
@@ -72,15 +72,16 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
 
         private void UpdateKeyframes()
         {
+            
             // Either create a new first keyframe or clear all the keyframes
             if (_keyframesEnabled)
-                LayerProperty.CreateNewKeyframe(_profileEditorService.CurrentTime, LayerProperty.GetCurrentValue());
+                LayerProperty.AddKeyframe(new LayerPropertyKeyframe<T>(LayerProperty.CurrentValue, _profileEditorService.CurrentTime, Easings.Functions.Linear));
             else
                 LayerProperty.ClearKeyframes();
 
             // Force the keyframe engine to update, the new keyframe is the current keyframe
-            LayerProperty.IsUsingKeyframes = _keyframesEnabled;
-            LayerProperty.KeyframeEngine?.Update(0);
+            LayerProperty.KeyframesEnabled = _keyframesEnabled;
+            LayerProperty.Update(0);
 
             _profileEditorService.UpdateSelectedProfileElement();
         }
@@ -88,6 +89,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
         #region Events
 
         public event EventHandler<EventArgs> ExpandedStateChanged;
+
         protected virtual void OnExpandedStateChanged()
         {
             ExpandedStateChanged?.Invoke(this, EventArgs.Empty);
@@ -97,4 +99,10 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
 
         #endregion
     }
+
+    public class LayerPropertyViewModel : PropertyChangedBase
+    {
+        public LayerPropertyViewModel Parent { get; protected set; }
+        public List<LayerPropertyViewModel> Children { get; protected set; }
+    }
 }

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/Timeline/PropertyTrackKeyframeViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
@@ -10,12 +9,12 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 {
-    public class PropertyTrackKeyframeViewModel : PropertyChangedBase
+    public class PropertyTrackKeyframeViewModel<T> : PropertyTrackKeyframeViewModel
     {
         private readonly IProfileEditorService _profileEditorService;
         private int _pixelsPerSecond;
 
-        public PropertyTrackKeyframeViewModel(PropertyTrackViewModel propertyTrackViewModel, BaseKeyframe keyframe, IProfileEditorService profileEditorService)
+        public PropertyTrackKeyframeViewModel(PropertyTrackViewModel propertyTrackViewModel, LayerPropertyKeyframe<T> keyframe, IProfileEditorService profileEditorService)
         {
             _profileEditorService = profileEditorService;
 
@@ -27,7 +26,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
         public bool IsSelected { get; set; }
         public PropertyTrackViewModel PropertyTrackViewModel { get; }
-        public BaseKeyframe Keyframe { get; }
+        public LayerPropertyKeyframe<T> Keyframe { get; }
         public BindableCollection<PropertyTrackEasingViewModel> EasingViewModels { get; set; }
         public double X { get; set; }
         public string Timestamp { get; set; }
@@ -170,4 +169,8 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.Timeline
 
         #endregion
     }
+
+    public abstract class PropertyTrackKeyframeViewModel : PropertyChangedBase
+    {
+    }
 }