1. Simplify the implementation of custom extensions

2. TMP extension and streamlining
ls9512 · Aug 19, 2021 · 56377fa · 56377fa
1 parent 033e312
commit 56377fa
Show file tree

Hide file tree

Showing 26 changed files with 120 additions and 312 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -314,14 +314,10 @@ Implement a runtime data binder for a specific object and property by inheriting
 ``` cs
 public class RuntimeImageFillAmountBinder : DataBinder<Image, float>
 {
-	public override void SetData(float data)
+	public override float Value
 	{
-		Target.fillAmount = data;
-	}
-
-	public override float GetData()
-	{
-		return Target.fillAmount;
+		get => Target.fillAmount;
+		set => Target.fillAmount = value;
 	}
 }
 ```
@@ -381,6 +377,4 @@ DataConverter.Register((sourceType, targetType), new CustomDataConverter());
 ***
 
 ##  8. <a name='Extension--TextMeshPro'></a>Extension -- TextMeshPro
-* TMP Text Binder
-* TMP Text UI Binder
-* TMP Input Field Binder
+* TMP Text Binder
diff --git a/.github/README_CN.md b/.github/README_CN.md
@@ -315,14 +315,10 @@ DataConvert.Register(Type sourceType, Type targetType, DataConverter dataConvert
 ``` cs
 public class RuntimeImageFillAmountBinder : DataBinder<Image, float>
 {
-	public override void SetData(float data)
+	public override float Value
 	{
-		Target.fillAmount = data;
-	}
-
-	public override float GetData()
-	{
-		return Target.fillAmount;
+		get => Target.fillAmount;
+		set => Target.fillAmount = value;
 	}
 }
 ```
@@ -382,6 +378,4 @@ DataConverter.Register((sourceType, targetType), new CustomDataConverter());
 ***
 
 ##  8. <a name='--TextMeshPro'></a>扩展 -- TextMeshPro
-* TMP Text Binder
-* TMP Text UI Binder
-* TMP Input Field Binder
+* TMP Text Binder
diff --git a/Extension/TextMeshPro/Script/TMPInputFieldBinder.cs b/Extension/TextMeshPro/Script/TMPInputFieldBinder.cs
diff --git a/Extension/TextMeshPro/Script/TMPInputFieldBinder.cs.meta b/Extension/TextMeshPro/Script/TMPInputFieldBinder.cs.meta
diff --git a/Extension/TextMeshPro/Script/TMPTextBinder.cs b/Extension/TextMeshPro/Script/TMPTextBinder.cs
@@ -5,30 +5,26 @@
 namespace Aya.DataBinding
 {
     [AddComponentMenu("Data Binding/TMP Text Binder")]
-    public class TMPTextBinder : ComponentBinder<TextMeshPro, string, RuntimeTMPTextBinder>
+    public class TMPTextBinder : ComponentBinder<TMP_Text, string, RuntimeTMPTextBinder>
     {
         public override bool NeedUpdate => true;
     }
 
-    public class RuntimeTMPTextBinder : DataBinder<TextMeshPro, string>
+    public class RuntimeTMPTextBinder : DataBinder<TMP_Text, string>
     {
         public override bool NeedUpdate => true;
 
-        public override void SetData(string data)
+        public override string Value
         {
-            Target.text = data;
-        }
-
-        public override string GetData()
-        {
-            return Target.text;
+            get => Target.text;
+            set => Target.text = value;
         }
     }
 
 #if UNITY_EDITOR
 
     [UnityEditor.CustomEditor(typeof(TMPTextBinder)), UnityEditor.CanEditMultipleObjects]
-    public class TMPTextBinderEditor : ComponentBinderEditor<TextMeshPro, string, RuntimeTMPTextBinder>
+    public class TMPTextBinderEditor : ComponentBinderEditor<TMP_Text, string, RuntimeTMPTextBinder>
     {
     }
 

diff --git a/Extension/TextMeshPro/Script/TMPTextUIBinder.cs b/Extension/TextMeshPro/Script/TMPTextUIBinder.cs
diff --git a/Extension/TextMeshPro/Script/TMPTextUIBinder.cs.meta b/Extension/TextMeshPro/Script/TMPTextUIBinder.cs.meta
diff --git a/Runtime/Script/Binder/RuntimeTypeBinder.cs b/Runtime/Script/Binder/RuntimeTypeBinder.cs
@@ -54,15 +54,6 @@ public override void UnBind()
             }
         }
 
-        public override void SetData(object data)
-        {
-            // Not use
-        }
-
-        public override object GetData()
-        {
-            // Not use
-            return null;
-        }
+        public override object Value { get; set; }
     }
 }
diff --git a/Runtime/Script/Binder/RuntimeValueBinder.cs b/Runtime/Script/Binder/RuntimeValueBinder.cs
@@ -26,14 +26,10 @@ public RuntimeValueBinder(string context, string key, DataDirection direction, F
             Setter = setter;
         }
 
-        public override void SetData(T data)
+        public override T Value
         {
-            Setter(data);
-        }
-
-        public override T GetData()
-        {
-            return Getter();
+            get => Getter();
+            set => Setter(value);
         }
     }
 }
