Merge pull request #33 from UnioGame/feature/ui-toolkit-support

Feature/UI toolkit support
UnioGame · Mar 17, 2023 · 65ca1dc · 65ca1dc
2 parents e1b598e + 13560cc
commit 65ca1dc
Show file tree

Hide file tree

Showing 166 changed files with 3,605 additions and 662 deletions.
diff --git a/Assets/Settings/ViewSystemSettings.asset b/Assets/Settings/ViewSystemSettings.asset
@@ -23,7 +23,7 @@ MonoBehaviour:
   addressableGroupName: 
   sources: []
   layoutFlow: {fileID: 11400000, guid: c22cfe04dc8dc9e43b8b9b36576fab63, type: 2}
-  viewModelResolvers:
+  viewModelResolver:
     modelFactoryTimeoutMs: 500
     modelResolvers: []
   references:

diff --git a/Editor/Assets/View Model Resolver.asset b/Editor/Assets/View Model Resolver.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 704e8248ced7d3f4da0354ef06dd8e1d, type: 3}
+  m_Name: View Model Resolver
+  m_EditorClassIdentifier: 
+  modelProviders:
+  - value:
+      rid: 6782068358873612332
+    assetValue: {fileID: 0}
+  references:
+    version: 2
+    RefIds:
+    - rid: 6782068358873612332
+      type: {class: DefaultConstructorViewModelFactory, ns: UniGame.ViewSystem.Runtime,
+        asm: unigame.viewsystem.runtime}
diff --git a/Editor/Assets/View Model Resolver.asset.meta b/Editor/Assets/View Model Resolver.asset.meta
diff --git a/Editor/Assets/ViewSystemEditorSettings.asset b/Editor/Assets/ViewSystemEditorSettings.asset
@@ -13,7 +13,10 @@ MonoBehaviour:
   m_Name: ViewSystemEditorSettings
   m_EditorClassIdentifier: 
   prototypeFolder: {fileID: 102900000, guid: 3c8989b1f4edac6479cba3f1ca6742f2, type: 3}
-  viewSystemSettingsAsset: {fileID: 11400000, guid: 34e95cd46455c054faf02eb8a96b0270, type: 2}
-  viewPrefab: {fileID: 7387079578667170277, guid: cbb186b66f51e0844a835be6e43d55e6, type: 3}
+  viewSystemSettingsAsset: {fileID: 11400000, guid: 34e95cd46455c054faf02eb8a96b0270,
+    type: 2}
+  viewPrefab: {fileID: 7387079578667170277, guid: cbb186b66f51e0844a835be6e43d55e6,
+    type: 3}
+  viewModelFactory: {fileID: 11400000, guid: 20f709556179e1d429e0cb352e944f70, type: 2}
   defaultFlowAsset: {fileID: 11400000, guid: c22cfe04dc8dc9e43b8b9b36576fab63, type: 2}
   defaultLayoutType: {fileID: 11400000, guid: 3b063ea60dca1d6449cc6838450bbf68, type: 2}
