Changes here

Assets/Prefabs/SettingsPrefab.prefab

@@ -2554,7 +2554,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 118.84, y: -17.505}
-  m_SizeDelta: {x: 133.68, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4123066978558023322
 CanvasRenderer:
@@ -5143,7 +5143,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 144.95, y: -17.505}
-  m_SizeDelta: {x: 185.9, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5184616622156144944
 CanvasRenderer:
@@ -6176,7 +6176,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 168.16501, y: -17.505}
-  m_SizeDelta: {x: 232.33, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3727655552475763163
 CanvasRenderer:
@@ -8172,7 +8172,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 221.39, y: -16}
-  m_SizeDelta: {x: 338.78, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6064585581559598998
 CanvasRenderer:

Assets/Scripts/AccountMenu/AccountChangePassword.cs

@@ -20,7 +20,7 @@ public class AccountChangePassword : MonoBehaviour {
     changePasswordRetypeNewPasswordInput.text = "";
     changePasswordStatusText.text = "";
     changePasswordSubmitButton.onClick.RemoveAllListeners();
-    AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(0));
+    AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(0));
     changePasswordSubmitButton.onClick.AddListener(() => ChangePassword());
   }
 
@@ -29,7 +29,7 @@ public class AccountChangePassword : MonoBehaviour {
       Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
       return;
     }
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.backButton.interactable = false;
     changePasswordSubmitButton.interactable = false;
     WWWForm dataForm = new();
     dataForm.AddField("newPassword", changePasswordNewPasswordInput.text);
@@ -40,7 +40,7 @@ public class AccountChangePassword : MonoBehaviour {
     request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
     await request.SendWebRequest();
     if (request.downloadHandler.text == null) {
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.backButton.interactable = true;
       changePasswordSubmitButton.interactable = true;
       Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
       return;
@@ -48,12 +48,12 @@ public class AccountChangePassword : MonoBehaviour {
     var jsonResponse = JObject.Parse(request.downloadHandler.text);
     if ((bool)jsonResponse["success"]) {
       BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]);
-      AccountHandler.instance.SwitchPanel(0);
-      Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
+      AccountHandler.Instance.SwitchPanel(0);
+      Tools.UpdateStatusText(AccountHandler.Instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
     } else {
       Tools.UpdateStatusText(changePasswordStatusText, (string)jsonResponse["message"], Color.red);
     }
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.backButton.interactable = true;
     changePasswordSubmitButton.interactable = true;
   }
 }

Assets/Scripts/AccountMenu/AccountChangeUsername.cs

