Skip to content

New toggle menu graphics #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RS-Mind wants to merge 1 commit into
base: main
Choose a base branch
from
Open

New toggle menu graphics #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified UnboundLib/Assets/togglemenuui
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion UnboundLib/Utils/LevelManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void Start()
{
if (level.name.Contains("Phys") || level.name.Contains("Destructible") || level.name.Contains("Grape") || level.name.Contains("Serendipity") || level.name.Contains("Jumbo"))
{
level.category = "Default physics";
level.category = "Physics";
}
}

Expand Down
12 changes: 11 additions & 1 deletion UnboundLib/Utils/UI/ModOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,21 @@ void FixMainMenuLayout()
() =>
{
ToggleCardsMenuHandler.SetActive(ToggleCardsMenuHandler.cardMenuCanvas.transform, true);
foreach (Animator tabAnimator in ToggleCardsMenuHandler.categoryContent.GetComponentsInChildren<Animator>())
{
tabAnimator.SetTrigger(ToggleCardsMenuHandler.scrollViews[tabAnimator.gameObject.GetComponentInParent<Button>().gameObject.name].gameObject.activeSelf.ToString());
}
});

// Create toggle levels button
MenuHandler.CreateButton("Toggle Levels", modOptionsMenu,
() => { ToggleLevelMenuHandler.instance.SetActive(true); });
() => {
ToggleLevelMenuHandler.instance.SetActive(true);
foreach (Animator tabAnimator in ToggleLevelMenuHandler.categoryContent.GetComponentsInChildren<Animator>())
{
tabAnimator.SetTrigger(ToggleLevelMenuHandler.scrollViews[tabAnimator.gameObject.GetComponentInParent<Button>().gameObject.name].gameObject.activeSelf.ToString());
}
});

