Merge pull request #5 from techno-dwarf-works/refactoring

Version 0.0.4

Runtime/Data/Overridable/ImplementationOverridable.cs

@@ -1,11 +1,13 @@
 using System;
 using Better.Attributes.Runtime.Select;
+using Better.Commons.Runtime.Interfaces;
 using UnityEngine;
 
 namespace Better.Tweens.Runtime.Data
 {
     [Serializable]
-    public class ImplementationOverridable<TValue> : OverridableData<TValue>
+    public class ImplementationOverridable<TValue> : OverridableData<TValue>, ICloneable<ImplementationOverridable<TValue>>
+        where TValue : ICloneable<TValue>
     {
         [Select]
         [SerializeReference] private TValue _overridenValue;
@@ -16,9 +18,19 @@ protected override TValue OverridenValue
             set => _overridenValue = value;
         }
 
-        public ImplementationOverridable(TValue overridenValue)
+        public ImplementationOverridable(TValue sourceValue, TValue overridenValue, bool overriden) : base(sourceValue, overriden)
         {
             _overridenValue = overridenValue;
         }
+
+        public ImplementationOverridable(TValue overridenValue) : this(default, overridenValue, false)
+        {
+        }
+
+        public ImplementationOverridable<TValue> Clone()
+        {
+            var overridenClone = _overridenValue == null ? default : _overridenValue.Clone();
+            return new ImplementationOverridable<TValue>(overridenClone, SourceValue, Overriden);
+        }
     }
 }

Runtime/Data/Overridable/OverridableData.cs

@@ -7,21 +7,30 @@ namespace Better.Tweens.Runtime.Data
     public abstract class OverridableData<TValue>
     {
         [SerializeField] private bool _overriden;
-
-        private TValue _sourceValue;
-
-        public TValue Value => Overriden ? OverridenValue : _sourceValue;
+
+        public TValue Value => Overriden ? OverridenValue : SourceValue;
         protected abstract TValue OverridenValue { get; set; }
+        protected TValue SourceValue { get; private set; }
 
         public bool Overriden
         {
             get => _overriden;
             set => _overriden = value;
         }
 
+        protected OverridableData()
+        {
+        }
+
+        protected OverridableData(TValue sourceValue, bool overriden)
+        {
+            SourceValue = sourceValue;
+            _overriden = overriden;
+        }
+
         public void SetSource(TValue value)
         {
-            _sourceValue = value;
+            SourceValue = value;
         }
 
         public void Override(TValue value)

Runtime/Data/Overridable/Simples/SleepingDurationOverridable.cs → Runtime/Data/Overridable/SleepingDurationOverridable.cs

@@ -1,11 +1,10 @@
 using System;
-using Better.Attributes.Runtime.Select;
-using UnityEngine;
+using Better.Commons.Runtime.Interfaces;
 
 namespace Better.Tweens.Runtime.Data
 {
     [Serializable]
-    public class SleepingDurationOverridable : SimpleOverridable<SleepingDuration>
+    public class SleepingDurationOverridable : ImplementationOverridable<SleepingDuration>, ICloneable<SleepingDurationOverridable>
     {
         public float Duration => Value.Value;
         public bool Infinity => Value.Infinity;
@@ -14,6 +13,10 @@ public SleepingDurationOverridable(SleepingDuration overridenValue) : base(overr
         {
         }
 
+        public SleepingDurationOverridable(SleepingDuration overridenValue, SleepingDuration sourceValue, bool overriden) : base(overridenValue)
+        {
+        }
+
         public void OverrideDuration(float value)
         {
             Overriden = true;
@@ -25,5 +28,11 @@ public void OverrideInfinity()
             Overriden = true;
             OverridenValue.MakeInfinity();
         }
+
+        public new SleepingDurationOverridable Clone()
+        {
+            var overridenClone = OverridenValue?.Clone();
+            return new SleepingDurationOverridable(overridenClone, SourceValue, Overriden);
+        }
     }
 }

Runtime/Data/Overridable/Simples/SimpleOverridable.cs → Runtime/Data/Overridable/ValueOverridable.cs

@@ -1,11 +1,12 @@
 using System;
-using Better.Attributes.Runtime.Select;
+using Better.Commons.Runtime.Interfaces;
 using UnityEngine;
 
 namespace Better.Tweens.Runtime.Data
 {
     [Serializable]
-    public class SimpleOverridable<TValue> : OverridableData<TValue>
+    public class ValueOverridable<TValue> : OverridableData<TValue>, ICloneable<ValueOverridable<TValue>>
+        where TValue : struct
     {
         [SerializeField] private TValue _overridenValue;
 
@@ -15,9 +16,14 @@ protected override TValue OverridenValue
             set => _overridenValue = value;
         }
 
-        public SimpleOverridable(TValue overridenValue)
+        public ValueOverridable(TValue overridenValue)
         {
             _overridenValue = overridenValue;
         }
+
+        public ValueOverridable<TValue> Clone()
+        {
+            return new ValueOverridable<TValue>(OverridenValue);
+        }
     }
 }