Rescan popup action (YARC-Official#781)

* Actionable Toasts * On rescan required message, clicking Toast goes to Settings page. --------- Co-authored-by: Vinay Kapadia <[email protected]>
sh0ckR6 · May 23, 2024 · f6440f7 · f6440f7
1 parent a77408f
commit f6440f7
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 19 deletions.
diff --git a/Assets/Script/Gameplay/GameManager.Loading.cs b/Assets/Script/Gameplay/GameManager.Loading.cs
@@ -13,6 +13,7 @@
 using YARG.Gameplay.Player;
 using YARG.Menu.Navigation;
 using YARG.Menu.Persistent;
+using YARG.Menu.Settings;
 using YARG.Playback;
 using YARG.Player;
 using YARG.Replays;
@@ -133,7 +134,11 @@ private async void Start()
 
             if (_loadState == LoadFailureState.Rescan)
             {
-                ToastManager.ToastWarning("Chart requires a rescan!");
+                ToastManager.ToastWarning("Chart requires a rescan!", () =>
+                {
+                    SettingsMenu.Instance.gameObject.SetActive(true);
+                    SettingsMenu.Instance.SelectTabByName("SongManager");
+                });
 
                 global.LoadScene(SceneIndex.Menu);
                 return;

diff --git a/Assets/Script/Menu/Persistent/Toasts/Toast.cs b/Assets/Script/Menu/Persistent/Toasts/Toast.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using DG.Tweening;
 using TMPro;
 using UnityEngine;
@@ -27,8 +28,9 @@ public class Toast : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler,
 
         private bool _canInteract;
         private Coroutine _coroutine;
+        private Action _onClick;
 
-        public void Initialize(string type, string message, Sprite icon, Color color)
+        public void Initialize(string type, string message, Sprite icon, Color color, Action onClick)
         {
             _background.color = color;
 
@@ -39,6 +41,8 @@ public void Initialize(string type, string message, Sprite icon, Color color)
             _message.color = Color.white;
             _message.text = message;
 
+            _onClick = onClick;
+
             _coroutine = StartCoroutine(ToastStartCoroutine());
         }
 
@@ -96,6 +100,8 @@ public void OnPointerClick(PointerEventData eventData)
                 return;
             }
 
+            _onClick?.Invoke();
+
             StopCoroutine(_coroutine);
             _coroutine = StartCoroutine(ToastEndCoroutine());
         }

diff --git a/Assets/Script/Menu/Persistent/Toasts/ToastManager.cs b/Assets/Script/Menu/Persistent/Toasts/ToastManager.cs
@@ -51,11 +51,13 @@ private readonly struct ToastInfo
         {
             public readonly ToastType Type;
             public readonly string Text;
+            public readonly Action OnClick;
 
-            public ToastInfo(ToastType type, string text)
+            public ToastInfo(ToastType type, string text, Action onClick)
             {
                 Type = type;
                 Text = text;
+                OnClick = onClick;
             }
         }
 
@@ -68,51 +70,56 @@ private void Update()
 
             while (transform.childCount < MAX_TOAST_COUNT && _toastQueue.TryDequeue(out var toast))
             {
-                ShowToast(toast.Type, toast.Text);
+                ShowToast(toast.Type, toast.Text, toast.OnClick);
             }
         }
 
         /// <summary>
         /// Adds a general message toast to the toast queue.
         /// </summary>
         /// <param name="text">Text of the toast.</param>
-        public static void ToastMessage(string text)
-            => AddToast(ToastType.General, text);
+        /// <param name="onClick">Action to perform when the toast is clicked.</param>
+        public static void ToastMessage(string text, Action onClick = null)
+            => AddToast(ToastType.General, text, onClick);
 
         /// <summary>
         /// Adds an information message toast to the toast queue.
         /// </summary>
         /// <param name="text">Text of the toast.</param>
-        public static void ToastInformation(string text)
-            => AddToast(ToastType.Information, text);
+        /// <param name="onClick">Action to perform when the toast is clicked.</param>
+        public static void ToastInformation(string text, Action onClick = null)
+            => AddToast(ToastType.Information, text, onClick);
 
         /// <summary>
         /// Adds a success message toast to the toast queue.
         /// </summary>
         /// <param name="text">Text of the toast.</param>
-        public static void ToastSuccess(string text)
-            => AddToast(ToastType.Success, text);
+        /// <param name="onClick">Action to perform when the toast is clicked.</param>
+        public static void ToastSuccess(string text, Action onClick = null)
+            => AddToast(ToastType.Success, text, onClick);
 
         /// <summary>
         /// Adds a warning message toast to the toast queue.
         /// </summary>
         /// <param name="text">Text of the toast.</param>
-        public static void ToastWarning(string text)
-            => AddToast(ToastType.Warning, text);
+        /// <param name="onClick">Action to perform when the toast is clicked.</param>
+        public static void ToastWarning(string text, Action onClick = null)
+            => AddToast(ToastType.Warning, text, onClick);
 
         /// <summary>
         /// Adds an error message toast to the toast queue.
         /// </summary>
         /// <param name="text">Text of the toast.</param>
-        public static void ToastError(string text)
-            => AddToast(ToastType.Error, text);
+        /// <param name="onClick">Action to perform when the toast is clicked.</param>
+        public static void ToastError(string text, Action onClick = null)
+            => AddToast(ToastType.Error, text, onClick);
 
-        private static void AddToast(ToastType type, string text)
+        private static void AddToast(ToastType type, string text, Action onClick)
         {
-            _toastQueue.Enqueue(new ToastInfo(type, text));
+            _toastQueue.Enqueue(new ToastInfo(type, text, onClick));
         }
 
-        private void ShowToast(ToastType type, string body)
+        private void ShowToast(ToastType type, string body, Action onClick)
         {
             // Get properties for this message type
             var (text, color, icon) = type switch
@@ -126,7 +133,7 @@ private void ShowToast(ToastType type, string body)
             };
 
             var toast = Instantiate(_toastPrefab, transform);
-            toast.Initialize(text, body, icon, color);
+            toast.Initialize(text, body, icon, color, onClick);
         }
     }
 }