Change task item template binding logic.

Author: ChebanovDD

samples/Unity.Mvvm.ToDoList/Assets/Scripts/AppContext.cs

@@ -22,18 +22,18 @@ public void Construct()
     {
         _disposables = new List<IDisposable>();
         _registeredTypes = new Dictionary<Type, object>();
-        
+
         RegisterInstance(_addTaskView);
-        
+
         RegisterInstance(new TaskBroker());
         RegisterInstance<IDialogsService>(new DialogsService(this));
 
-        RegisterInstance(new MainViewModel(this, _taskItemAsset));
+        RegisterInstance(new MainViewModel(this));
         RegisterInstance(new AddTaskDialogViewModel(this));
-        
+
         RegisterInstance<IDataStoreService>(new DataStoreService(this));
-        // RegisterInstance<IBindableElementsFactory>(new ToDoListBindableElementsFactory(_taskItemAsset));
         RegisterInstance(GetValueConverters());
+        RegisterInstance(GetCollectionItemTemplates());
     }
 
     public T Resolve<T>()
@@ -71,4 +71,12 @@ private IValueConverter[] GetValueConverters()
             new IntToStrConverter()
         };
     }
+
+    private IReadOnlyDictionary<Type, object> GetCollectionItemTemplates()
+    {
+        return new Dictionary<Type, object>
+        {
+            { typeof(TaskItemViewModel), _taskItemAsset }
+        };
+    }
 }

samples/Unity.Mvvm.ToDoList/Assets/Scripts/ViewModels/MainViewModel.cs

@@ -11,7 +11,6 @@
 using Extensions;
 using Interfaces;
 using Interfaces.Services;
-using UnityEngine.UIElements;
 using UnityMvvmToolkit.Common.Interfaces;
 using UnityMvvmToolkit.Core;
 using UnityMvvmToolkit.Core.Interfaces;
@@ -32,7 +31,7 @@ public class MainViewModel : IBindingContext, IDisposable
 
         private readonly IReadOnlyProperty<ObservableCollection<TaskItemViewModel>> _taskItems;
 
-        public MainViewModel(IAppContext appContext, VisualTreeAsset taskItemTemplate)
+        public MainViewModel(IAppContext appContext)
         {
             _dialogsService = appContext.Resolve<IDialogsService>();
 
@@ -48,8 +47,6 @@ public MainViewModel(IAppContext appContext, VisualTreeAsset taskItemTemplate)
 
             _isAddTaskDialogActive = new ObservableProperty<bool>();
 
-            TaskItemTemplate = new ObservableProperty<VisualTreeAsset>(taskItemTemplate);
-
             SubscribeOnTaskAddMessage(appContext.Resolve<TaskBroker>()).Forget();
         }
 
@@ -58,8 +55,6 @@ public MainViewModel(IAppContext appContext, VisualTreeAsset taskItemTemplate)
         public int CompletedTasks => _completedTasks.Value;
         public IReadOnlyCollection<TaskItemViewModel> TaskItems => _taskItems.Value;
 
-        public IReadOnlyProperty<VisualTreeAsset> TaskItemTemplate { get; }
-
         public bool IsAddTaskDialogActive
         {
             get => _isAddTaskDialogActive.Value;

samples/Unity.Mvvm.ToDoList/Assets/Scripts/Views/BaseView.cs

@@ -1,4 +1,6 @@
-using Interfaces;
+using System;
+using System.Collections.Generic;
+using Interfaces;
 using UnityEngine;
 using UnityMvvmToolkit.Core.Interfaces;
 using UnityMvvmToolkit.UITK;
@@ -11,7 +13,7 @@ public class BaseView<TBindingContext> : DocumentView<TBindingContext>
         [SerializeField] private AppContext _appContext;
 
         protected IAppContext AppContext => _appContext;
-        
+
         protected override TBindingContext GetBindingContext()
         {
             return _appContext.Resolve<TBindingContext>();
@@ -21,5 +23,10 @@ protected override IValueConverter[] GetValueConverters()
         {
             return _appContext.Resolve<IValueConverter[]>();
         }
+
+        protected override IReadOnlyDictionary<Type, object> GetCollectionItemTemplates()
+        {
+            return _appContext.Resolve<IReadOnlyDictionary<Type, object>>();
+        }
     }
 }