Merge pull request #30 from Gamersven/Merge

RequiDev · web-flow · commit 2c4fb93037db · 2022-07-11T22:21:52.000+02:00
Added the Ability to set an Icon for Toggles
diff --git a/UI/QuickMenu/IButtonPage.cs b/UI/QuickMenu/IButtonPage.cs
@@ -7,10 +7,12 @@ public interface IButtonPage
     {
         ReMenuButton AddButton(string text, string tooltip, Action onClick, Sprite sprite = null);
         ReMenuButton AddSpacer(Sprite sprite = null);
-        ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false);
-        ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue);
         ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null);
         ReCategoryPage AddCategoryPage(string text, string tooltip = "", Sprite sprite = null);
+        ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false);
+        ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue);
+        ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null);
+        ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue, Sprite iconOn = null, Sprite iconOff = null);
         ReMenuPage GetMenuPage(string name);
         ReCategoryPage GetCategoryPage(string name);
         void AddCategoryPage(string text, string tooltip, Action<ReCategoryPage> onPageBuilt, Sprite sprite = null);
diff --git a/UI/QuickMenu/ReMenuCategory.cs b/UI/QuickMenu/ReMenuCategory.cs
@@ -185,15 +185,18 @@ public ReMenuButton AddSpacer(Sprite sprite = null) {
             return spacer;
         }
 
-        public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false)
+        public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false) 
+            => AddToggle(text, tooltip, onToggle, defaultValue, null, null);
+        public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)
+            => AddToggle(text, tooltip, configValue, null, null);
+        public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null)
         {
-            var toggle = new ReMenuToggle(text, tooltip, onToggle, _buttonContainer.RectTransform, defaultValue);
+            var toggle = new ReMenuToggle(text, tooltip, onToggle, _buttonContainer.RectTransform, defaultValue, iconOn, iconOff);
             return toggle;
         }
-
-        public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)
+        public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue, Sprite iconOn = null, Sprite iconOff = null)
         {
-            var toggle = new ReMenuToggle(text, tooltip, configValue.SetValue, _buttonContainer.RectTransform, configValue);
+            var toggle = new ReMenuToggle(text, tooltip, configValue.SetValue, _buttonContainer.RectTransform, configValue, iconOn, iconOff);
             return toggle;
         }
 
diff --git a/UI/QuickMenu/ReMenuPage.cs b/UI/QuickMenu/ReMenuPage.cs
@@ -161,13 +161,16 @@ public ReMenuButton AddSpacer(Sprite sprite = null)
         }
 
         public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false)
+            => AddToggle(text, tooltip, onToggle, defaultValue, null, null);
+        public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)
+            => AddToggle(text, tooltip, configValue, null, null);
+        public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null)
         {
-            return new ReMenuToggle(text, tooltip, onToggle, _container, defaultValue);
+            return new ReMenuToggle(text, tooltip, onToggle, _container, defaultValue, iconOn, iconOff);
         }
-
-        public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)
+        public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue, Sprite iconOn = null, Sprite iconOff = null)
         {
-            return new ReMenuToggle(text, tooltip, configValue.SetValue, _container, configValue);
+            return new ReMenuToggle(text, tooltip, configValue.SetValue, _container, configValue, iconOn, iconOff);
         }
 
         public ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null)
diff --git a/UI/QuickMenu/ReMenuToggle.cs b/UI/QuickMenu/ReMenuToggle.cs
@@ -60,11 +60,13 @@ public string Tooltip {
                 _tooltip.field_Public_String_1 = value;
             }
         }
