feat: add account creaation element

readyplayerme · Dec 4, 2023 · 281dee2 · 281dee2
1 parent bfdc1af
commit 281dee2
Show file tree

Hide file tree

Showing 9 changed files with 1,100 additions and 18 deletions.
diff --git a/Runtime/AvatarCreator/Prefabs/Elements/AccountCreationElement.prefab b/Runtime/AvatarCreator/Prefabs/Elements/AccountCreationElement.prefab
diff --git a/Runtime/AvatarCreator/Prefabs/Elements/AccountCreationElement.prefab.meta b/Runtime/AvatarCreator/Prefabs/Elements/AccountCreationElement.prefab.meta
diff --git a/...amples/Scripts/UI/AccountCreationPopup.cs → ...tor/UI/Elements/AccountCreationElement.cs b/...amples/Scripts/UI/AccountCreationPopup.cs → ...tor/UI/Elements/AccountCreationElement.cs
@@ -1,18 +1,17 @@
-using System;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.AvatarCreator
 {
-    public class AccountCreationPopup : MonoBehaviour
+    public class AccountCreationElement : MonoBehaviour
     {
         [SerializeField] private InputField emailField;
         [SerializeField] private Button sendEmailButton;
         [SerializeField] private Button continueWithoutSignupButton;
-        [SerializeField] private Button closeButton;
 
-        public event Action<string> OnSendEmail;
-        public event Action OnContinueWithoutSignup;
+        public UnityEvent<string> onSendEmail;
+        public UnityEvent onContinueWithoutSignup;
 
         private void Update()
         {
@@ -24,27 +23,24 @@ private void OnEnable()
         {
             sendEmailButton.onClick.AddListener(OnSendEmailButton);
             continueWithoutSignupButton.onClick.AddListener(OnContinueWithoutSignupButton);
-            closeButton.onClick.AddListener(OnContinueWithoutSignupButton);
         }
 
         private void OnDisable()
         {
             sendEmailButton.onClick.RemoveListener(OnSendEmailButton);
             continueWithoutSignupButton.onClick.RemoveListener(OnContinueWithoutSignupButton);
-            closeButton.onClick.RemoveListener(OnContinueWithoutSignupButton);
         }
 
-
         private void OnSendEmailButton()
         {
             var email = emailField.text;
-            OnSendEmail?.Invoke(email);
+            onSendEmail?.Invoke(email);
             gameObject.SetActive(false);
         }
 
         private void OnContinueWithoutSignupButton()
         {
-            OnContinueWithoutSignup?.Invoke();
+            onContinueWithoutSignup?.Invoke();
             gameObject.SetActive(false);
         }
     }

diff --git a/...s/Scripts/UI/AccountCreationPopup.cs.meta → ...I/Elements/AccountCreationElement.cs.meta b/...s/Scripts/UI/AccountCreationPopup.cs.meta → ...I/Elements/AccountCreationElement.cs.meta
diff --git a/...torSamples/Scripts/Utils/ValidatorUtil.cs → Runtime/AvatarCreator/Utils/ValidatorUtil.cs b/...torSamples/Scripts/Utils/ValidatorUtil.cs → Runtime/AvatarCreator/Utils/ValidatorUtil.cs
diff --git a/...mples/Scripts/Utils/ValidatorUtil.cs.meta → ...AvatarCreator/Utils/ValidatorUtil.cs.meta b/...mples/Scripts/Utils/ValidatorUtil.cs.meta → ...AvatarCreator/Utils/ValidatorUtil.cs.meta
diff --git a/Samples~/AvatarCreatorSamples/Prefabs/AccountCreationPopup.prefab b/Samples~/AvatarCreatorSamples/Prefabs/AccountCreationPopup.prefab
@@ -471,7 +471,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8393542494968090121
 RectTransform:
   m_ObjectHideFlags: 0

diff --git a/Samples~/AvatarCreatorSamples/Scenes/AvatarCreatorSample.unity b/Samples~/AvatarCreatorSamples/Scenes/AvatarCreatorSample.unity
@@ -16668,6 +16668,11 @@ PrefabInstance:
       propertyPath: accountCreationPopup
       value: 
       objectReference: {fileID: 1181375370}
+    - target: {fileID: 57378948363611735, guid: 94e6adc5c795ff348bce129db0368b1f,
+        type: 3}
+      propertyPath: accountCreationElement
+      value: 
+      objectReference: {fileID: 1181375370}
     - target: {fileID: 426946072540919372, guid: 94e6adc5c795ff348bce129db0368b1f,
         type: 3}
       propertyPath: m_AnchorMax.y

diff --git a/Samples~/AvatarCreatorSamples/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs b/Samples~/AvatarCreatorSamples/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs
@@ -21,7 +21,7 @@ public class AvatarCreatorSelection : State, IDisposable
         [SerializeField] private Button saveButton;
         [SerializeField] private AvatarConfig inCreatorConfig;
         [SerializeField] private RuntimeAnimatorController animator;
-        [SerializeField] private AccountCreationPopup accountCreationPopup;
+        [SerializeField] private AccountCreationElement accountCreationElement;
 
         private PartnerAssetsManager partnerAssetManager;
         private AvatarManager avatarManager;
@@ -43,17 +43,17 @@ private void Start()
         public override void ActivateState()
         {
             saveButton.onClick.AddListener(OnSaveButton);
-            accountCreationPopup.OnSendEmail += OnSendEmail;
-            accountCreationPopup.OnContinueWithoutSignup += Save;
+            accountCreationElement.onSendEmail.AddListener(OnSendEmail);
+            accountCreationElement.onContinueWithoutSignup.AddListener(Save);
             categoryUICreator.OnCategorySelected += OnCategorySelected;
             Setup();
         }
 
         public override void DeactivateState()
         {
             saveButton.onClick.RemoveListener(OnSaveButton);
-            accountCreationPopup.OnSendEmail -= OnSendEmail;
-            accountCreationPopup.OnContinueWithoutSignup -= Save;
+            accountCreationElement.onSendEmail.RemoveListener(OnSendEmail);
+            accountCreationElement.onContinueWithoutSignup.RemoveListener(Save);
             categoryUICreator.OnCategorySelected -= OnCategorySelected;
             Cleanup();
         }
@@ -236,7 +236,7 @@ private void OnSaveButton()
             }
             else
             {
-                accountCreationPopup.gameObject.SetActive(true);
+                accountCreationElement.gameObject.SetActive(true);
             }
         }