Add stacking to PopupPanel and include UnityServiceErrorMessage

Author: LPLafontaineB

Assets/BossRoom/Scripts/Client/UI/ConnectionStatusMessageUIManager.cs

@@ -3,18 +3,21 @@
 using System.Collections.Generic;
 using Unity.Multiplayer.Samples.BossRoom;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Visual;
 using UnityEngine;
 
 public class ConnectionStatusMessageUIManager : MonoBehaviour
 {
 
-    IDisposable m_Subscriptions;
+    DisposableGroup m_Subscriptions = new DisposableGroup();
 
     [Inject]
-    void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub)
+    void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub,
+        ISubscriber<UnityServiceErrorMessage> unityServiceErrorMessageSub)
     {
-        m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
+        m_Subscriptions.Add(connectStatusSub.Subscribe(OnConnectStatus));
+        m_Subscriptions.Add(unityServiceErrorMessageSub.Subscribe(OnUnityServiceErrorMessage));
     }
 
     void Awake()
@@ -27,6 +30,11 @@ void OnDestroy()
         m_Subscriptions?.Dispose();
     }
 
+    void OnUnityServiceErrorMessage(UnityServiceErrorMessage unityServiceErrorMessage)
+    {
+        PopupPanel.ShowPopupPanel(unityServiceErrorMessage.Title, unityServiceErrorMessage.Message);
+    }
+
     void OnConnectStatus(ConnectStatus status)
     {
         switch (status)

Assets/BossRoom/Scripts/Client/UI/Lobby/LobbyUIMediator.cs

@@ -24,6 +24,7 @@ public class LobbyUIMediator : MonoBehaviour
         NameGenerationData m_NameGenerationData;
         GameNetPortal m_GameNetPortal;
         ClientGameNetPortal m_ClientNetPortal;
+        IPublisher<UnityServiceErrorMessage> m_UnityServiceErrorMessagePublisher;
 
         [Inject]
         void InjectDependenciesAndInitialize(
@@ -42,6 +43,7 @@ ClientGameNetPortal clientGameNetPortal
             m_LocalLobby = localLobby;
             m_GameNetPortal = gameNetPortal;
             m_ClientNetPortal = clientGameNetPortal;
+            m_UnityServiceErrorMessagePublisher = unityServiceErrorMessagePublisher;
 
             RegenerateName();
 
@@ -151,7 +153,7 @@ void OnJoinedLobby(Lobby remoteLobby)
 
             void OnRelayJoinFailed(string message)
             {
-                PopupPanel.ShowPopupPanel("Relay join failed", message);
+                m_UnityServiceErrorMessagePublisher.Publish(new UnityServiceErrorMessage("Relay join failed", message));
                 Debug.Log($"Relay join failed: {message}");
                 //leave the lobby if relay failed for some reason
                 m_LobbyServiceFacade.EndTracking();

Assets/BossRoom/Scripts/Client/UI/PopupPanel.cs

@@ -1,10 +1,7 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
 using TMPro;
-using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
-using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Infrastructure;
-using UnityEngine.SceneManagement;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Visual
 {
@@ -13,11 +10,25 @@ namespace Unity.Multiplayer.Samples.BossRoom.Visual
     /// </summary>
     public class PopupPanel : MonoBehaviour
     {
+        struct PopupPanelData
+        {
+            public string TitleText;
+            public string MainText;
+
+            public PopupPanelData(string titleText, string mainText)
+            {
+                TitleText = titleText;
+                MainText = mainText;
+            }
+        }
+
         [SerializeField]
         TextMeshProUGUI m_TitleText;
         [SerializeField]
         TextMeshProUGUI m_MainText;
 
+        Stack<PopupPanelData> m_PopupStack = new Stack<PopupPanelData>();
+
         static PopupPanel s_Instance;
 
         void Awake()
@@ -34,6 +45,10 @@ void OnDestroy()
         public void OnConfirmClick()
         {
             ResetState();
+            if (m_PopupStack.Count > 0)
+            {
+                SetupPopupPanel(m_PopupStack.Pop());
+            }
         }
 
         /// <summary>
@@ -52,24 +67,30 @@ void ResetState()
         /// <param name="titleText">The title text at the top of the panel</param>
         /// <param name="mainText"> The text just under the title- the main body of text</param>
         /// <param name="confirmFunction"> The function to call when the confirm button is pressed.</param>
-        public static void ShowPopupPanel(string titleText, string mainText, Action confirmFunction = null)
+        public static void ShowPopupPanel(string titleText, string mainText)
         {
             if (s_Instance != null)
             {
-                s_Instance.SetupPopupPanel(titleText, mainText, confirmFunction);
+                s_Instance.StackPopupPanel(new PopupPanelData(titleText, mainText));
             }
             else
             {
                 Debug.LogError($"No PopupPanel instance found. Cannot display message: {titleText}: {mainText}");
             }
         }
 
-        void SetupPopupPanel(string titleText, string mainText, Action confirmFunction = null)
+        void StackPopupPanel(PopupPanelData data)
+        {
+            m_PopupStack.Push(data);
+            SetupPopupPanel(data);
+        }
+
+        void SetupPopupPanel(PopupPanelData data)
         {
             ResetState();
 
-            m_TitleText.text = titleText;
-            m_MainText.text = mainText;
+            m_TitleText.text = data.TitleText;
+            m_MainText.text = data.MainText;
 
             gameObject.SetActive(true);
         }