Revert "Setup popup panel through DI instead of a singleton"

This reverts commit 78c114d.

Author: LPLafontaineB

Assets/BossRoom/Scenes/Startup.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13b1c488ad1662e224891150417b6946a08a8e84cbb0a3436bf15aa630faea99
-size 35452
+oid sha256:7b2c33d4681d53ec62b32b7ff2c81123b4457d8dcd8d0b6d643097e74ae36856
+size 35006

Assets/BossRoom/Scripts/Client/Game/State/ClientMainMenuState.cs

@@ -32,8 +32,6 @@ public class ClientMainMenuState : GameStateBehaviour
         [SerializeField] CanvasGroup m_MainMenuButtonsCanvasGroup;
         [SerializeField] GameObject m_SignInSpinner;
 
-        PopupPanel m_PopupPanel;
-
         void Awake()
         {
             m_MainMenuButtonsCanvasGroup.interactable = false;
@@ -42,7 +40,7 @@ void Awake()
         }
 
         [Inject]
-        void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFacade, LocalLobbyUser localUser, LocalLobby localLobby, PopupPanel popupPanel)
+        void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFacade, LocalLobbyUser localUser, LocalLobby localLobby)
         {
             m_Scope = new DIScope(DIScope.RootScope);
 
@@ -51,8 +49,6 @@ void InjectDependenciesAndInitialize(AuthenticationServiceFacade authServiceFaca
 
             var unityAuthenticationInitOptions = new InitializationOptions();
 
-            m_PopupPanel = popupPanel;
-
 #if UNITY_EDITOR
             //The code below makes it possible for the clone instance to log in as a different user profile in Authentication service.
             //This allows us to test services integration locally by utilising Parrelsync.
@@ -104,7 +100,7 @@ void OnAuthSignIn()
 
             void OnSignInFailed()
             {
-                m_PopupPanel.ShowPopupPanel("Authentication Error", "For some reason we can't authenticate the user anonymously - that typically means that project is not properly set up with Unity services.");
+                PopupPanel.ShowPopupPanel("Authentication Error", "For some reason we can't authenticate the user anonymously - that typically means that project is not properly set up with Unity services.");
             }
         }
 

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

@@ -7,13 +7,11 @@ namespace Unity.Multiplayer.Samples.BossRoom.Visual
     public class ConnectionStatusMessageUIManager : MonoBehaviour
     {
         IDisposable m_Subscriptions;
-        PopupPanel m_PopupPanel;
 
         [Inject]
-        void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub, PopupPanel popupPanel)
+        void InjectDependencies(ISubscriber<ConnectStatus> connectStatusSub)
         {
             m_Subscriptions = connectStatusSub.Subscribe(OnConnectStatus);
-            m_PopupPanel = popupPanel;
         }
 
         void Awake()
@@ -34,15 +32,15 @@ void OnConnectStatus(ConnectStatus status)
                 case ConnectStatus.UserRequestedDisconnect:
                     break;
                 case ConnectStatus.ServerFull:
-                    m_PopupPanel.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
+                    PopupPanel.ShowPopupPanel("Connection Failed", "The Host is full and cannot accept any additional connections.");
                     break;
                 case ConnectStatus.Success:
                     break;
                 case ConnectStatus.LoggedInAgain:
-                    m_PopupPanel.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
+                    PopupPanel.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
                     break;
                 case ConnectStatus.GenericDisconnect:
-                    m_PopupPanel.ShowPopupPanel("Disconnected From Host", "The connection to the host was lost");
+                    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.");

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

@@ -24,7 +24,6 @@ public class LobbyUIMediator : MonoBehaviour
         NameGenerationData m_NameGenerationData;
         GameNetPortal m_GameNetPortal;
         ClientGameNetPortal m_ClientNetPortal;
-        PopupPanel m_PopupPanel;
 
         [Inject]
         void InjectDependenciesAndInitialize(
@@ -34,8 +33,7 @@ void InjectDependenciesAndInitialize(
             LocalLobby localLobby,
             NameGenerationData nameGenerationData,
             GameNetPortal gameNetPortal,
-            ClientGameNetPortal clientGameNetPortal,
-            PopupPanel popupPanel
+            ClientGameNetPortal clientGameNetPortal
         )
         {
             m_NameGenerationData = nameGenerationData;
@@ -44,7 +42,6 @@ PopupPanel popupPanel
             m_LocalLobby = localLobby;
             m_GameNetPortal = gameNetPortal;
             m_ClientNetPortal = clientGameNetPortal;
-            m_PopupPanel = popupPanel;
 
             RegenerateName();
 
@@ -154,7 +151,7 @@ void OnJoinedLobby(Lobby remoteLobby)
 
             void OnRelayJoinFailed(string message)
             {
-                m_PopupPanel.ShowPopupPanel("Relay join failed", message);
+                PopupPanel.ShowPopupPanel("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/Shared/Game/UI/PopupPanel.cs renamed to Assets/BossRoom/Scripts/Client/UI/PopupPanel.cs

@@ -16,11 +16,20 @@ public class PopupPanel : MonoBehaviour
 
         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();
         }
 
+        void OnDestroy()
+        {
+            s_Instance = null;
+        }
+
         public void OnConfirmClick()
         {
             ResetState();
@@ -42,9 +51,16 @@ void ResetState()
         /// </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>
-        public void ShowPopupPanel(string titleText, string mainText)
+        public static void ShowPopupPanel(string titleText, string mainText)
         {
-            SetupPopupPanel(titleText, mainText);
+            if (s_Instance != null)
+            {
+                s_Instance.SetupPopupPanel(titleText, mainText);
+            }
+            else
+            {
+                Debug.LogError($"No PopupPanel instance found. Cannot display message: {titleText}: {mainText}");
+            }
         }
 
         void SetupPopupPanel(string titleText, string mainText)

Assets/BossRoom/Scripts/Shared/Game/UI/PopupPanel.cs.meta renamed to Assets/BossRoom/Scripts/Client/UI/PopupPanel.cs.meta

@@ -4,7 +4,6 @@
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Infrastructure;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Net.UnityServices.Lobbies;
-using Unity.Multiplayer.Samples.BossRoom.Visual;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -16,17 +15,9 @@ namespace Unity.Multiplayer.Samples.BossRoom.Shared
     /// </summary>
     public class ApplicationController : MonoBehaviour
     {
-        [SerializeField]
-        UpdateRunner m_UpdateRunner;
-
-        [SerializeField]
-        GameNetPortal m_GameNetPortal;
-
-        [SerializeField]
-        ClientGameNetPortal m_ClientNetPortal;
-
-        [SerializeField]
-        PopupPanel m_PopupPanel;
+        [SerializeField] UpdateRunner m_UpdateRunner;
+        [SerializeField] GameNetPortal m_GameNetPortal;
+        [SerializeField] ClientGameNetPortal m_ClientNetPortal;
 
         LocalLobby m_LocalLobby;
         LobbyServiceFacade m_LobbyServiceFacade;
@@ -46,7 +37,6 @@ private void Awake()
             scope.BindInstanceAsSingle(m_UpdateRunner);
             scope.BindInstanceAsSingle(m_GameNetPortal);
             scope.BindInstanceAsSingle(m_ClientNetPortal);
-            scope.BindInstanceAsSingle(m_PopupPanel);
 
             //the following singletons represent the local representations of the lobby that we're in and the user that we are
             //they can persist longer than the lifetime of the UI in MainMenu where we set up the lobby that we create or join