// Create menu's for mods with new UI
foreach (var menu in modMenus)
Expand Down
14 changes: 12 additions & 2 deletions UnboundLib/Utils/UI/ToggleCardsMenuHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class ToggleCardsMenuHandler : MonoBehaviour
{
public static ToggleCardsMenuHandler instance;

private static readonly Dictionary<string, Transform> scrollViews = new Dictionary<string, Transform>();
internal static readonly Dictionary<string, Transform> scrollViews = new Dictionary<string, Transform>();

public static readonly Dictionary<GameObject, Action> cardObjs = new Dictionary<GameObject, Action>();
public static readonly List<Action> defaultCardActions = new List<Action>();
Expand All @@ -30,7 +30,7 @@ public class ToggleCardsMenuHandler : MonoBehaviour
private GameObject categoryButtonAsset;

private Transform scrollViewTrans;
private Transform categoryContent;
internal static Transform categoryContent;

public static bool disableEscapeButton;
public static bool menuOpenFromOutside;
Expand Down Expand Up @@ -227,8 +227,18 @@ void CardAction()
categoryObj.SetActive(true);
categoryObj.name = category;
categoryObj.GetComponentInChildren<TextMeshProUGUI>().text = category;

categoryObj.GetComponent<Button>().onClick.AddListener(() =>
{
foreach (Animator buttonAnimator in categoryContent.GetComponentsInChildren<Animator>())
{
if (!categoryObj.GetComponentsInChildren<Animator>().Contains(buttonAnimator))
buttonAnimator.SetTrigger("False");
}
foreach (Animator buttonAnimator in categoryObj.GetComponentsInChildren<Animator>())
{
buttonAnimator.SetTrigger("True");
}
string categoryText = "Viewing: " + category;
if (viewingText.text == categoryText) return;
viewingText.text = categoryText;
Expand Down
80 changes: 30 additions & 50 deletions UnboundLib/Utils/UI/ToggleLevelMenuHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ public class ToggleLevelMenuHandler : MonoBehaviour
public GameObject mapMenuCanvas;

// Dictionary of scrollView names(category name) compared with the transforms of the scroll views
private static readonly Dictionary<string, Transform> ScrollViews = new Dictionary<string, Transform>();
internal static readonly Dictionary<string, Transform> scrollViews = new Dictionary<string, Transform>();

//List of buttons and toggles to disable when not host
private readonly List<Button> buttonsToDisable = new List<Button>();
private readonly List<Toggle> togglesToDisable = new List<Toggle>();

// Content obj in category scroll view
private Transform categoryContent;
internal static Transform categoryContent;
// Transform of root scroll views obj
private Transform scrollViewTrans;

Expand Down Expand Up @@ -64,7 +64,7 @@ public class ToggleLevelMenuHandler : MonoBehaviour
private bool redrawDisabled;
private bool manualRedraw;

private string CurrentCategory => (from scroll in ScrollViews where scroll.Value.gameObject.activeInHierarchy select scroll.Key).FirstOrDefault();
private string CurrentCategory => (from scroll in scrollViews where scroll.Value.gameObject.activeInHierarchy select scroll.Key).FirstOrDefault();

// if need to toggle all on or off
private bool toggledAll;
Expand Down Expand Up @@ -111,7 +111,7 @@ public void Start()
var searchBar = mapMenuCanvas.transform.Find("MapMenu/Top/InputField").gameObject;
searchBar.GetComponent<TMP_InputField>().onValueChanged.AddListener(value =>
{
foreach (var level in ScrollViews.SelectMany(scrollViewPair => scrollViewPair.Value.GetComponentsInChildren<Button>(true)))
foreach (var level in scrollViews.SelectMany(scrollViewPair => scrollViewPair.Value.GetComponentsInChildren<Button>(true)))
{
if (value == "")
{
Expand Down Expand Up @@ -197,8 +197,9 @@ public void Start()
foreach (var category in LevelManager.categories)
{
var newScrollView = Instantiate(scrollView, scrollViewTrans);
newScrollView.SetActive(false);
newScrollView.name = category;
ScrollViews.Add(category, newScrollView.transform);
scrollViews.Add(category, newScrollView.transform);
if (category == "Vanilla")
{
newScrollView.SetActive(true);
Expand All @@ -213,7 +214,7 @@ public void Start()
levelsThatNeedToRedrawn.Add(level.Key);
}

var parentScroll = ScrollViews[level.Value.category].Find("Viewport/Content");
var parentScroll = scrollViews[level.Value.category].Find("Viewport/Content");
var mapObject = Instantiate(mapObj, parentScroll);
mapObject.SetActive(true);

Expand Down Expand Up @@ -259,7 +260,7 @@ public void Start()
var viewingText = mapMenuCanvas.transform.Find("MapMenu/Top/Viewing").gameObject.GetComponentInChildren<TextMeshProUGUI>();

// Create category buttons
List<string> sortedCategories = new[] { "Vanilla", "Default physics" }.Concat(LevelManager.categories.OrderBy(c => c).Except(new[] { "Vanilla", "Default physics" })).ToList();
List<string> sortedCategories = new[] { "Vanilla", "Physics" }.Concat(LevelManager.categories.OrderBy(c => c).Except(new[] { "Vanilla", "Physics" })).ToList();
foreach (var category in sortedCategories)
{
var categoryObj = Instantiate(categoryButton, categoryContent);
Expand All @@ -268,13 +269,22 @@ public void Start()
categoryObj.GetComponentInChildren<TextMeshProUGUI>().text = category;
categoryObj.GetComponent<Button>().onClick.AddListener(() =>
{
foreach (var scroll in ScrollViews)
foreach (Animator buttonAnimator in categoryContent.GetComponentsInChildren<Animator>())
{
if (!categoryObj.GetComponentsInChildren<Animator>().Contains(buttonAnimator))
buttonAnimator.SetTrigger("False");
}
foreach (Animator buttonAnimator in categoryObj.GetComponentsInChildren<Animator>())
{
buttonAnimator.SetTrigger("True");
}
foreach (var scroll in scrollViews)
{
scroll.Value.gameObject.SetActive(false);
}

ScrollViews[category].GetComponent<ScrollRect>().normalizedPosition = new Vector2(0, 1);
ScrollViews[category].gameObject.SetActive(true);
scrollViews[category].GetComponent<ScrollRect>().normalizedPosition = new Vector2(0, 1);
scrollViews[category].gameObject.SetActive(true);

viewingText.text = "Viewing: " + category;
});
Expand All @@ -284,7 +294,7 @@ public void Start()

void UpdateCategoryVisuals(bool enabledVisuals)
{
foreach (var obj in ScrollViews.Where(obj => obj.Key == category))
foreach (var obj in scrollViews.Where(obj => obj.Key == category))
{
obj.Value.Find("Darken").gameObject.SetActive(!enabledVisuals);
if (enabledVisuals)
Expand Down Expand Up @@ -333,14 +343,15 @@ public static void UpdateVisualsLevelObj(GameObject lvlObj)
{
lvlObj.transform.Find("Image").GetComponent<Image>().color = Color.white;
lvlObj.transform.Find("Background").GetComponent<Image>().color = new Color(0.2352941f, 0.2352941f, 0.2352941f, 0.8470588f);
lvlObj.GetComponentInChildren<TextMeshProUGUI>().color = Color.white;
lvlObj.GetComponentInChildren<TextMeshProUGUI>().color = new Color(0.5372549f, 0.5372549f, 0.5372549f, 1f);
}
else
{
lvlObj.transform.Find("Image").GetComponent<Image>().color = new Color(0.25f, 0.25f, 0.25f);
lvlObj.transform.Find("Background").GetComponent<Image>().color = new Color(0.15f, 0.15f, 0.15f);
lvlObj.GetComponentInChildren<TextMeshProUGUI>().color = new Color(0.25f, 0.25f, 0.25f);
}
lvlObj.transform.Find("Highlight").gameObject.SetActive(LevelManager.levels[lvlObj.name].selected);
}

// Update the image of a mapObject
Expand Down Expand Up @@ -404,49 +415,16 @@ private IEnumerator LoadScenesForRedrawing(IEnumerable<string> sceneNames)

private static void ChangeMapColumnAmountMenus(int amount)
{
Vector2 cellSize = new Vector2(158, 115);
float localScale;
switch (amount)
{
case 3:
{
localScale = 1.4f;
break;
}
default:
{
localScale = 1f;
break;
}
case 5:
{
localScale = 0.85f;
break;
}
case 6:
{
localScale = 0.7f;
break;
}
case 7:
{
localScale = 0.6f;
break;
}
case 8:
{
localScale = 0.525f;
break;
}
}
Vector2 cellSize = new Vector2(164, 112);
float localScale = 4f / amount;
cellSize *= localScale;

mapAmountText.text = "Maps Per Line: " + amount;
foreach (GridLayoutGroup gridLayout in from category in LevelManager.categories select ScrollViews[category].Find("Viewport/Content") into categoryMenu where categoryMenu != null select categoryMenu.gameObject.GetComponent<GridLayoutGroup>())
foreach (GridLayoutGroup gridLayout in from category in LevelManager.categories select scrollViews[category].Find("Viewport/Content") into categoryMenu where categoryMenu != null select categoryMenu.gameObject.GetComponent<GridLayoutGroup>())
{
gridLayout.cellSize = cellSize;
gridLayout.constraintCount = amount;
gridLayout.spacing = new Vector2(0, 20 * localScale);
gridLayout.spacing = new Vector2(5f * localScale, 5f * localScale);
}
}

Expand Down Expand Up @@ -561,7 +539,9 @@ public void RightClickedAt(Vector2 position, GameObject obj)
RemoveAllRightClickMenus();
mousePosOnRightClickMenu = position;
justRightClicked = true;
var rightMenu = Instantiate(rightClickMenu, position, Quaternion.identity, mapMenuCanvas.transform.Find("MapMenu"));
Vector3 rightMenuWorldPos = MainCam.instance.transform.GetComponent<Camera>().ScreenToWorldPoint(position);
rightMenuWorldPos.z = 0;
var rightMenu = Instantiate(rightClickMenu, rightMenuWorldPos, Quaternion.identity, mapMenuCanvas.transform.Find("MapMenu"));
var levelKey = obj.name;

var selectedCount = LevelManager.levels.Count(lvl => lvl.Value.selected);
Expand Down