@@ -17,12 +17,12 @@ public class AccountChangeUsername : MonoBehaviour {
     changeUsernameNewUsernameInput.text = "";
     changeUsernameStatusText.text = "";
     changeUsernameSubmitButton.onClick.RemoveAllListeners();
-    AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(0));
+    AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(0));
     changeUsernameSubmitButton.onClick.AddListener(() => ChangeUsername());
   }
 
   async void ChangeUsername() {
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.backButton.interactable = false;
     changeUsernameSubmitButton.interactable = false;
     WWWForm dataForm = new();
     dataForm.AddField("newUsername", changeUsernameNewUsernameInput.text);
@@ -33,7 +33,7 @@ public class AccountChangeUsername : MonoBehaviour {
     request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
     await request.SendWebRequest();
     if (request.downloadHandler.text == null) {
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.backButton.interactable = true;
       changeUsernameSubmitButton.interactable = true;
       Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
       return;
@@ -42,12 +42,12 @@ public class AccountChangeUsername : MonoBehaviour {
     if ((bool)jsonResponse["success"]) {
       BazookaManager.Instance.SetAccountName(changeUsernameNewUsernameInput.text);
       BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]);
-      AccountHandler.instance.SwitchPanel(0);
-      Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
+      AccountHandler.Instance.SwitchPanel(0);
+      Tools.UpdateStatusText(AccountHandler.Instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
     } else {
       Tools.UpdateStatusText(changeUsernameStatusText, (string)jsonResponse["message"], Color.red);
     }
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.backButton.interactable = true;
     changeUsernameSubmitButton.interactable = true;
   }
 }

Assets/Scripts/AccountMenu/AccountForgotDetails.cs

@@ -21,18 +21,18 @@ public class AccountForgotDetails : MonoBehaviour {
     forgotDetailsEmailInput.text = "";
     forgotDetailsVerifyCodeInput.text = "";
     forgotDetailsSubmitButton.onClick.RemoveAllListeners();
-    AccountHandler.instance.backButton.onClick.AddListener(() => {
+    AccountHandler.Instance.backButton.onClick.AddListener(() => {
       forgotDetailsSubmitButton.interactable = false;
       mode = 0;
       forgotDetailsTitleText.text = "";
       forgotDetailsStatusText.text = "";
-      AccountHandler.instance.SwitchPanel(2);
+      AccountHandler.Instance.SwitchPanel(2);
     });
     forgotDetailsSubmitButton.onClick.AddListener(() => ForgotDetails());
   }
 
   async void ForgotDetails() {
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.backButton.interactable = false;
     forgotDetailsSubmitButton.interactable = false;
     WWWForm dataForm = new();
     dataForm.AddField("email", forgotDetailsEmailInput.text);
@@ -44,7 +44,7 @@ public class AccountForgotDetails : MonoBehaviour {
     request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
     await request.SendWebRequest();
     if (request.downloadHandler.text == null) {
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.backButton.interactable = true;
       forgotDetailsSubmitButton.interactable = true;
       Tools.UpdateStatusText(forgotDetailsStatusText, "Failed to make HTTP request", Color.red);
       return;
@@ -52,7 +52,7 @@ public class AccountForgotDetails : MonoBehaviour {
     var jsonResponse = JObject.Parse(request.downloadHandler.text);
     if ((bool)jsonResponse["success"]) Tools.UpdateStatusText(forgotDetailsStatusText, "An email has been sent to your inbox", Color.green);
     else Tools.UpdateStatusText(forgotDetailsStatusText, (string)jsonResponse["message"], Color.red);
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.backButton.interactable = true;
     forgotDetailsSubmitButton.interactable = true;
   }
 }

Assets/Scripts/AccountMenu/AccountHandler.cs

@@ -3,9 +3,9 @@ using UnityEngine.InputSystem;
 using UnityEngine.UI;
 
 public class AccountHandler : MonoBehaviour {
-  public static AccountHandler instance;
+  public static AccountHandler Instance;
   public AccountLoggedIn accountLoggedIn;
-  [SerializeField] private Button exitButton;
+  [SerializeField] internal Button exitButton;
   [SerializeField] internal Button backButton;
   [SerializeField] private AccountLoggedOut accountLoggedOut;
   [SerializeField] private AccountLogin accountLogin;
@@ -16,7 +16,7 @@ public class AccountHandler : MonoBehaviour {
   [SerializeField] internal AccountForgotDetails accountForgotDetails;
 
   void Awake() {
-    instance = this;
+    Instance = this;
     exitButton.onClick.AddListener(() => Destroy(gameObject));
   }
 

Assets/Scripts/AccountMenu/AccountLoggedIn.cs

@@ -28,14 +28,16 @@ public class AccountLoggedIn : MonoBehaviour {
     loggedInLoadButton.onClick.RemoveAllListeners();
     loggedInRefreshLoginButton.onClick.RemoveAllListeners();
     loggedInLogoutButton.onClick.RemoveAllListeners();
-    loggedInChangeUsernameButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(4));
-    loggedInChangePasswordButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(5));
+    loggedInChangeUsernameButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(4));
+    loggedInChangePasswordButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(5));
     loggedInSaveButton.onClick.AddListener(() => SaveAccount());
     loggedInLoadButton.onClick.AddListener(() => LoadAccount());
-    loggedInRefreshLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(6));
+    loggedInRefreshLoginButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(6));
     loggedInLogoutButton.onClick.AddListener(() => {
+      AccountHandler.Instance.exitButton.interactable = false;
       BazookaManager.Instance.ResetSave();
-      AccountHandler.instance.SwitchPanel(1);
+      AccountHandler.Instance.SwitchPanel(1);
+      AccountHandler.Instance.exitButton.interactable = true;
     });
   }
 
@@ -46,7 +48,7 @@ public class AccountLoggedIn : MonoBehaviour {
     loggedInLoadButton.interactable = false;
     loggedInRefreshLoginButton.interactable = false;
     loggedInLogoutButton.interactable = false;
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.exitButton.interactable = false;
     WWWForm dataForm = new();
     dataForm.AddField("saveData", Convert.ToBase64String(Encoding.UTF8.GetBytes(BazookaManager.Instance.saveFile.ToString(Formatting.None))));
     using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ACCOUNT_SAVE_ENDPOINT, dataForm);
@@ -62,7 +64,7 @@ public class AccountLoggedIn : MonoBehaviour {
       loggedInLoadButton.interactable = true;
       loggedInRefreshLoginButton.interactable = true;
       loggedInLogoutButton.interactable = true;
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.exitButton.interactable = true;
       Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
       return;
     }
@@ -74,7 +76,7 @@ public class AccountLoggedIn : MonoBehaviour {
     loggedInLoadButton.interactable = true;
     loggedInRefreshLoginButton.interactable = true;
     loggedInLogoutButton.interactable = true;
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.exitButton.interactable = true;
   }
 
   async void LoadAccount() {
@@ -84,7 +86,7 @@ public class AccountLoggedIn : MonoBehaviour {
     loggedInLoadButton.interactable = false;
     loggedInRefreshLoginButton.interactable = false;
     loggedInLogoutButton.interactable = false;
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.exitButton.interactable = false;
     using UnityWebRequest request = UnityWebRequest.Get(Endpoints.ACCOUNT_SAVE_ENDPOINT);
     request.SetRequestHeader("Authorization", BazookaManager.Instance.GetAccountSession());
     request.SetRequestHeader("Requester", "BerryDashClient");
@@ -98,7 +100,7 @@ public class AccountLoggedIn : MonoBehaviour {
       loggedInLoadButton.interactable = true;
       loggedInRefreshLoginButton.interactable = true;
       loggedInLogoutButton.interactable = true;
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.exitButton.interactable = true;
       Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
       return;
     }
@@ -124,6 +126,6 @@ public class AccountLoggedIn : MonoBehaviour {
     loggedInLoadButton.interactable = true;
     loggedInRefreshLoginButton.interactable = true;
     loggedInLogoutButton.interactable = true;
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.exitButton.interactable = true;
   }
 }

Assets/Scripts/AccountMenu/AccountLoggedOut.cs

@@ -8,7 +8,7 @@ public class AccountLoggedOut : MonoBehaviour {
   void OnEnable() {
     loggedOutLoginButton.onClick.RemoveAllListeners();
     loggedOutRegisterButton.onClick.RemoveAllListeners();
-    loggedOutLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(2));
-    loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3));
+    loggedOutLoginButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(2));
+    loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(3));
   }
 }

