Rename BindableElementsWrapper to BindableElementsFactory.

ChebanovDD · ChebanovDD · commit 0819fad5fd11 · 2022-09-02T00:12:20.000+07:00
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/AppContext.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/AppContext.cs
@@ -22,7 +22,7 @@ public void Construct()
         RegisterInstance<IThemeService>(_themeService);
         RegisterInstance(new CounterViewModel());
         RegisterInstance<IDataStoreService>(new DataStoreService(this));
-        RegisterInstance<IBindableElementsWrapper>(new CounterBindableElementsWrapper());
+        RegisterInstance<IBindableElementsFactory>(new CounterBindableElementsFactory());
         RegisterInstance(GetValueConverters());
     }
 
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/CounterBindableElementsFactory.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/CounterBindableElementsFactory.cs
@@ -3,9 +3,9 @@
 using UnityMvvmToolkit.Core.Interfaces;
 using UnityMvvmToolkit.UITK;
 
-public class CounterBindableElementsWrapper : BindableElementsWrapper
+public class CounterBindableElementsFactory : BindableElementsFactory
 {
-    public override IBindableElement Wrap(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
+    public override IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
     {
         return bindableUiElement switch
         {
@@ -14,7 +14,7 @@ public override IBindableElement Wrap(IBindableUIElement bindableUiElement, IObj
             BindableThemeSwitcher themeSwitcher => new BindableThemeSwitcherWrapper(themeSwitcher, objectProvider),
             BindableAnimationLabel animationLabel => new BindableAnimationLabelWrapper(animationLabel, objectProvider),
 
-            _ => base.Wrap(bindableUiElement, objectProvider)
+            _ => base.Create(bindableUiElement, objectProvider)
         };
     }
 }
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/CounterBindableElementsFactory.cs.meta b/samples/Unity.Mvvm.Counter/Assets/Scripts/CounterBindableElementsFactory.cs.meta
diff --git a/samples/Unity.Mvvm.Counter/Assets/Scripts/Views/BaseView.cs b/samples/Unity.Mvvm.Counter/Assets/Scripts/Views/BaseView.cs
@@ -29,9 +29,9 @@ protected override IValueConverter[] GetValueConverters()
             return _appContext.Resolve<IValueConverter[]>();
         }
 
-        protected override IBindableElementsWrapper GetBindableElementsWrapper()
+        protected override IBindableElementsFactory GetBindableElementsFactory()
         {
-            return _appContext.Resolve<IBindableElementsWrapper>();
+            return _appContext.Resolve<IBindableElementsFactory>();
         }
     }
 }
diff --git a/samples/Unity.Mvvm.ToDoList/Assets/Scripts/AppContext.cs b/samples/Unity.Mvvm.ToDoList/Assets/Scripts/AppContext.cs
@@ -31,7 +31,7 @@ public void Construct()
         RegisterInstance(new AddTaskDialogViewModel(this));
         
         RegisterInstance<IDataStoreService>(new DataStoreService(this));
-        RegisterInstance<IBindableElementsWrapper>(new ToDoListBindableElementsWrapper(_taskItemAsset));
+        RegisterInstance<IBindableElementsFactory>(new ToDoListBindableElementsFactory(_taskItemAsset));
         RegisterInstance(GetValueConverters());
     }
 
diff --git a/samples/Unity.Mvvm.ToDoList/Assets/Scripts/ToDoListBindableElementsFactory.cs b/samples/Unity.Mvvm.ToDoList/Assets/Scripts/ToDoListBindableElementsFactory.cs
@@ -5,24 +5,24 @@
 using UnityMvvmToolkit.UITK;
 using UnityMvvmToolkit.UITK.BindableUIElements;
 
-public class ToDoListBindableElementsWrapper : BindableElementsWrapper
+public class ToDoListBindableElementsFactory : BindableElementsFactory
 {
     private readonly VisualTreeAsset _taskItemAsset;
 
-    public ToDoListBindableElementsWrapper(VisualTreeAsset taskItemAsset)
+    public ToDoListBindableElementsFactory(VisualTreeAsset taskItemAsset)
     {
         _taskItemAsset = taskItemAsset;
     }
 
-    public override IBindableElement Wrap(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
+    public override IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
     {
         return bindableUiElement switch
         {
             BindableScrollView scrollView => new BindableTaskScrollViewWrapper(scrollView, _taskItemAsset, objectProvider),
             BindablePageBlocker pageBlocker => new BindableBinaryStateButtonWrapper(pageBlocker, objectProvider),
             BindableAddTaskButton addTaskButton => new BindableBinaryStateButtonWrapper(addTaskButton, objectProvider),
 
-            _ => base.Wrap(bindableUiElement, objectProvider)
+            _ => base.Create(bindableUiElement, objectProvider)
         };
     }
 }
diff --git a/samples/Unity.Mvvm.ToDoList/Assets/Scripts/ToDoListBindableElementsFactory.cs.meta b/samples/Unity.Mvvm.ToDoList/Assets/Scripts/ToDoListBindableElementsFactory.cs.meta
diff --git a/samples/Unity.Mvvm.ToDoList/Assets/Scripts/Views/BaseView.cs b/samples/Unity.Mvvm.ToDoList/Assets/Scripts/Views/BaseView.cs
@@ -23,9 +23,9 @@ protected override IValueConverter[] GetValueConverters()
             return _appContext.Resolve<IValueConverter[]>();
         }
 
