Merge remote-tracking branch 'origin/dev' into cleanup

This commit is contained in:
Az committed 2026-09-21 18:35:15 -04:00
commit 1f6558e7c3
2 files changed
+13 -3

No files matched your search

+4 -3
View File
@@ -1,9 +1,10 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using MiraAPI.Patches.Stubs;
using MiraAPI.Translation;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities;
using Reactor.Utilities.Extensions;
@@ -279,7 +280,7 @@ public abstract class CustomPaginableMenu : CustomPhoneMenu<CustomPaginableMenu.
if (label != null)
{
label.name = $"{Name}SearchLabel";
label.text = "Search";
label.text = MiraLocaleManager.Get("Search", "Search");
label.alignment = TextAlignmentOptions.Center;
label.fontSize = label.fontSizeMin = label.fontSizeMax = 2.1f;
label.color = Color.white;
@@ -296,7 +297,7 @@ public abstract class CustomPaginableMenu : CustomPhoneMenu<CustomPaginableMenu.
if (noResultsText != null)
{
noResultsText.name = $"{Name}NoResultsText";
noResultsText.text = "No results";
noResultsText.text = MiraLocaleManager.Get($"{Name}NoResults", "No results");
noResultsText.alignment = TextAlignmentOptions.Center;
noResultsText.fontSize = noResultsText.fontSizeMin = noResultsText.fontSizeMax = 2.25f;
noResultsText.color = Color.white;
+9
View File
@@ -333,6 +333,15 @@ public abstract class CustomPhoneMenu : ICustomMenu
button.UnselectedColor = uColor;
}
}
/// <summary>
/// Implicitly converts to the <see cref="Minigame"/> the <see cref="CustomPhoneMenu"/> wraps.
/// </summary>
/// <param name="menu">The menu instance.</param>
public static implicit operator Minigame(CustomPhoneMenu menu)
{
return menu.Component;
}
}
/// <inheritdoc cref="CustomPhoneMenu"/>