Assets/Scripts/AccountMenu/AccountLogin.cs

@@ -25,26 +25,26 @@ public class AccountLogin : MonoBehaviour {
     loginSubmitButton.onClick.RemoveAllListeners();
     forgotUsernameButton.onClick.RemoveAllListeners();
     forgotPasswordButton.onClick.RemoveAllListeners();
-    AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(1));
+    AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(1));
     loginSubmitButton.onClick.AddListener(() => SubmitLogin());
     forgotUsernameButton.onClick.AddListener(() => {
-      AccountHandler.instance.SwitchPanel(7);
-      AccountHandler.instance.accountForgotDetails.mode = 0;
-      AccountHandler.instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot username";
-      AccountHandler.instance.backButton.interactable = true;
-      AccountHandler.instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true;
+      AccountHandler.Instance.SwitchPanel(7);
+      AccountHandler.Instance.accountForgotDetails.mode = 0;
+      AccountHandler.Instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot username";
+      AccountHandler.Instance.backButton.interactable = true;
+      AccountHandler.Instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true;
     });
     forgotPasswordButton.onClick.AddListener(() => {
-      AccountHandler.instance.SwitchPanel(7);
-      AccountHandler.instance.accountForgotDetails.mode = 1;
-      AccountHandler.instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot password";
-      AccountHandler.instance.backButton.interactable = true;
-      AccountHandler.instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true;
+      AccountHandler.Instance.SwitchPanel(7);
+      AccountHandler.Instance.accountForgotDetails.mode = 1;
+      AccountHandler.Instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot password";
+      AccountHandler.Instance.backButton.interactable = true;
+      AccountHandler.Instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true;
     });
   }
 
   async void SubmitLogin() {
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.backButton.interactable = false;
     loginSubmitButton.interactable = false;
     if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty) {
       Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red);