diff --git a/Runtime/Script/Component/PropertyBinder.cs b/Runtime/Script/Component/PropertyBinder.cs
@@ -39,6 +39,56 @@ public class RuntimePropertyBinder<TTarget> : DataBinder<TTarget, object>
 
         public override bool NeedUpdate => true;
 
+        public override object Value
+        {
+            get
+            {
+                if (FiledInfo != null)
+                {
+                    var data = FiledInfo.GetValue(Target);
+                    return data;
+                }
+
+                if (PropertyInfo != null)
+                {
+                    var data = PropertyInfo.GetValue(Target, null);
+                    return data;
+                }
+
+                return default;
+            }
+            set
+            {
+                var data = value;
+                var dataType = data != null ? data.GetType() : typeof(object);
+                if (FiledInfo != null)
+                {
+                    if (data != null && dataType != FiledInfo.FieldType)
+                    {
+                        var convertData = Convert.ChangeType(data, FiledInfo.FieldType, CultureInfo.InvariantCulture);
+                        FiledInfo.SetValue(Target, convertData);
+                    }
+                    else
+                    {
+                        FiledInfo.SetValue(Target, data);
+                    }
+                }
+
+                if (PropertyInfo != null)
+                {
+                    if (data != null && dataType != PropertyInfo.PropertyType)
+                    {
+                        var convertData = Convert.ChangeType(data, PropertyInfo.PropertyType, CultureInfo.InvariantCulture);
+                        PropertyInfo.SetValue(Target, convertData, null);
+                    }
+                    else
+                    {
+                        PropertyInfo.SetValue(Target, data, null);
+                    }
+                }
+            }
+        }
+
         public FieldInfo FiledInfo
         {
             get
@@ -74,53 +124,5 @@ public PropertyInfo PropertyInfo
         }
 
         private PropertyInfo _propertyInfo;
-
-        public override object GetData()
-        {
-            if (FiledInfo != null)
-            {
-                var data = FiledInfo.GetValue(Target);
-                return data;
-            }
-
-            if (PropertyInfo != null)
-            {
-                var data = PropertyInfo.GetValue(Target, null);
-                return data;
-            }
-
-            return default;
-        }
-
-
-        public override void SetData(object data)
-        {
-            var dataType = data != null ? data.GetType() : typeof(object);
-            if (FiledInfo != null)
-            {
-                if (data != null && dataType != FiledInfo.FieldType)
-                {
-                    var convertData = Convert.ChangeType(data, FiledInfo.FieldType, CultureInfo.InvariantCulture);
-                    FiledInfo.SetValue(Target, convertData);
-                }
-                else
-                {
-                    FiledInfo.SetValue(Target, data);
-                }
-            }
-
-            if (PropertyInfo != null)
-            {
-                if (data != null && dataType != PropertyInfo.PropertyType)
-                {
-                    var convertData = Convert.ChangeType(data, PropertyInfo.PropertyType, CultureInfo.InvariantCulture);
-                    PropertyInfo.SetValue(Target, convertData, null);
-                }
-                else
-                {
-                    PropertyInfo.SetValue(Target, data, null);
-                }
-            }
-        }
     }
 }
diff --git a/Runtime/Script/Component/UI/CanvasGroupBinder.cs b/Runtime/Script/Component/UI/CanvasGroupBinder.cs
@@ -12,14 +12,10 @@ public class RuntimeCanvasGroupBinder : DataBinder<CanvasGroup, float>
     {
         public override bool NeedUpdate => true;
 
-        public override void SetData(float data)
+        public override float Value
         {
-            Target.alpha = data;
-        }
-
-        public override float GetData()
-        {
-            return Target.alpha;
+            get => Target.alpha;
+            set => Target.alpha = value;
         }
     }
 

diff --git a/Runtime/Script/Component/UI/ColorBinder.cs b/Runtime/Script/Component/UI/ColorBinder.cs
@@ -13,14 +13,10 @@ public class RuntimeColorBinder : DataBinder<Graphic, Color>
     {
         public override bool NeedUpdate => true;
 
-        public override void SetData(Color data)
+        public override Color Value
         {
-            Target.color = data;
-        }
-
-        public override Color GetData()
-        {
-            return Target.color;
+            get => Target.color;
+            set => Target.color = value;
         }
     }
 

diff --git a/Runtime/Script/Component/UI/DropdownBinder.cs b/Runtime/Script/Component/UI/DropdownBinder.cs
@@ -14,14 +14,10 @@ public class RuntimeDropdownBinder : DataBinder<Dropdown, int>
         public override void AddListener() => Target.onValueChanged.AddListener(OnValueChangedCallback);
         public override void RemoveListener() => Target.onValueChanged.RemoveListener(OnValueChangedCallback);
 
-        public override void SetData(int data)
+        public override int Value
         {
-            Target.value = data;
-        }
-
-        public override int GetData()
-        {
-            return Target.value;
+            get => Target.value;
+            set => Target.value = value;
         }
     }