Displaying new messages to console if popup window is already in use

Author: LPLafontaineB

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

@@ -1,53 +1,51 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using Unity.Multiplayer.Samples.BossRoom;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
-using Unity.Multiplayer.Samples.BossRoom.Visual;
 using UnityEngine;
 
-public class ConnectionStatusMessageUIManager : MonoBehaviour
+namespace Unity.Multiplayer.Samples.BossRoom.Visual
 {
-
-    IDisposable m_Subscriptions;
-
-    [Inject]
-    void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub)
+    public class ConnectionStatusMessageUIManager : MonoBehaviour
     {
-        m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
-    }
+        IDisposable m_Subscriptions;
 
-    void Awake()
-    {
-        DontDestroyOnLoad(gameObject);
-    }
+        [Inject]
+        void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub)
+        {
+            m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
+        }
 
-    void OnDestroy()
-    {
-        m_Subscriptions?.Dispose();
-    }
+        void Awake()
+        {
+            DontDestroyOnLoad(gameObject);
+        }
 
-    void OnConnectStatus(ConnectStatus status)
-    {
-        switch (status)
+        void OnDestroy()
+        {
+            m_Subscriptions?.Dispose();
+        }
+
+        void OnConnectStatus(ConnectStatus status)
         {
-            case ConnectStatus.Undefined:
-            case ConnectStatus.UserRequestedDisconnect:
-                break;
-            case ConnectStatus.ServerFull:
-                PopupPanel.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
-                break;
-            case ConnectStatus.Success:
-                break;
-            case ConnectStatus.LoggedInAgain:
-                PopupPanel.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
-                break;
-            case ConnectStatus.GenericDisconnect:
-                PopupPanel.ShowPopupPanel("Disconnected From Host", "The connection to the host was lost");
-                break;
-            default:
-                Debug.LogWarning($"New ConnectStatus {status} has been added, but no connect message defined for it.");
-                break;
+            switch (status)
+            {
+                case ConnectStatus.Undefined:
+                case ConnectStatus.UserRequestedDisconnect:
+                    break;
+                case ConnectStatus.ServerFull:
+                    PopupPanel.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
+                    break;
+                case ConnectStatus.Success:
+                    break;
+                case ConnectStatus.LoggedInAgain:
+                    PopupPanel.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
+                    break;
+                case ConnectStatus.GenericDisconnect:
+                    PopupPanel.ShowPopupPanel("Disconnected From Host", "The connection to the host was lost");
+                    break;
+                default:
+                    Debug.LogWarning($"New ConnectStatus {status} has been added, but no connect message defined for it.");
+                    break;
+            }
         }
     }
 }

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

@@ -1,10 +1,6 @@
 using System;
 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
 {
@@ -18,10 +14,13 @@ public class PopupPanel : MonoBehaviour
         [SerializeField]
         TextMeshProUGUI m_MainText;
 
+        bool m_IsPopupShown;
+
         static PopupPanel s_Instance;
 
         void Awake()
         {
+            if (s_Instance != null) throw new Exception("Invalid state, instance is not null");
             s_Instance = this;
             ResetState();
         }
@@ -44,34 +43,43 @@ void ResetState()
             m_TitleText.text = string.Empty;
             m_MainText.text = string.Empty;
             gameObject.SetActive(false);
+            m_IsPopupShown = false;
         }
 
         /// <summary>
         /// Sets the panel to match the given specifications to notify the player.  If display image is set to true, it will display
         /// </summary>
         /// <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.SetupPopupPanel(titleText, mainText);
             }
             else
             {
                 Debug.LogError($"No PopupPanel instance found. Cannot display message: {titleText}: {mainText}");
             }
         }
 
-        void SetupPopupPanel(string titleText, string mainText, Action confirmFunction = null)
+        void SetupPopupPanel(string titleText, string mainText)
         {
-            ResetState();
+            if (m_IsPopupShown)
+            {
+                Debug.Log("Trying to show popup, but another popup is already being shown.");
+                Debug.Log($"{titleText}. {mainText}");
+            }
+            else
+            {
+                ResetState();
 
-            m_TitleText.text = titleText;
-            m_MainText.text = mainText;
+                m_TitleText.text = titleText;
+                m_MainText.text = mainText;
 
-            gameObject.SetActive(true);
+                gameObject.SetActive(true);
+                m_IsPopupShown = true;
+            }
         }
     }
 }