UI improvements for player name input (#2274)

Co-authored-by: Measurity <[email protected]>

Author: SpaceMonkeyy86

NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/JoinServerBackend.cs

@@ -9,9 +9,9 @@
 using NitroxClient.MonoBehaviours.Gui.MainMenu.ServersList;
 using NitroxModel.Core;
 using NitroxModel.DataStructures.Util;
+using NitroxModel.Helper;
 using NitroxModel.MultiplayerSession;
 using NitroxModel_Subnautica.DataStructures;
-using NitroxModel.Helper;
 using UnityEngine;
 
 namespace NitroxClient.MonoBehaviours.Gui.MainMenu.ServerJoin;
@@ -56,12 +56,14 @@ private static void SessionConnectionStateChangedHandler(IMultiplayerSessionConn
                     Log.InGame(Language.main.Get("Nitrox_WaitingPassword"));
                     MainMenuEnterPasswordPanel.ResetLastEnteredPassword();
                     MainMenuRightSide.main.OpenGroup(MainMenuEnterPasswordPanel.NAME);
+                    MainMenuEnterPasswordPanel.Instance.FocusPasswordField();
                     break;
                 }
 
                 Log.Info("Waiting for user input");
                 Log.InGame(Language.main.Get("Nitrox_WaitingUserInput"));
                 MainMenuRightSide.main.OpenGroup(MainMenuJoinServerPanel.NAME);
+                MainMenuJoinServerPanel.Instance.FocusNameInputField();
                 break;
 
             case MultiplayerSessionConnectionStage.SESSION_RESERVED:

NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/MainMenuEnterPasswordPanel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Linq;
 using FMODUnity;
 using NitroxClient.MonoBehaviours.Gui.MainMenu.ServersList;
@@ -15,6 +16,8 @@ public class MainMenuEnterPasswordPanel : MonoBehaviour, uGUI_INavigableIconGrid
 {
     public const string NAME = "MultiplayerEnterPassword";
 
+    public static MainMenuEnterPasswordPanel Instance { get; private set; }
+
     private TMP_InputField passwordInput;
     private mGUI_Change_Legend_On_Select legendChange;
 
@@ -27,6 +30,8 @@ public class MainMenuEnterPasswordPanel : MonoBehaviour, uGUI_INavigableIconGrid
 
     public void Setup(GameObject savedGamesRef)
     {
+        Instance = this;
+
         GameObject multiplayerButtonRef = savedGamesRef.RequireGameObject("Scroll View/Viewport/SavedGameAreaContent/NewGame");
         GameObject generalTextRef = multiplayerButtonRef.GetComponentInChildren<TextMeshProUGUI>().gameObject;
         GameObject inputFieldRef = GameObject.Find("/Menu canvas/Panel/MainMenu/RightSide/Home/EmailBox/InputField");
@@ -37,7 +42,7 @@ public void Setup(GameObject savedGamesRef)
         passwordInput = passwordInputGameObject.GetComponent<TMP_InputField>();
         passwordInput.characterValidation = TMP_InputField.CharacterValidation.None;
         passwordInput.onSubmit = new TMP_InputField.SubmitEvent();
-        passwordInput.onSubmit.AddListener(_ => { SelectItemInDirection(0, 1); });
+        passwordInput.onSubmit.AddListener(_ => OnConfirmButtonClicked());
         passwordInput.placeholder.GetComponent<TranslationLiveUpdate>().translationKey = Language.main.Get("Nitrox_JoinServerPlaceholder");
         GameObject passwordInputDesc = Instantiate(generalTextRef, passwordInputGameObject.transform, false);
         passwordInputDesc.transform.localPosition = new Vector3(-200, 0, 0);
@@ -66,10 +71,24 @@ public void Setup(GameObject savedGamesRef)
         legendChange.legendButtonConfiguration = confirmButtonButton.GetComponent<mGUI_Change_Legend_On_Select>().legendButtonConfiguration.Take(1).ToArray();
     }
 
+    public void FocusPasswordField()
+    {
+        StartCoroutine(Coroutine());
+
+        IEnumerator Coroutine()
+        {
+            passwordInput.Select();
+            EventSystem.current.SetSelectedGameObject(passwordInput.gameObject);
+            yield return null;
+            passwordInput.MoveToEndOfLine(false, true);
+        }
+    }
+
     private void OnConfirmButtonClicked()
     {
         lastEnteredPassword = passwordInput.text;
         MainMenuRightSide.main.OpenGroup(MainMenuJoinServerPanel.NAME);
+        MainMenuJoinServerPanel.Instance.FocusNameInputField();
     }
 
     private static void OnCancelClick()

NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/MainMenuJoinServerPanel.cs

@@ -65,6 +65,9 @@ private IEnumerator AsyncSetup(GameObject savedGamesRef)
         playerNameInputField.textComponent.fontSizeMax = 21;
         playerNameInputField.textComponent.GetComponent<RectTransform>().sizeDelta = new Vector2(-20, 42);
         playerNameInputField.characterLimit = 25; // See this.OnJoinClick()
+        playerNameInputField.onFocusSelectAll = false;
+        playerNameInputField.onSubmit.AddListener(_ => OnJoinClick());
+        playerNameInputField.onSubmit.AddListener(_ => DeselectAllItems());
         playerNameInputField.ActivateInputField();
 
         //Prepares player color picker
@@ -133,6 +136,17 @@ public void UpdatePlayerPanelValues(string playerName, Vector3 hsb)
         colorPicker.SetHSB(hsb);
     }
 
+    public void FocusNameInputField()
+    {
+        StartCoroutine(Coroutine());
+        IEnumerator Coroutine()
+        {
+            SelectFirstItem();
+            yield return new WaitForEndOfFrame();
+            playerNameInputField.MoveToEndOfLine(false, true);
+        }
+    }
+
     public bool OnButtonDown(GameInput.Button button)
     {
         if (button != GameInput.Button.UISubmit || !selectedItem)