ChainSafe · rob1997 · Aug 29, 2024 · Aug 27, 2024 · Aug 27, 2024 · Aug 27, 2024
diff --git a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Resources.meta b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Resources.meta
diff --git a/...ges/io.chainsafe.web3-unity.hyperplay/Runtime/Resources/HyperPlayConnectionProvider.asset b/...ges/io.chainsafe.web3-unity.hyperplay/Runtime/Resources/HyperPlayConnectionProvider.asset
diff --git a/...o.chainsafe.web3-unity.hyperplay/Runtime/Resources/HyperPlayConnectionProvider.asset.meta b/...o.chainsafe.web3-unity.hyperplay/Runtime/Resources/HyperPlayConnectionProvider.asset.meta
diff --git a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Scripts/HyperPlayConnectionProvider.cs b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Scripts/HyperPlayConnectionProvider.cs
@@ -5,6 +5,7 @@
 using ChainSafe.Gaming.Web3.Build;
 using ChainSafe.Gaming.Web3.Evm.Wallet;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace ChainSafe.Gaming.HyperPlay
 {
@@ -14,6 +15,9 @@ namespace ChainSafe.Gaming.HyperPlay
     [CreateAssetMenu(menuName = "ChainSafe/Connection Provider/HyperPlay", fileName = nameof(HyperPlayConnectionProvider))]
     public class HyperPlayConnectionProvider : RestorableConnectionProvider
     {
+        [field: SerializeField, DefaultAssetValue("Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Prefabs/HyperPlayRow.prefab")]
+        public override Button ConnectButtonRow { get; protected set; }
+
         public override bool IsAvailable => Application.isEditor || !Application.isMobilePlatform;
 
         private bool _storedSessionAvailable;

diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Resources.meta b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Resources.meta
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Resources/Web3AuthConnectionProvider.asset b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Resources/Web3AuthConnectionProvider.asset
diff --git a/.../io.chainsafe.web3-unity.web3auth/Runtime/Resources/Web3AuthConnectionProvider.asset.meta b/.../io.chainsafe.web3-unity.web3auth/Runtime/Resources/Web3AuthConnectionProvider.asset.meta
diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUI.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Scripts/Web3AuthWalletGUI.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ChainSafe.Gaming;
 using ChainSafe.Gaming.UnityPackage;
 using ChainSafe.GamingSdk.Web3Auth;
 using TMPro;
@@ -150,17 +151,21 @@ private void SetButtonsAndLines()
     [Serializable]
     public class Web3AuthWalletConfig
     {
-        public bool DisplayWalletIcon;
-        public bool AutoPopUpWalletOnTx;
+        public bool DisplayWalletIcon = true;
+        public bool AutoPopUpWalletOnTx = true;
         public bool AutoConfirmTransactions;
+        [DefaultAssetValue("Packages/io.chainsafe.web3-unity.web3auth/Runtime/Sprites/OpenWalletIcon.png")]
         public Sprite WalletIcon;
+        [DefaultAssetValue("Packages/io.chainsafe.web3-unity.web3auth/Runtime/Sprites/Logo.png")]
         public Sprite WalletLogo;
+        [DefaultAssetValue("Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset")]
         public TMP_FontAsset DisplayFont;
-        public Color PrimaryBackgroundColour;
-        public Color MenuBackgroundColour;
-        public Color PrimaryTextColour;
-        public Color SecondaryTextColour;
-        public Color BorderButtonColour;
+
+        public Color PrimaryBackgroundColour = new Color(0f, 0f, 0f, .725f);
+        public Color MenuBackgroundColour = Color.black;
+        public Color PrimaryTextColour = Color.white;
+        public Color SecondaryTextColour = new Color(.4f, .85f, .3f);
+        public Color BorderButtonColour = Color.white;
     }
 
     #endregion

diff --git a/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthConnectionProvider.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthConnectionProvider.cs
@@ -13,6 +13,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Nethereum.Hex.HexTypes;
 using UnityEngine;
+using UnityEngine.UI;
 using Network = Web3Auth.Network;
 
 /// <summary>
@@ -21,18 +22,25 @@
 [CreateAssetMenu(menuName = "ChainSafe/Connection Provider/Web3Auth", fileName = nameof(Web3AuthConnectionProvider))]
 public class Web3AuthConnectionProvider : RestorableConnectionProvider, ILogoutHandler, IWeb3InitializedHandler
 {
+    [field: SerializeField, DefaultAssetValue("Packages/io.chainsafe.web3-unity.web3auth/Runtime/Prefabs/Web3AuthRow.prefab")]
+    public override Button ConnectButtonRow { get; protected set; }
+
     [SerializeField] private string clientId;
     [SerializeField] private string redirectUri;
     [SerializeField] private Network network;
 
     [Space]
 
-    [SerializeField] private GameObject modalPrefab;
+    [SerializeField, DefaultAssetValue("Packages/io.chainsafe.web3-unity.web3auth/Runtime/Prefabs/Web3Auth.prefab")]
+    private GameObject modalPrefab;
 
     [Space]
 
     [SerializeField] private bool enableWalletGui;
-    [SerializeField] private Web3AuthWalletGUI web3AuthWalletGUIPrefab;
+
+    [SerializeField, DefaultAssetValue("Packages/io.chainsafe.web3-unity.web3auth/Runtime/WalletGUI/Prefabs/Web3AuthWalletGUI.prefab")]
+    private Web3AuthWalletGUI web3AuthWalletGUIPrefab;
+
     [SerializeField] private Web3AuthWalletGUI.Web3AuthWalletConfig walletGuiConfig;
 
     private Web3AuthModal _modal;

diff --git a/Packages/io.chainsafe.web3-unity/Editor/ConnectionHandlerEditor.cs b/Packages/io.chainsafe.web3-unity/Editor/ConnectionHandlerEditor.cs
@@ -1,4 +1,7 @@
+using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using ChainSafe.Gaming.UnityPackage.Connection;
 using Newtonsoft.Json;
 using UnityEditor;
@@ -8,6 +11,16 @@
 [CustomEditor(typeof(ConnectionHandler))]
 public class ConnectionHandlerEditor : Editor
 {
+    private readonly List<Type> _providerTypes = new List<Type>();
+
+    private Dictionary<Type, Editor> _editors = new Dictionary<Type, Editor>();
+
+    private Dictionary<Type, bool> _editorFoldouts = new Dictionary<Type, bool>();
+
+    private List<ConnectionProvider> _allProviders = new List<ConnectionProvider>();
+
+    private readonly List<ConnectionProvider> _availableProviders = new List<ConnectionProvider>();
+
     public struct Provider
     {
         [JsonProperty("name")]
@@ -18,23 +31,41 @@ public struct Provider
     }
 
     private bool _foldout;
-
+
+    private void OnEnable()
+    {
+        AppDomain.CurrentDomain.GetAssemblies().ToList().ForEach(assembly =>
+        {
+            _providerTypes.AddRange(assembly.GetTypes().Where(myType => myType.IsClass && !myType.IsAbstract && myType.IsSubclassOf(typeof(ConnectionProvider))));
+        });
+
+        _editors = _providerTypes.ToDictionary(t => t, t => default(Editor));
+
+        _editorFoldouts = _providerTypes.ToDictionary(t => t, t => false);
+
+        _allProviders = Resources.LoadAll<ConnectionProvider>(string.Empty).ToList();
+    }
+
     public override void OnInspectorGUI()
     {
         base.OnInspectorGUI();
 
-        var providers = Resources.LoadAll<ConnectionProvider>(string.Empty);
-
         _foldout = EditorGUILayout.Foldout(_foldout, "Connection Providers");
 
         if (_foldout)
         {
-            List<ConnectionProvider> availableProviders = new List<ConnectionProvider>();
+            EditorGUILayout.BeginVertical();
 
+            // Get provider display name.
             var providersProperty = serializedObject.FindProperty("providers");
 
-            int arraySize = providersProperty.arraySize;
+            _allProviders = _allProviders.Where(p => p != null).ToList();
 
+            // Get available providers.
+            _availableProviders.Clear();
+
+            int arraySize = providersProperty.arraySize;
+
             for (int i = 0; i < arraySize; i++)
             {
                 var providerProperty = providersProperty.GetArrayElementAtIndex(i);
@@ -48,49 +79,109 @@ public override void OnInspectorGUI()
                     return;
                 }
 
-                availableProviders.Add(providerProperty.objectReferenceValue as ConnectionProvider);
+                _availableProviders.Add(providerProperty.objectReferenceValue as ConnectionProvider);
             }
 
-            foreach (var provider in providers)
+            foreach (Type providerType in _providerTypes)
             {
-                if (provider == null)
+                EditorGUILayout.BeginVertical(GUI.skin.box);
+
+                string providerDisplayName = providerType.Name;
+
+                if (providerDisplayName.Contains(nameof(ConnectionProvider)))
                 {
-                    Debug.LogWarning($"Error loading {provider.Name} Provider.");
-
-                    continue;
+                    providerDisplayName = providerDisplayName.Replace(nameof(ConnectionProvider), string.Empty);
                 }
-
-                EditorGUI.BeginChangeCheck();
 
-                bool isAvailable = availableProviders.Contains(provider);
+                ConnectionProvider provider = _allProviders.FirstOrDefault(p => p.GetType() == providerType);
 
-                isAvailable = GUILayout.Toggle(isAvailable, provider.Name);
-
-                if (EditorGUI.EndChangeCheck())
+                if (provider != null)
                 {
-                    if (isAvailable)
+                    EditorGUI.indentLevel++;
+
+                    _editorFoldouts[providerType] = EditorGUILayout.Foldout(_editorFoldouts[providerType], providerDisplayName);
+
+                    EditorGUI.indentLevel--;
+
+                    bool isAvailable = _availableProviders.Contains(provider);
+
+                    EditorGUILayout.BeginHorizontal();
+
+                    EditorGUI.BeginChangeCheck();
+
+                    isAvailable = EditorGUILayout.Toggle(isAvailable, GUILayout.MaxWidth(20));
+
+                    if (EditorGUI.EndChangeCheck())
                     {
-                        providersProperty.InsertArrayElementAtIndex(arraySize);
+                        if (isAvailable)
+                        {
+                            providersProperty.InsertArrayElementAtIndex(providersProperty.arraySize);
+
+                            providersProperty.GetArrayElementAtIndex(providersProperty.arraySize - 1).objectReferenceValue = provider;
+                        }
 
-                        providersProperty.GetArrayElementAtIndex(arraySize).objectReferenceValue = provider;
+                        else
+                        {
+                            int index = _availableProviders.IndexOf(provider);
+
+                            providersProperty.DeleteArrayElementAtIndex(index);
+                        }
+
+                        serializedObject.ApplyModifiedProperties();
                     }
+
+                    EditorGUI.BeginDisabledGroup(true);
+
+                    EditorGUILayout.ObjectField(provider, typeof(ConnectionProvider), false);
+
+                    EditorGUI.EndDisabledGroup();
+
+                    EditorGUILayout.EndHorizontal();
 
-                    else
+                    if (_editorFoldouts[providerType])
                     {
-                        providersProperty.DeleteArrayElementAtIndex(availableProviders.IndexOf(provider));
+                        Editor editor = _editors[providerType];
+
+                        if (!editor)
+                        {
+                            CreateCachedEditor(provider, null, ref editor);
+
+                            _editors[providerType] = editor;
+                        }
+
+                        EditorGUILayout.BeginVertical(GUI.skin.box);
+
+                        editor.OnInspectorGUI();
+
+                        EditorGUILayout.EndVertical();
                     }
+                }
 
-                    serializedObject.ApplyModifiedProperties();
+                else
+                {
+                    EditorGUILayout.LabelField(providerDisplayName);
 
-                    return;
+                    if (GUILayout.Button("Add Provider", GUILayout.MaxWidth(100)))
+                    {
+                        ConnectionProvider newProvider = (ConnectionProvider) CreateInstance(providerType);
+
+                        AssetDatabase.CreateAsset(newProvider, Path.Combine("Assets", nameof(Resources), $"{providerType.Name}.asset"));
+
+                        //Update the list of providers.
+                        _allProviders.Add(newProvider);
+
+                        providersProperty.InsertArrayElementAtIndex(providersProperty.arraySize);
+
+                        providersProperty.GetArrayElementAtIndex(providersProperty.arraySize - 1).objectReferenceValue = newProvider;
+
+                        serializedObject.ApplyModifiedProperties();
+                    }
                 }
 
-                EditorGUI.BeginDisabledGroup(true);
-
-                EditorGUILayout.ObjectField(provider, typeof(ConnectionProvider), false);
-
-                EditorGUI.EndDisabledGroup();
+                EditorGUILayout.EndVertical();
             }
+
+            EditorGUILayout.EndVertical();
         }
     }
 }