Fix decorating error with dependencies bound with FastBind()

.github/workflows/publish.yml

@@ -6,6 +6,8 @@ on:
      - 'master'
      - 'develop'
      - 'release/*'
+     - 'feature/*'
+     - 'fix/*'
 
 jobs:
   build:
@@ -36,6 +38,11 @@ jobs:
         then
         git remote set-url origin https://$RUNNER_USERNAME:$PAT_TOKEN@${REPO_URL:6}
         CURRENT_TAG_VERSION=$(python3 getVersion.py ./VERSION $UMVVM_BUILD_DATA_PATH/buildVersionV1.txt)
+        CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+        if [[ $CURRENT_BRANCH == feature* || $CURRENT_BRANCH == fix* ]]; 
+        then
+        CURRENT_TAG_VERSION=$CURRENT_TAG_VERSION-raw
+        fi
         git tag $CURRENT_TAG_VERSION
         git push origin --tags
         fi

MvvmUnityProj/CCG/Assets/Code/Core/CoreInstaller.cs

@@ -1,4 +1,5 @@
 using CCG.Core.Camera;
+using CCG.Core.CustomViewManager;
 using CCG.Core.Installers;
 using CCG.Core.Screen;
 using CCG.Models.Hand.Model;
@@ -21,6 +22,7 @@
 using SurvivedWarrior.MVVM.Models.Time;
 using UnityEngine;
 using UnityMVVM.DI;
+using UnityMVVM.ViewManager;
 using UnityMVVM.ViewModelCore;
 using Zenject;
 
@@ -30,6 +32,9 @@ public class CoreInstaller : Installer
     {
         public override void InstallBindings()
         {
+
+            Container.Decorate<IViewManager>().With<LogViewManagerDecorator>();
+
             Container.InstallPoolableView<MainScreenView, IMainScreenViewModel, MainScreenViewModel>(ViewNames.MainScreen,
                 () => Resources.Load<GameObject>("Prefabs/Views/MainScreenView"));
             Container.InstallView<MainScreen3dView, IViewModel, ViewModel>(ViewNames.MainScreen3d,

MvvmUnityProj/CCG/Assets/Code/Core/CustomViewManager/LogViewManagerDecorator.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using AsyncReactAwait.Bindable;
+using AsyncReactAwait.Promises;
+using UnityEngine;
+using UnityMVVM.ViewManager;
+using UnityMVVM.ViewManager.ViewLayer;
+using UnityMVVM.ViewModelCore;
+
+namespace CCG.Core.CustomViewManager
+{
+    public class LogViewManagerDecorator : IViewManager
+    {
+
+        public event Action<(string layerId, string viewName, IPayload viewPayload)> ViewOpened
+        {
+            add => _viewManager.ViewOpened += value;
+            remove => _viewManager.ViewOpened -= value;
+        }
+
+        public event Action<(string layerId, string viewName)> ViewClosedImplicitly
+        {
+            add => _viewManager.ViewClosedImplicitly += value;
+            remove => _viewManager.ViewClosedImplicitly -= value;
+        }
+
+        private readonly IViewManager _viewManager;
+
+        public IBindable<string> HighestBusyLayer => _viewManager.HighestBusyLayer;
+
+        public LogViewManagerDecorator(IViewManager viewManager)
+        {
+            _viewManager = viewManager;
+        }
+
+        public IReadOnlyList<string> GetLayerIds() => _viewManager.GetLayerIds();
+
+        public IViewModel Create(IViewModel parent, string viewName, Transform container, IPayload payload = null)
+        {
+            Debug.Log("View was created!");
+            return _viewManager.Create(parent, viewName, container, payload);
+        }
+
+        public IPromise<IViewModel> Open(string viewLayerId, string viewName, IPayload payload = null)
+        {
+            Debug.Log("View was opened!");
+            return _viewManager.Open(viewLayerId, viewName, payload);
+        }
+
+        public IPromise OpenExact(string viewLayerId, string viewName, IPayload payload = null)
+        {
+            Debug.Log("View was opened on exact layer!");
+            return _viewManager.OpenExact(viewLayerId, viewName, payload);
+        }
+
+        public IPromise CloseExact(string viewLayerId)
+        {
+            Debug.Log("View was closed on exact layer!");
+            return _viewManager.CloseExact(viewLayerId);
+        }
+
+        public IPromise Close(string viewLayerId)
+        {
+            Debug.Log("View was closed!");
+            return _viewManager.Close(viewLayerId);
+        }
+
+        public string GetViewName(string viewLayerId)
+        {
+            Debug.Log("View name was got!");
+            return _viewManager.GetViewName(viewLayerId);
+        }
+
+        public IViewLayer GetLayer(string viewLayerId)
+        {
+            Debug.Log("Layer was got!");
+            return _viewManager.GetLayer(viewLayerId);
+        }
+
+        public IViewModel GetView(string viewLayerId)
+        {
+            Debug.Log("View was got!");
+            return _viewManager.GetView(viewLayerId);
+        }
+    }
+}

src/UnityMVVM/DI/DiContainerExtensions.cs

@@ -358,7 +358,7 @@ public static void FastBind<TImpl>(this DiContainer container, IReadOnlyCollecti
                 commonAccessInterfaces = modelAccessInterfaces;
             }
             env.ViewsModelsContainerAdapter.Container.Bind(commonAccessInterfaces)
-                .FromMethod<TImpl>(_ => (TImpl)container.Resolve(modelAccessInterfaces.First())).AsSingle();
+                .FromMethodUntyped(_ => container.Resolve(modelAccessInterfaces.First())).AsSingle();
         }
 
         /// <summary>