-        protected override IBindableElementsWrapper GetBindableElementsWrapper()
+        protected override IBindableElementsFactory GetBindableElementsFactory()
         {
-            return _appContext.Resolve<IBindableElementsWrapper>();
+            return _appContext.Resolve<IBindableElementsFactory>();
         }
     }
 }
diff --git a/src/UnityMvvmToolkit.Core/Interfaces/IBindableElementsFactory.cs b/src/UnityMvvmToolkit.Core/Interfaces/IBindableElementsFactory.cs
@@ -0,0 +1,7 @@
+﻿namespace UnityMvvmToolkit.Core.Interfaces
+{
+    public interface IBindableElementsFactory
+    {
+        IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider);
+    }
+}
diff --git a/src/UnityMvvmToolkit.Core/Interfaces/IBindableElementsWrapper.cs b/src/UnityMvvmToolkit.Core/Interfaces/IBindableElementsWrapper.cs
diff --git a/src/UnityMvvmToolkit.Core/View.cs b/src/UnityMvvmToolkit.Core/View.cs
@@ -9,19 +9,19 @@ public class View<TBindingContext> : IDisposable where TBindingContext : class,
     {
         private TBindingContext _bindingContext;
         private IObjectProvider _objectProvider;
-        private IBindableElementsWrapper _bindableElementsWrapper;
+        private IBindableElementsFactory _bindableElementsFactory;
 
         private List<IDisposable> _disposables;
         private Dictionary<string, HashSet<IBindablePropertyElement>> _bindablePropertyElements;
 
         public TBindingContext BindingContext => _bindingContext;
 
         public View<TBindingContext> Configure(TBindingContext bindingContext, IObjectProvider objectProvider,
-            IBindableElementsWrapper elementsWrapper)
+            IBindableElementsFactory elementsFactory)
         {
             _bindingContext = bindingContext;
             _objectProvider = objectProvider;
-            _bindableElementsWrapper = elementsWrapper;
+            _bindableElementsFactory = elementsFactory;
 
             _disposables = new List<IDisposable>();
             _bindablePropertyElements = new Dictionary<string, HashSet<IBindablePropertyElement>>();
@@ -41,7 +41,7 @@ public void DisableBinding()
 
         public IBindableElement RegisterBindableElement(IBindableUIElement bindableUiElement, bool updateElementValues)
         {
-            var bindableElement = _bindableElementsWrapper.Wrap(bindableUiElement, _objectProvider);
+            var bindableElement = _bindableElementsFactory.Create(bindableUiElement, _objectProvider);
 
             TryInitialize(bindableElement);
             TryRegisterPropertyElement(bindableElement, updateElementValues);
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/MonoBehaviourView.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Common/MonoBehaviourView.cs
@@ -17,7 +17,7 @@ public abstract class MonoBehaviourView<TBindingContext> : MonoBehaviour
 
         private void Awake()
         {
-            _view = CreateView(GetBindingContext(), GetBindableElementsWrapper());
+            _view = CreateView(GetBindingContext(), GetBindableElementsFactory());
 
             OnInit();
             BindElements();
@@ -39,7 +39,7 @@ private void OnDestroy()
         }
 
         protected abstract void OnInit();
-        protected abstract IBindableElementsWrapper GetBindableElementsWrapper();
+        protected abstract IBindableElementsFactory GetBindableElementsFactory();
         protected abstract IEnumerable<IBindableUIElement> GetBindableUIElements();
 
         protected virtual TBindingContext GetBindingContext()
@@ -64,11 +64,11 @@ protected virtual IObjectProvider GetObjectProvider(TBindingContext bindingConte
         }
 
         private View<TBindingContext> CreateView(TBindingContext bindingContext,
-            IBindableElementsWrapper bindableElementsWrapper)
+            IBindableElementsFactory bindableElementsFactory)
         {
             return new View<TBindingContext>()
                 .Configure(bindingContext, GetObjectProvider(bindingContext, GetValueConverters()),
-                    bindableElementsWrapper);
+                    bindableElementsFactory);
         }
 
         private void BindElements()
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Interfaces/IBindableElementsFactory.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Interfaces/IBindableElementsFactory.cs
@@ -0,0 +1,7 @@
+﻿namespace UnityMvvmToolkit.Core.Interfaces
+{
+    public interface IBindableElementsFactory
+    {
+        IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider);
+    }
+}
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Interfaces/IBindableElementsFactory.cs.meta b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Interfaces/IBindableElementsFactory.cs.meta
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Interfaces/IBindableElementsWrapper.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Interfaces/IBindableElementsWrapper.cs
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/View.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/View.cs
@@ -9,19 +9,19 @@ public class View<TBindingContext> : IDisposable where TBindingContext : class,
     {
         private TBindingContext _bindingContext;
         private IObjectProvider _objectProvider;
-        private IBindableElementsWrapper _bindableElementsWrapper;
+        private IBindableElementsFactory _bindableElementsFactory;
 
         private List<IDisposable> _disposables;
         private Dictionary<string, HashSet<IBindablePropertyElement>> _bindablePropertyElements;
 
         public TBindingContext BindingContext => _bindingContext;
 
         public View<TBindingContext> Configure(TBindingContext bindingContext, IObjectProvider objectProvider,
-            IBindableElementsWrapper elementsWrapper)
+            IBindableElementsFactory elementsFactory)
         {
             _bindingContext = bindingContext;
             _objectProvider = objectProvider;
-            _bindableElementsWrapper = elementsWrapper;
+            _bindableElementsFactory = elementsFactory;
 
             _disposables = new List<IDisposable>();
             _bindablePropertyElements = new Dictionary<string, HashSet<IBindablePropertyElement>>();
@@ -41,7 +41,7 @@ public void DisableBinding()
 
         public IBindableElement RegisterBindableElement(IBindableUIElement bindableUiElement, bool updateElementValues)
         {
-            var bindableElement = _bindableElementsWrapper.Wrap(bindableUiElement, _objectProvider);
+            var bindableElement = _bindableElementsFactory.Create(bindableUiElement, _objectProvider);
 
             TryInitialize(bindableElement);
             TryRegisterPropertyElement(bindableElement, updateElementValues);
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableElementsFactory.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableElementsFactory.cs
@@ -5,9 +5,9 @@
 
 namespace UnityMvvmToolkit.UGUI
 {
-    public class BindableElementsWrapper : IBindableElementsWrapper
+    public class BindableElementsFactory : IBindableElementsFactory
     {
-        public virtual IBindableElement Wrap(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
+        public virtual IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
         {
             return bindableUiElement switch
             {
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableElementsFactory.cs.meta b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/BindableElementsFactory.cs.meta
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/CanvasView.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UGUI/CanvasView.cs
@@ -16,9 +16,9 @@ protected override void OnInit()
             RootElement = gameObject;
         }
 
-        protected override IBindableElementsWrapper GetBindableElementsWrapper()
+        protected override IBindableElementsFactory GetBindableElementsFactory()
         {
-            return new BindableElementsWrapper();
+            return new BindableElementsFactory();
         }
 
         protected override IEnumerable<IBindableUIElement> GetBindableUIElements()
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableElementsFactory.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableElementsFactory.cs
@@ -5,9 +5,9 @@
 
 namespace UnityMvvmToolkit.UITK
 {
-    public class BindableElementsWrapper : IBindableElementsWrapper
+    public class BindableElementsFactory : IBindableElementsFactory
     {
-        public virtual IBindableElement Wrap(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
+        public virtual IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)
         {
             return bindableUiElement switch
             {
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableElementsFactory.cs.meta b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableElementsFactory.cs.meta
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/DocumentView.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/DocumentView.cs
@@ -21,9 +21,9 @@ protected override void OnInit()
             _uiDocument = GetComponent<UIDocument>();
         }
 
-        protected override IBindableElementsWrapper GetBindableElementsWrapper()
+        protected override IBindableElementsFactory GetBindableElementsFactory()
         {
-            return new BindableElementsWrapper();
+            return new BindableElementsFactory();
         }
 
         protected override IEnumerable<IBindableUIElement> GetBindableUIElements()

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void Construct()`
`22`	`22`	`RegisterInstance<IThemeService>(_themeService);`
`23`	`23`	`RegisterInstance(new CounterViewModel());`
`24`	`24`	`RegisterInstance<IDataStoreService>(new DataStoreService(this));`
`25`		`- RegisterInstance<IBindableElementsWrapper>(new CounterBindableElementsWrapper());`
	`25`	`+ RegisterInstance<IBindableElementsFactory>(new CounterBindableElementsFactory());`
`26`	`26`	`RegisterInstance(GetValueConverters());`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`using UnityMvvmToolkit.Core.Interfaces;`
`4`	`4`	`using UnityMvvmToolkit.UITK;`
`5`	`5`
`6`		`-public class CounterBindableElementsWrapper : BindableElementsWrapper`
	`6`	`+public class CounterBindableElementsFactory : BindableElementsFactory`
`7`	`7`	`{`
`8`		`- public override IBindableElement Wrap(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)`
	`8`	`+ public override IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)`
`9`	`9`	`{`
`10`	`10`	`return bindableUiElement switch`
`11`	`11`	`{`
`@@ -14,7 +14,7 @@ public override IBindableElement Wrap(IBindableUIElement bindableUiElement, IObj`
`14`	`14`	`BindableThemeSwitcher themeSwitcher => new BindableThemeSwitcherWrapper(themeSwitcher, objectProvider),`
`15`	`15`	`BindableAnimationLabel animationLabel => new BindableAnimationLabelWrapper(animationLabel, objectProvider),`
`16`	`16`
`17`		`- _ => base.Wrap(bindableUiElement, objectProvider)`
	`17`	`+ _ => base.Create(bindableUiElement, objectProvider)`
`18`	`18`	`};`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ protected override IValueConverter[] GetValueConverters()`
`29`	`29`	`return _appContext.Resolve<IValueConverter[]>();`
`30`	`30`	`}`
`31`	`31`
`32`		`- protected override IBindableElementsWrapper GetBindableElementsWrapper()`
	`32`	`+ protected override IBindableElementsFactory GetBindableElementsFactory()`
`33`	`33`	`{`
`34`		`- return _appContext.Resolve<IBindableElementsWrapper>();`
	`34`	`+ return _appContext.Resolve<IBindableElementsFactory>();`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void Construct()`
`31`	`31`	`RegisterInstance(new AddTaskDialogViewModel(this));`
`32`	`32`
`33`	`33`	`RegisterInstance<IDataStoreService>(new DataStoreService(this));`
`34`		`- RegisterInstance<IBindableElementsWrapper>(new ToDoListBindableElementsWrapper(_taskItemAsset));`
	`34`	`+ RegisterInstance<IBindableElementsFactory>(new ToDoListBindableElementsFactory(_taskItemAsset));`
`35`	`35`	`RegisterInstance(GetValueConverters());`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -5,24 +5,24 @@`
`5`	`5`	`using UnityMvvmToolkit.UITK;`
`6`	`6`	`using UnityMvvmToolkit.UITK.BindableUIElements;`
`7`	`7`
`8`		`-public class ToDoListBindableElementsWrapper : BindableElementsWrapper`
	`8`	`+public class ToDoListBindableElementsFactory : BindableElementsFactory`
`9`	`9`	`{`
`10`	`10`	`private readonly VisualTreeAsset _taskItemAsset;`
`11`	`11`
`12`		`- public ToDoListBindableElementsWrapper(VisualTreeAsset taskItemAsset)`
	`12`	`+ public ToDoListBindableElementsFactory(VisualTreeAsset taskItemAsset)`
`13`	`13`	`{`
`14`	`14`	`_taskItemAsset = taskItemAsset;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public override IBindableElement Wrap(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)`
	`17`	`+ public override IBindableElement Create(IBindableUIElement bindableUiElement, IObjectProvider objectProvider)`
`18`	`18`	`{`
`19`	`19`	`return bindableUiElement switch`
`20`	`20`	`{`
`21`	`21`	`BindableScrollView scrollView => new BindableTaskScrollViewWrapper(scrollView, _taskItemAsset, objectProvider),`
`22`	`22`	`BindablePageBlocker pageBlocker => new BindableBinaryStateButtonWrapper(pageBlocker, objectProvider),`
`23`	`23`	`BindableAddTaskButton addTaskButton => new BindableBinaryStateButtonWrapper(addTaskButton, objectProvider),`
`24`	`24`
`25`		`- _ => base.Wrap(bindableUiElement, objectProvider)`
	`25`	`+ _ => base.Create(bindableUiElement, objectProvider)`
`26`	`26`	`};`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ protected override IValueConverter[] GetValueConverters()`
`23`	`23`	`return _appContext.Resolve<IValueConverter[]>();`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected override IBindableElementsWrapper GetBindableElementsWrapper()`
	`26`	`+ protected override IBindableElementsFactory GetBindableElementsFactory()`
`27`	`27`	`{`
`28`		`- return _appContext.Resolve<IBindableElementsWrapper>();`
	`28`	`+ return _appContext.Resolve<IBindableElementsFactory>();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`