Using new overload for basic popup

Author: johnklipi

src/Managers/AutoUpdate.cs

@@ -3,7 +3,6 @@
 using System.Text.Json;
 using HarmonyLib;
 using UnityEngine;
-using static PopupManager;
 
 namespace PolyMod.Managers;
 
@@ -155,19 +154,17 @@ exit 0
             }
 
             // Show a popup to the user asking if they want to update
-            BasicPopup popup = PopupManager.GetBasicPopup();
-            popup.Header = Localization.Get("polymod.autoupdate");
-            popup.Description = Localization.Get("polymod.autoupdate.description");
-            popup.buttonData = new PopupBase.PopupButtonData[] {
+            PopupManager.GetBasicPopupWithData(new(
+                Localization.Get("polymod.autoupdate"),
+                Localization.Get("polymod.autoupdate.description"),
+                new(new PopupBase.PopupButtonData[] {
                     new(
                         "polymod.autoupdate.update",
                         PopupBase.PopupButtonData.States.None,
                         (Il2CppSystem.Action)Update
                     )
-            };
-
-            popup.Show();
-            
+                }))
+            ).Show();
         }
         catch (Exception e)
         {

src/Managers/Compatibility.cs

@@ -67,14 +67,13 @@ private static bool CheckSignatures(Action action, Il2CppSystem.Guid gameId)
         }
         if (!doChecksumsMatch)
         {
-            BasicPopup popup = PopupManager.GetBasicPopup();
-            popup.Header = Localization.Get("polymod.signature.mismatch");
-            popup.Description = Localization.Get("polymod.signature.incompatible");
-            popup.buttonData = new PopupBase.PopupButtonData[] {
-                new("OK")
-            };
-
-            popup.Show();
+            PopupManager.GetBasicPopupWithData(new(
+                Localization.Get("polymod.signature.mismatch"),
+                Localization.Get("polymod.signature.incompatible"),
+                new(new PopupBase.PopupButtonData[] {
+                    new("OK")
+                })
+            )).Show();
 
             return false;
         }
@@ -116,20 +115,21 @@ private static void StartScreen_UI2_OnShow()
             );
             PlayerPrefs.Save();
 
-            BasicPopup popup = PopupManager.GetBasicPopup();
-            popup.Header = Localization.Get("polymod.version.mismatch");
-            popup.Description = Localization.Get("polymod.version.mismatch.description");
-            popup.buttonData = new PopupBase.PopupButtonData[] {
-                    new("buttons.stay", customColorStates: ColorConstants.redButtonColorStates),
-                    new(
-                        "buttons.exitgame",
-                        PopupBase.PopupButtonData.States.None,
-                        (Il2CppSystem.Action)Application.Quit,
-                        closesPopup: false
-                    )
-            };
-
-            popup.Show();
+            PopupManager.GetBasicPopupWithData(
+                new(
+                    Localization.Get("polymod.version.mismatch"),
+                    Localization.Get("polymod.version.mismatch.description"),
+                    new PopupBase.PopupButtonData[] {
+                        new("buttons.stay", customColorStates: ColorConstants.redButtonColorStates),
+                        new(
+                            "buttons.exitgame",
+                            PopupBase.PopupButtonData.States.None,
+                            (Il2CppSystem.Action)Application.Quit,
+                            closesPopup: false
+                        )
+                    }
+                )
+            ).Show();
         }
     }
 

src/Managers/Hub.cs

@@ -196,18 +196,21 @@ void OpenDiscord()
 
         if (Main.dependencyCycle)
         {
-            BasicPopup popup = PopupManager.GetBasicPopup();
-            popup.Header = Localization.Get("polymod.cycle");
-            popup.Description = Localization.Get("polymod.cycle.description");
-            popup.buttonData = new PopupBase.PopupButtonData[] {
+            BasicPopup popup = PopupManager.GetBasicPopupWithData(
                 new(
-                    "buttons.exitgame",
-                    PopupBase.PopupButtonData.States.None,
-                    (Il2CppSystem.Action)Application.Quit,
-                    closesPopup: false,
-                    customColorStates: ColorConstants.redButtonColorStates
+                    Localization.Get("polymod.cycle"),
+                    Localization.Get("polymod.cycle.description"),
+                    new PopupBase.PopupButtonData[] {
+                        new(
+                            "buttons.exitgame",
+                            PopupBase.PopupButtonData.States.None,
+                            (Il2CppSystem.Action)Application.Quit,
+                            closesPopup: false,
+                            customColorStates: ColorConstants.redButtonColorStates
+                        )
+                    }
                 )
-            };
+            );
 
             popup.IsUnskippable = true;
             popup.Show();