Merge pull request #4 from kekchpek/develop

Fix ability to specify same types for views; update test project
kekchpek · Feb 26, 2024 · cbd63f6 · cbd63f6
2 parents 693ade8 + c1e8476
commit cbd63f6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/DemoUnityProj/CCG/Assets/Code/Core/CoreInstaller.cs b/DemoUnityProj/CCG/Assets/Code/Core/CoreInstaller.cs
@@ -48,6 +48,8 @@ public override void InstallBindings()
                 () => Resources.Load<GameObject>("Prefabs/Views/LoadingPopup"));
             Container.InstallView<CoolPopupView, ICoolPopupViewModel, CoolPopupViewModel>(ViewNames.CoolPopup, 
                 () => Resources.Load<GameObject>("Prefabs/Views/CoolPopup/CoolPopup"));
+            Container.InstallView<CoolPopupView, ICoolPopupViewModel, CoolPopupViewModel>(ViewNames.SameCoolPopupButWithOtherName, 
+                () => Resources.Load<GameObject>("Prefabs/Views/CoolPopup/CoolPopup"));
             Container.InstallView<TimeCounterView, ITimeCounterViewModel, TimeCounterViewModel>();
 
             Container.Install<ImageSystemInstaller>();

diff --git a/DemoUnityProj/CCG/Assets/Code/Core/ViewNames.cs b/DemoUnityProj/CCG/Assets/Code/Core/ViewNames.cs
@@ -10,5 +10,6 @@ public static class ViewNames
         public static string HandController => "HandController";
         public static string LoadingPopup => "LoadingPopup";
         public static string CoolPopup => "CoolPopup";
+        public static string SameCoolPopupButWithOtherName => "CoolPopup2";
     }
 }
diff --git a/DemoUnityProj/CCG/Assets/Code/MVVM/MainScreen/ViewModel/MainScreenViewModel.cs b/DemoUnityProj/CCG/Assets/Code/MVVM/MainScreen/ViewModel/MainScreenViewModel.cs
@@ -69,7 +69,7 @@ private void IntiGame()
 
         public void OnPopupButtonClicked()
         {
-            _viewManager.Open(ViewLayerIds.Popup, ViewNames.CoolPopup, new CoolPopupPayload(false))
+            _viewManager.Open(ViewLayerIds.Popup, ViewNames.SameCoolPopupButWithOtherName, new CoolPopupPayload(false))
                 .OnFail(Debug.LogException);
         }
 

diff --git a/DemoUnityProj/CCG/Assets/Libs/UnityMVVM.dll b/DemoUnityProj/CCG/Assets/Libs/UnityMVVM.dll
diff --git a/DemoUnityProj/QuickStartUnityMVVM/Assets/Libs/UnityMVVM.dll b/DemoUnityProj/QuickStartUnityMVVM/Assets/Libs/UnityMVVM.dll
diff --git a/src/UnityMVVM/DI/DiContainerExtensions.cs b/src/UnityMVVM/DI/DiContainerExtensions.cs
@@ -177,7 +177,7 @@ private static void InstallViewInternal<TView, TViewModel, TViewModelImpl>(DiCon
                 .Bind<IViewModelsFactory>()
                 .WithId(viewName)
                 .To<ViewModelsFactory<TView>>()
-                .AsSingle()
+                .AsTransient()
                 .WithArgumentsExplicit(new []
                 {
                     new TypeValuePair(typeof(Func<GameObject>), viewPrefabGetter),