feat: PR Feedback wrt to Custom Mappings

Author: WispyMouse

Assets/Plugins/Source/Editor/EditorWindows/EOSSettingsWindow.cs

@@ -26,6 +26,7 @@ namespace PlayEveryWare.EpicOnlineServices.Editor.Windows
 {
     using Epic.OnlineServices.UI;
     using PlayEveryWare.EpicOnlineServices.Extensions;
+    using PlayEveryWare.EpicOnlineServices.Utility;
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -354,7 +355,9 @@ private void OnDefaultGUI()
             GUIEditorUtility.AssigningEnumField<InputStateButtonFlags>("Default Activate Overlay Button",
                 ref toggleFriendsButtonCombinationEnum, 190,
                 "Users can press the button(s) associated with this value to activate the Epic Social Overlay. Not all combinations are valid; the SDK will log an error at the start of runtime if an invalid combination is selected.");
-            mainEOSConfigFile.toggleFriendsButtonCombination = toggleFriendsButtonCombinationEnum.FlagsToStrings();
+            mainEOSConfigFile.toggleFriendsButtonCombination = EnumUtility<InputStateButtonFlags>.GetEnumerator(toggleFriendsButtonCombinationEnum)
+                .Select(enumValue => enumValue.ToString())
+                .ToList();
         }
 
         protected override void RenderWindow()

Assets/Plugins/Source/Editor/Utility/GUIEditorUtility.cs

@@ -388,14 +388,6 @@ public static bool RenderInputField(ConfigFieldAttribute configFieldDetails, boo
             });
         }
 
-        public static T RenderInputField<T>(ConfigFieldAttribute configFieldDetails, T value, float labelWidth, string tooltip = null) where T : Enum
-        {
-            return InputRendererWrapper<T>(configFieldDetails.Label, value, labelWidth, tooltip, (s, b, arg3, arg4) =>
-            {
-                return (T)EditorGUILayout.EnumFlagsField(CreateGUIContent(configFieldDetails.Label, tooltip), value, GUILayout.ExpandWidth(true));
-            });
-        }
-
         private static T InputRendererWrapper<T>(string label, T value, float labelWidth, string toolTip, InputRenderDelegate<T> renderFn)
         {
             // Store the current label width so that it can be subsequently be restored.

com.playeveryware.eos/Runtime/Core/Config/EOSConfig.cs

@@ -446,7 +446,7 @@ public AuthScopeFlags GetAuthScopeFlags()
 
         /// <summary>
         /// Returns a single InputStateButtonFlags enum value that results from a
-        /// bitwise OR operation of all the defaultActivateOverlayButtonCombination flags on this
+        /// bitwise OR operation of all the <seealso cref="toggleFriendsButtonCombination"/> flags on this
         /// config.
         /// </summary>
         /// <returns>An InputStateButtonFlags enum value.</returns>

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/Extensions/InputStateButtonFlagsExtensions.cs

@@ -35,29 +35,6 @@ namespace PlayEveryWare.EpicOnlineServices.Extensions
     /// </summary>
     public static class InputStateButtonFlagsExtensions
     {
-        /// <summary>
-        /// Returns the internal custom mappings.
-        /// </summary>
-        public static Dictionary<string, InputStateButtonFlags> CustomMappings { get; } = new()
-        {
-            { "DPadDown", InputStateButtonFlags.DPadDown },
-            { "DPadLeft", InputStateButtonFlags.DPadLeft },
-            { "DPadRight", InputStateButtonFlags.DPadRight },
-            { "DPadUp", InputStateButtonFlags.DPadUp },
-            { "FaceButtonBottom", InputStateButtonFlags.FaceButtonBottom },
-            { "FaceButtonLeft", InputStateButtonFlags.FaceButtonLeft },
-            { "FaceButtonRight", InputStateButtonFlags.FaceButtonRight },
-            { "FaceButtonTop", InputStateButtonFlags.FaceButtonTop },
-            { "LeftShoulder", InputStateButtonFlags.LeftShoulder },
-            { "LeftThumbstick", InputStateButtonFlags.LeftThumbstick },
-            { "LeftTrigger", InputStateButtonFlags.LeftTrigger },
-            { "RightShoulder", InputStateButtonFlags.RightShoulder },
-            { "RightThumbstick", InputStateButtonFlags.RightThumbstick },
-            { "RightTrigger", InputStateButtonFlags.RightTrigger },
-            { "SpecialLeft", InputStateButtonFlags.SpecialLeft },
-            { "SpecialRight", InputStateButtonFlags.SpecialRight }
-        };
-
         /// <summary>
         /// Tries to parse the given list of strings representing individual
         /// InputStateButtonFlags enum values, and performing a
@@ -76,54 +53,7 @@ public static class InputStateButtonFlagsExtensions
         /// </returns>
         public static bool TryParse(IList<string> stringFlags, out InputStateButtonFlags result)
         {
-            return EnumUtility<InputStateButtonFlags>.TryParse(stringFlags, CustomMappings, out result);
-        }
-
-        /// <summary>
-        /// Parses an InputStateButtonFlags value in to its component strings.
-        /// These strings can then be safely stored in a configuration value.
-        /// </summary>
-        /// <param name="flags">Enum to separate into parts.</param>
-        /// <returns>A list of strings representing these flags.</returns>
-        public static List<string> FlagsToStrings(this InputStateButtonFlags flags)
-        {
-            List<string> flagStrings = new List<string>();
-
-            // Iterate over all possible flag values
-            foreach (InputStateButtonFlags flagOption in Enum.GetValues(typeof(InputStateButtonFlags)))
-            {
-                // If the passed in Enum doesn't have this flag, skip it
-                if (!flags.HasFlag(flagOption))
-                {
-                    continue;
-                }
-
-                // Look up this flag's name in the custom mappings dictionary
-                // The dictionary is keyed by string value and valued by enum,
-                // so it must be entirely traversed to find its matching string
-                bool foundMapping = false;
-                foreach (KeyValuePair<string, InputStateButtonFlags> mapping in CustomMappings)
-                {
-                    // Continue if this isn't the flag that matches the current option
-                    if (mapping.Value != flagOption)
-                    {
-                        continue;
-                    }
-
-                    // This is the value needed, so use it
-                    flagStrings.Add(mapping.Key);
-                    foundMapping = true;
-                    continue;
-                }
-
-                // If no custom mapping was found, use ToString instead
-                if (!foundMapping)
-                {
-                    flagStrings.Add(flagOption.ToString());
-                }
-            }
-
-            return flagStrings;
+            return EnumUtility<InputStateButtonFlags>.TryParse(stringFlags, null, out result);
         }
     }
 }