-
-        public ReMenuToggle(string text, string tooltip, Action<bool> onToggle, Transform parent, bool defaultValue = false) : base(QuickMenuEx.TogglePrefab, parent, $"Button_Toggle{text}")
+        public ReMenuToggle(string text, string tooltip, Action<bool> onToggle, Transform parent, bool defaultValue = false) : this(text, tooltip, onToggle, parent, defaultValue, null, null) { }
+        public ReMenuToggle(string text, string tooltip, Action<bool> onToggle, Transform parent, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null) : base(QuickMenuEx.TogglePrefab, parent, $"Button_Toggle{text}")
         {
-            var iconOn = RectTransform.Find("Icon_On").GetComponent<Image>();
-            iconOn.sprite = QuickMenuEx.OnIconSprite;
+            var icon = RectTransform.Find("Icon_On").GetComponent<Image>();
+            icon.sprite = iconOn ?? QuickMenuEx.OnIconSprite;
+            icon = RectTransform.Find("Icon_Off").GetComponent<Image>();
+            icon.sprite = iconOff ?? QuickMenuEx.OffIconSprite;
 
             Object.DestroyImmediate(GameObject.GetComponent<UIInvisibleGraphic>()); // Fix for having clickable area overlap main quickmenu ui
 

Original file line number	Diff line number	Diff line change
`@@ -185,15 +185,18 @@ public ReMenuButton AddSpacer(Sprite sprite = null) {`
`185`	`185`	`return spacer;`
`186`	`186`	`}`
`187`	`187`
`188`		`- public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false)`
	`188`	`+ public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false)`
	`189`	`+ => AddToggle(text, tooltip, onToggle, defaultValue, null, null);`
	`190`	`+ public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)`
	`191`	`+ => AddToggle(text, tooltip, configValue, null, null);`
	`192`	`+ public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null)`
`189`	`193`	`{`
`190`		`- var toggle = new ReMenuToggle(text, tooltip, onToggle, _buttonContainer.RectTransform, defaultValue);`
	`194`	`+ var toggle = new ReMenuToggle(text, tooltip, onToggle, _buttonContainer.RectTransform, defaultValue, iconOn, iconOff);`
`191`	`195`	`return toggle;`
`192`	`196`	`}`
`193`		`-`
`194`		`- public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)`
	`197`	`+ public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue, Sprite iconOn = null, Sprite iconOff = null)`
`195`	`198`	`{`
`196`		`- var toggle = new ReMenuToggle(text, tooltip, configValue.SetValue, _buttonContainer.RectTransform, configValue);`
	`199`	`+ var toggle = new ReMenuToggle(text, tooltip, configValue.SetValue, _buttonContainer.RectTransform, configValue, iconOn, iconOff);`
`197`	`200`	`return toggle;`
`198`	`201`	`}`
`199`	`202`
Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,16 @@ public ReMenuButton AddSpacer(Sprite sprite = null)`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false)`
	`164`	`+ => AddToggle(text, tooltip, onToggle, defaultValue, null, null);`
	`165`	`+ public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)`
	`166`	`+ => AddToggle(text, tooltip, configValue, null, null);`
	`167`	`+ public ReMenuToggle AddToggle(string text, string tooltip, Action<bool> onToggle, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null)`
`164`	`168`	`{`
`165`		`- return new ReMenuToggle(text, tooltip, onToggle, _container, defaultValue);`
	`169`	`+ return new ReMenuToggle(text, tooltip, onToggle, _container, defaultValue, iconOn, iconOff);`
`166`	`170`	`}`
`167`		`-`
`168`		`- public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue)`
	`171`	`+ public ReMenuToggle AddToggle(string text, string tooltip, ConfigValue<bool> configValue, Sprite iconOn = null, Sprite iconOff = null)`
`169`	`172`	`{`
`170`		`- return new ReMenuToggle(text, tooltip, configValue.SetValue, _container, configValue);`
	`173`	`+ return new ReMenuToggle(text, tooltip, configValue.SetValue, _container, configValue, iconOn, iconOff);`
`171`	`174`	`}`
`172`	`175`
`173`	`176`	`public ReMenuPage AddMenuPage(string text, string tooltip = "", Sprite sprite = null)`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,13 @@ public string Tooltip {`
`60`	`60`	`_tooltip.field_Public_String_1 = value;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`-`
`64`		`- public ReMenuToggle(string text, string tooltip, Action<bool> onToggle, Transform parent, bool defaultValue = false) : base(QuickMenuEx.TogglePrefab, parent, $"Button_Toggle{text}")`
	`63`	`+ public ReMenuToggle(string text, string tooltip, Action<bool> onToggle, Transform parent, bool defaultValue = false) : this(text, tooltip, onToggle, parent, defaultValue, null, null) { }`
	`64`	`+ public ReMenuToggle(string text, string tooltip, Action<bool> onToggle, Transform parent, bool defaultValue = false, Sprite iconOn = null, Sprite iconOff = null) : base(QuickMenuEx.TogglePrefab, parent, $"Button_Toggle{text}")`
`65`	`65`	`{`
`66`		`- var iconOn = RectTransform.Find("Icon_On").GetComponent<Image>();`
`67`		`- iconOn.sprite = QuickMenuEx.OnIconSprite;`
	`66`	`+ var icon = RectTransform.Find("Icon_On").GetComponent<Image>();`
	`67`	`+ icon.sprite = iconOn ?? QuickMenuEx.OnIconSprite;`
	`68`	`+ icon = RectTransform.Find("Icon_Off").GetComponent<Image>();`
	`69`	`+ icon.sprite = iconOff ?? QuickMenuEx.OffIconSprite;`
`68`	`70`
`69`	`71`	`Object.DestroyImmediate(GameObject.GetComponent<UIInvisibleGraphic>()); // Fix for having clickable area overlap main quickmenu ui`
`70`	`72`