diff --git a/Editor/Tests/ViewSelectionTests.cs b/Editor/Tests/ViewSelectionTests.cs
@@ -1,11 +1,11 @@
-namespace Taktika.Tests.UnitTests.Editor.ViewSystem
+namespace UniGame.Tests.UnitTests.Editor.ViewSystem
 {
     using System.Collections.Generic;
     using UniGame.UiSystem.Runtime.Settings;
     using NUnit.Framework;
     using UniGame.UiSystem.Runtime;
-    using UniModules.UniGame.Core.Runtime.SerializableType;
-    using UniModules.UniGame.ViewSystem.Runtime.ContextFlow;
+    using UniGame.Core.Runtime.SerializableType;
+    using UniGame.ViewSystem.Runtime;
     using UnityEngine.AddressableAssets;
 
     public class ViewSelectionTests

diff --git a/Editor/ViewEditor/BuildViewSettingsData.cs b/Editor/ViewEditor/BuildViewSettingsData.cs
@@ -5,11 +5,11 @@
 using UniGame.UiSystem.Runtime.Settings;
 using UniModules.Editor;
 using UniModules.UniGame.AddressableExtensions.Editor;
-using UniModules.UniGame.UISystem.Runtime.Abstract;
+using UniGame.ViewSystem.Runtime;
 using UnityEditor;
 using UnityEngine;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
     public class BuildViewSettingsData : IViewAssemblerCommand
     {
@@ -82,12 +82,10 @@ public UiViewReference CreateViewReference(IView view, bool defaultView,bool ove
             }
 
             var viewType = view.GetType();
-            var viewInterface = viewType.GetInterfaces()
-                .FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == ViewSystemConstants.BaseViewType);
 
-            var modelsArgs = viewInterface.GetGenericArguments();
-            var modelType = modelsArgs.FirstOrDefault();
-            var viewModelType = ViewModelsAssemblyMap.GetFirstAssignable(modelType);
+            var modelType = ViewSystemUtils.GetModelTypeByView(viewType);
+
+            var viewModelType = ViewSystemUtils.GetFirstAssignable(modelType);
 
             var viewDescription = new UiViewReference()
             {

diff --git a/Editor/ViewEditor/IViewAssemblerCommand.cs b/Editor/ViewEditor/IViewAssemblerCommand.cs
@@ -1,7 +1,7 @@
 using UniGame.UiSystem.Runtime.Settings;
-using UniModules.UniGame.Core.Runtime.Interfaces;
+using UniGame.Core.Runtime;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
     public interface IViewAssemblerCommand : ICommand<ViewsSettings, bool>, IResetable
     {

diff --git a/Editor/ViewEditor/UiViewsEditor.cs b/Editor/ViewEditor/UiViewsEditor.cs
@@ -2,7 +2,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
 #if !ODIN_INSPECTOR
     [CustomEditor(typeof(ViewsSettings),editorForChildClasses:true)]

diff --git a/Editor/ViewEditor/ValidateSettingsCommand.cs b/Editor/ViewEditor/ValidateSettingsCommand.cs
@@ -1,6 +1,6 @@
 using UniGame.UiSystem.Runtime.Settings;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
     public class ValidateSettingsCommand : IViewAssemblerCommand
     {

diff --git a/Editor/ViewEditor/ViewAssembler.cs b/Editor/ViewEditor/ViewAssembler.cs
@@ -1,6 +1,6 @@
 using UniModules.UniCore.Runtime.DataFlow;
-using UniModules.UniGame.Core.Runtime.DataFlow.Interfaces;
-using UniModules.UniGame.ViewSystem.Editor.UiEditor;
+using UniGame.Core.Runtime;
+using UniModules.UniGame.ViewSystem;
 using UniRx;
 
 namespace UniGame.UiSystem.UI.Editor.UiEdito

diff --git a/Editor/ViewEditor/ViewCleanerCommand.cs b/Editor/ViewEditor/ViewCleanerCommand.cs
@@ -1,6 +1,6 @@
 using UniGame.UiSystem.Runtime.Settings;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
     public class ViewCleanerCommand  :IViewAssemblerCommand
     {

diff --git a/Editor/ViewEditor/ViewContextMapSettingsEditor.cs b/Editor/ViewEditor/ViewContextMapSettingsEditor.cs
@@ -1,7 +1,7 @@
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
-    using UniModules.UniGame.ViewSystem.Runtime.ContextFlow;
+    using global::UniGame.ViewSystem.Runtime;
     using UnityEditor;
     using UnityEngine;
 

diff --git a/Editor/ViewEditor/ViewSystemEditorSettings.cs b/Editor/ViewEditor/ViewSystemEditorSettings.cs
@@ -3,10 +3,11 @@
 using UniGame.UiSystem.Runtime.ViewsFlow;
 using UniModules.Editor;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
     using System;
     using System.Collections.Generic;
+    using global::UniGame.ViewSystem.Runtime;
     using UniModules.Editor;
     using UniModules.UniGame.Core.Runtime.Attributes;
     using UniModules.UniGame.UISystem.Runtime.WindowStackControllers.Abstract;
@@ -18,13 +19,14 @@ namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
     [CreateAssetMenu(menuName = "UniGame/ViewSystem/Editor/Editor Template ViewSystemSettings",fileName = nameof(ViewSystemEditorSettings))]
     public class ViewSystemEditorSettings : ScriptableObject
     {
-
         public Object prototypeFolder;
 
         public ViewSystemSettings viewSystemSettingsAsset;
 
         public GameObject viewPrefab;
 
+        public ViewModelResolverSettings viewModelResolver;
+
 #if ODIN_INSPECTOR
         [Sirenix.OdinInspector.ValueDropdown(nameof(GetFlowTypes))]
 #endif
@@ -63,11 +65,10 @@ public static ViewSystemEditorSettings ViewEditorSettings
         public static void CreateViewSystemPrefab()
         {
             var activeObject = Selection.activeObject;
-            if (!activeObject)
-                return;
+            if (!activeObject) return;
 
             var path = AssetDatabase.GetAssetPath(activeObject);
-            path.GetDirectoryPath();
+            path = path.GetDirectoryPath();
 
             Debug.Log($"ASSET PATH SELECTION :  {path}");
 
@@ -78,7 +79,7 @@ public static void CreateViewAssets(string path)
         {
             var viewSystemPrefab = ViewEditorSettings.viewPrefab;
             var settings = ViewEditorSettings.viewSystemSettingsAsset;
-            
+
             var view = viewSystemPrefab.CopyAsset<GameViewSystemAsset>(viewSystemPrefab.name,path);
             var settingsAsset = settings.CopyAsset<ViewSystemSettings>(settings.name, path);
 

diff --git a/Editor/ViewEditor/ViewsAssemblyBuilder.cs b/Editor/ViewEditor/ViewsAssemblyBuilder.cs
@@ -2,19 +2,19 @@
 using UniGame.UiSystem.Runtime.Settings;
 using UniModules.Editor;
 
-namespace UniModules.UniGame.ViewSystem.Editor.UiEditor
+namespace UniModules.UniGame.ViewSystem
 {
     using System;
     using System.Collections.Generic;
     using global::UniGame.ViewSystem.Editor.EditorAssets;
     using UniModules.Editor;
-    using Runtime.ContextFlow;
+    using global::UniGame.ViewSystem.Runtime;
     using UnityEditor.AddressableAssets;
     using UnityEditor.AddressableAssets.Settings;
 
     public class ViewsAssemblyBuilder
     {
-        private List<ViewModelResolverSettings> contextViewsMapSettings = new List<ViewModelResolverSettings>();
+        private List<ViewModelResolver> contextViewsMapSettings = new List<ViewModelResolver>();
         private AddressableAssetSettings addressableAssetSettings;
         private List<Action> rebuildCommands;
         private List<IViewAssemblerCommand> rebuildSettingsCommands;

diff --git a/Editor/unigame.uisystem.editor.asmdef → Editor/unigame.viewsystem.editor.asmdef b/Editor/unigame.uisystem.editor.asmdef → Editor/unigame.viewsystem.editor.asmdef
@@ -1,9 +1,8 @@
 {
-    "name": "unigame.uisystem.editor",
+    "name": "unigame.viewsystem.editor",
     "rootNamespace": "",
     "references": [
         "GUID:5c6e9aa738dad73448283eae914b6a8c",
-        "GUID:4ebedaede1566e6468edf5f6a097b593",
         "GUID:6632c725b5599b14c865359e6ecc36f4",
         "GUID:8e4577c9194c10845984cf27eb974fd1",
         "GUID:2796129a6c23eb84a8181f62bf7332f1",

diff --git a/Editor/unigame.uisystem.editor.asmdef.meta → Editor/unigame.viewsystem.editor.asmdef.meta b/Editor/unigame.uisystem.editor.asmdef.meta → Editor/unigame.viewsystem.editor.asmdef.meta
diff --git a/ModelViews/Editor/ModelViewsEditorCommands.cs b/ModelViews/Editor/ModelViewsEditorCommands.cs
@@ -3,8 +3,8 @@
 using UniGame.UiSystem.Runtime;
 using UniModules.UniCore.Runtime.ReflectionUtils;
 using UniModules.Editor;
-using UniModules.UniGame.UISystem.Runtime.Abstract;
-using UniModules.UniGame.ViewSystem.Editor.UiEditor;
+using UniGame.ViewSystem.Runtime;
+using UniModules.UniGame.ViewSystem;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/ModelViews/Editor/PostProcessors/UpdateModelViewsSettingsProcessor.cs b/ModelViews/Editor/PostProcessors/UpdateModelViewsSettingsProcessor.cs
@@ -10,7 +10,7 @@ namespace UniGame.UiSystem.ModelViews.Editor.PostProcessors
     using UniModules.UniCore.Runtime.ReflectionUtils;
     using UniModules.UniCore.Runtime.Utils;
     using UniModules.Editor;
-    using UniModules.UniGame.UISystem.Runtime.Abstract;
+    using ViewSystem.Runtime;
     using UnityEditor;
 
     public class UpdateModelViewsSettingsProcessor : AssetModificationProcessor

diff --git a/ModelViews/Editor/unigame.uisystem.modelsviewsmodule.editor.asmdef b/ModelViews/Editor/unigame.uisystem.modelsviewsmodule.editor.asmdef
@@ -1,13 +1,15 @@
 {
     "name": "unigame.uisystem.modelsviewsmodule.runtime",
+    "rootNamespace": "",
     "references": [
         "GUID:ab7c9c40a6be6334eb67c4e332935e6a",
         "GUID:9f8e6b2872ac2ca4683e584b9ba21f29",
         "GUID:0a6c1794e4ebd1a43b1a79f2d16f1cec",
         "GUID:6632c725b5599b14c865359e6ecc36f4",
         "GUID:8e4577c9194c10845984cf27eb974fd1",
         "GUID:2796129a6c23eb84a8181f62bf7332f1",
-        "GUID:2bd4bfcbafd5d854bb5049e1ec96cd04"
+        "GUID:2bd4bfcbafd5d854bb5049e1ec96cd04",
+        "GUID:7aa076d38fb14aa448159faea36ca289"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/ModelViews/Runtime/Abstract/IModelViewsSettings.cs b/ModelViews/Runtime/Abstract/IModelViewsSettings.cs
@@ -2,7 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
-    using UniModules.UniGame.Core.Runtime.SerializableType;
+    using Core.Runtime.SerializableType;
 
     public interface IModelViewsSettings
     {

diff --git a/ModelViews/Runtime/Abstract/IViewHandle.cs b/ModelViews/Runtime/Abstract/IViewHandle.cs
@@ -1,9 +1,9 @@
 namespace UniGame.UiSystem.ModelViews.Runtime.Flow
 {
     using System;
-    using UniModules.UniGame.Core.Runtime.Interfaces;
+    using Core.Runtime;
     using UniModules.UniGame.UISystem.Runtime;
-    using UniModules.UniGame.UISystem.Runtime.Abstract;
+    using ViewSystem.Runtime;
     using UniRx;
 
     public interface IViewHandle : 

diff --git a/ModelViews/Runtime/Flow/FlowCommands.cs b/ModelViews/Runtime/Flow/FlowCommands.cs
@@ -1,9 +1,7 @@
-using UnityEngine;
-
-namespace UniGame.UiSystem.ModelViews.Runtime.Flow
+namespace UniGame.UiSystem.ModelViews.Runtime.Flow
 {
     using System;
-    using UniModules.UniGame.UISystem.Runtime.Abstract;
+    using ViewSystem.Runtime;
 
 
     public static class FlowCommands 

diff --git a/ModelViews/Runtime/Flow/ModelsViewsFlow.cs b/ModelViews/Runtime/Flow/ModelsViewsFlow.cs
@@ -5,11 +5,10 @@
     using System.Linq;
     using Cysharp.Threading.Tasks;
     using ModelViewsMap.Runtime.Settings;
-    using UiSystem.Runtime;
-    using UniModules.UniCore.Runtime.ObjectPool.Runtime.Extensions;
+    using UniGame.Runtime.ObjectPool.Extensions;
     using UniModules.UniGame.UiSystem.Runtime;
     using UniModules.UniGame.UISystem.Runtime;
-    using UniModules.UniGame.UISystem.Runtime.Abstract;
+    using ViewSystem.Runtime;
     using UniRx;
 
 

diff --git a/ModelViews/Runtime/ModelViewsSystem.cs b/ModelViews/Runtime/ModelViewsSystem.cs
@@ -1,9 +1,6 @@
-using UnityEngine;
-
-namespace UniGame.ModelViewsMap.Runtime
+namespace UniGame.ModelViewsMap.Runtime
 {
-    using UiSystem.Runtime;
-    using UniModules.UniGame.UISystem.Runtime.Abstract;
+    using ViewSystem.Runtime;
 
     public class ModelViewsSystem 
     {

diff --git a/ModelViews/Runtime/RxExtensions/RxViewHandle.cs b/ModelViews/Runtime/RxExtensions/RxViewHandle.cs
@@ -2,9 +2,7 @@
 {
     using System;
     using Flow;
-    using UniModules.UniGame.UiSystem.Runtime;
     using UniModules.UniGame.UISystem.Runtime;
-    using UniRx;
 
     public static class RxViewHandle 
     {

diff --git a/ModelViews/Runtime/Settings/ModelViewsModuleSettings.cs b/ModelViews/Runtime/Settings/ModelViewsModuleSettings.cs
@@ -1,4 +1,5 @@
-using UniModules.UniGame.AddressableTools.Runtime.Extensions;
+using UniGame.AddressableTools.Runtime;
+using UniGame.Context.Runtime;
 using UnityEngine;
 
 namespace UniGame.ModelViewsMap.Runtime.Settings
@@ -7,19 +8,17 @@ namespace UniGame.ModelViewsMap.Runtime.Settings
     using System.Collections.Generic;
     using System.Linq;
     using Cysharp.Threading.Tasks;
-    using Taktika.GameRuntime.Types;
+    using GameRuntime.Types;
     using UiSystem.ModelViews.Runtime.Flow;
-    using UiSystem.Runtime;
-    using UniModules.UniCore.Runtime.Attributes;
-    using UniModules.UniGame.Core.Runtime.SerializableType;
-    using UniModules.UniGame.Context.Runtime.Abstract;
-    using UniModules.UniGame.Core.Runtime.Interfaces;
-    using UniModules.UniGame.UISystem.Runtime.Abstract;
-    using UniModules.UniGame.UISystem.Runtime.DataSources;
+    using UniCore.Runtime.Attributes;
+    using Core.Runtime.SerializableType;
+    using Core.Runtime;
+    using ViewSystem.Runtime;
+    using ViewSystem.Runtime.DataSources;
 
 
     [CreateAssetMenu(menuName = "UniGame/ViewSystem/ModelViewsModuleSettings", fileName = "ModelViewsModuleSettings")]
-    public class ModelViewsModuleSettings : AsyncContextDataSource, IModelViewsSettings
+    public class ModelViewsModuleSettings : AsyncSource, IModelViewsSettings
     {
         private static List<SType> _emptyList = new List<SType>();
 

diff --git a/ModelViews/Runtime/Sources/ViewModelSystemSource.cs b/ModelViews/Runtime/Sources/ViewModelSystemSource.cs
@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 
 public class ViewModelSystemSource : MonoBehaviour
 {