Get rid of hackfix

monkeymanboy · Jun 10, 2023 · 6c8554d · 6c8554d
1 parent 951ae22
commit 6c8554d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/BeatSaberMarkupLanguage/Components/Settings/ListSliderSetting.cs b/BeatSaberMarkupLanguage/Components/Settings/ListSliderSetting.cs
@@ -30,7 +30,6 @@ public override void Setup()
             text = slider.GetComponentInChildren<TextMeshProUGUI>();
             slider.numberOfSteps = values.Count;
             slider.valueDidChangeEvent += OnChange;
-            StartCoroutine(SetInitialText());
         }
 
         public override void ApplyValue()
@@ -54,19 +53,6 @@ protected string TextForValue(object value)
         private void Awake()
         {
             ReceiveValue();
-        }
-
-        private void OnEnable()
-        {
-            StartCoroutine(SetInitialText());
-        }
-
-        // I don't really like this but for some reason I can't get the initial starting text any other quick way and this works perfectly fine
-        private IEnumerator SetInitialText()
-        {
-            yield return new WaitForFixedUpdate();
-            text.text = TextForValue(Value);
-            yield return new WaitForSeconds(0.1f); // If the first one is too fast, don't yell at me pls
             text.text = TextForValue(Value);
         }
 

diff --git a/BeatSaberMarkupLanguage/Plugin.cs b/BeatSaberMarkupLanguage/Plugin.cs
@@ -119,10 +119,10 @@ public void OnExit()
 
         public void MenuLoadFresh(ScenesTransitionSetupDataSO scenesTransitionSetupData, DiContainer diContainer)
         {
-            // GameplaySetup.GameplaySetup.instance.AddTab("Test", "BeatSaberMarkupLanguage.Views.gameplay-setup-test.bsml", GameplaySetupTest.instance);
+            // GameplaySetup.GameplaySetup.instance.AddTab("Test", "BeatSaberMarkupLanguage.Views.gameplay-setup-test.bsml", GameplaySetup.GameplaySetupTest.instance);
             // BSMLSettings.instance.AddSettingsMenu("Test", "BeatSaberMarkupLanguage.Views.settings-test.bsml", SettingsTest.instance);
-            // SharedCoroutineStarter.instance.StartCoroutine(PresentTest<TestViewController>());
-            // SharedCoroutineStarter.instance.StartCoroutine(PresentTest<LocalizationTestViewController>());
+            // SharedCoroutineStarter.instance.StartCoroutine(PresentTest<ViewControllers.TestViewController>());
+            // SharedCoroutineStarter.instance.StartCoroutine(PresentTest<ViewControllers.LocalizationTestViewController>());
             // MenuButtons.MenuButtons.instance.RegisterButton(new MenuButtons.MenuButton("test", () => MenuButtons.MenuButtons.instance.RegisterButton(new MenuButtons.MenuButton("test2",null))));
             BSMLSettings.instance.Setup();
             MenuButtons.MenuButtons.instance.Setup();
@@ -161,13 +161,13 @@ private void OnInstallEarlyBindings(ScenesTransitionSetupDataSO setupData, DiCon
 
         // It's just for testing so don't yell at me
         /*private IEnumerator PresentTest<T>()
-            where T : ViewController
+            where T : HMUI.ViewController
         {
             yield return new WaitForSeconds(1);
-            ViewController testViewController = BeatSaberUI.CreateViewController<T>();
+            HMUI.ViewController testViewController = BeatSaberUI.CreateViewController<T>();
             FloatingScreen.FloatingScreen floatingScreen = FloatingScreen.FloatingScreen.CreateFloatingScreen(new Vector2(400, 200), true, Vector3.zero, Quaternion.identity);
-            floatingScreen.SetRootViewController(testViewController, ViewController.AnimationType.None);
-            Resources.FindObjectsOfTypeAll<MainFlowCoordinator>().First().PresentViewController(testViewController, null, ViewController.AnimationDirection.Horizontal, false);
+            floatingScreen.SetRootViewController(testViewController, HMUI.ViewController.AnimationType.None);
+            Resources.FindObjectsOfTypeAll<MainFlowCoordinator>().First().PresentViewController(testViewController, null, HMUI.ViewController.AnimationDirection.Horizontal, false);
         }*/
     }
 }
diff --git a/BeatSaberMarkupLanguage/Settings/SettingsTest.cs b/BeatSaberMarkupLanguage/Settings/SettingsTest.cs
@@ -27,7 +27,7 @@ public class SettingsTest : NotifiableSingleton<SettingsTest>
         private List<object> options = new object[] { "1", "Something", "Kapow", "Yeet" }.ToList();
 
         [UIValue("list-choice")]
-        private string listChoice = "Something";
+        private string listChoice = "Kapow";
 
         [UIValue("bool-test")]
         private bool BoolTest

diff --git a/BeatSaberMarkupLanguage/Views/settings-test.bsml b/BeatSaberMarkupLanguage/Views/settings-test.bsml
@@ -3,6 +3,7 @@
   <string-setting text='string test' value='string-value'></string-setting>
   <slider-setting text='slider test' min='-10' max='50' increment='1' value='slider-value' integer-only='true' formatter='format'></slider-setting>
   <dropdown-list-setting text='Dropdown Test' value='list-choice' choices='list-options'></dropdown-list-setting>
+  <list-slider-setting text='List Slider Test' value='list-choice' choices='list-options'></list-slider-setting>
   <bool-setting text='bool test' value='bool-test' bind-value='true'></bool-setting>
   <clickable-text text='Test change value' on-click='change-bool'></clickable-text>
   <settings-submenu text='Open Submenu' hover-hint='we got hover hints boi'>