@@ -59,7 +59,7 @@ public class AccountLogin : MonoBehaviour {
     request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
     await request.SendWebRequest();
     if (request.downloadHandler.text == null) {
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.backButton.interactable = true;
       loginSubmitButton.interactable = true;
       Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
       return;
@@ -69,12 +69,12 @@ public class AccountLogin : MonoBehaviour {
       BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
       BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
       BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
-      AccountHandler.instance.SwitchPanel(0);
+      AccountHandler.Instance.SwitchPanel(0);
       Tools.UpdateStatusText(loginPanelStatusText, "", Color.red);
     } else {
       Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
     }
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.backButton.interactable = true;
     loginSubmitButton.interactable = true;
   }
 }

Assets/Scripts/AccountMenu/AccountRefreshLogin.cs

@@ -20,12 +20,12 @@ public class AccountRefreshLogin : MonoBehaviour {
     refreshLoginUsernameInput.text = "";
     refreshLoginPasswordInput.text = "";
     refreshLoginSubmitButton.onClick.RemoveAllListeners();
-    AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(0));
+    AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(0));
     refreshLoginSubmitButton.onClick.AddListener(() => RefreshLogin());
   }
 
   async void RefreshLogin() {
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.backButton.interactable = false;
     refreshLoginSubmitButton.interactable = false;
     WWWForm dataForm = new();
     dataForm.AddField("username", refreshLoginUsernameInput.text);
@@ -36,7 +36,7 @@ public class AccountRefreshLogin : MonoBehaviour {
     request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
     await request.SendWebRequest();
     if (request.downloadHandler.text == null) {
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.backButton.interactable = true;
       refreshLoginSubmitButton.interactable = true;
       Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
       return;
@@ -46,12 +46,12 @@ public class AccountRefreshLogin : MonoBehaviour {
       BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
       BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
       BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
-      AccountHandler.instance.SwitchPanel(0);
+      AccountHandler.Instance.SwitchPanel(0);
       Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red);
     } else {
       Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
     }
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.backButton.interactable = true;
     refreshLoginSubmitButton.interactable = true;
   }
 }

Assets/Scripts/AccountMenu/AccountRegister.cs

@@ -28,7 +28,7 @@ public class AccountRegister : MonoBehaviour {
     registerRetypePasswordInput.text = "";
     registerVerifyCodeInput.text = "";
     registerPanelStatusText.text = "";
-    AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(1));
+    AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(1));
     registerSubmitButton.onClick.AddListener(() => SubmitRegister());
   }
 
@@ -47,7 +47,7 @@ public class AccountRegister : MonoBehaviour {
       Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red);
       return;
     }
-    AccountHandler.instance.backButton.interactable = false;
+    AccountHandler.Instance.backButton.interactable = false;
     registerSubmitButton.interactable = false;
     WWWForm dataForm = new();
     dataForm.AddField("username", registerUsernameInput.text);
@@ -61,18 +61,18 @@ public class AccountRegister : MonoBehaviour {
     request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
     await request.SendWebRequest();
     if (request.downloadHandler.text == null) {
-      AccountHandler.instance.backButton.interactable = true;
+      AccountHandler.Instance.backButton.interactable = true;
       registerSubmitButton.interactable = true;
       Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
       return;
     }
     var jsonResponse = JObject.Parse(request.downloadHandler.text);
     if ((bool)jsonResponse["success"]) {
-      AccountHandler.instance.SwitchPanel(2);
+      AccountHandler.Instance.SwitchPanel(2);
     } else {
       Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
     }
-    AccountHandler.instance.backButton.interactable = true;
+    AccountHandler.Instance.backButton.interactable = true;
     registerSubmitButton.interactable = true;
   }
 }