Improvement: DeviceDisplayConfigurator and DeviceDisplaySettings

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayConfigurator.asset

   m_Script: {fileID: 11500000, guid: fa6f1fbaea804c34cab896669f1e362b, type: 3}
   m_Name: DeviceDisplayConfigurator
   m_EditorClassIdentifier: 
-  listDeviceSettings:
+  listDeviceSets:
-    deviceDisplayName: Keyboard
-    deviceDisplayColor: {r: 1, g: 0.5764706, b: 0, a: 1}
-    deviceDisplayIconSet: {fileID: 0}
+    deviceDisplaySettings: {fileID: 11400000, guid: ac37f2ab60bc829478fd1aa4775349e2,
+      type: 2}
-    deviceDisplayName: Xbox
-    deviceDisplayColor: {r: 0.5137255, g: 0.9058824, b: 0.3137255, a: 1}
-    deviceDisplayIconSet: {fileID: 11400000, guid: b45b544d7ca119b44886fdb47cc8830f,
+    deviceDisplaySettings: {fileID: 11400000, guid: a5eab36e3f254db458d2b5578c87f0c5,
-    deviceDisplayName: PlayStation
-    deviceDisplayColor: {r: 0, g: 0.44705886, b: 1, a: 1}
-    deviceDisplayIconSet: {fileID: 11400000, guid: 662427c3f91ac2a46bca4fdc5ff9e2d6,
+    deviceDisplaySettings: {fileID: 11400000, guid: f66ca6a37f19cdd428693237266253d6,
-    deviceDisplayName: Nintendo Switch
-    deviceDisplayColor: {r: 1, g: 0.1254902, b: 0, a: 1}
-    deviceDisplayIconSet: {fileID: 11400000, guid: 080ee8a352b96c945bec6b9e49866152,
+    deviceDisplaySettings: {fileID: 11400000, guid: 89e9fa8d62bd3af498178e24c1290877,
-    deviceDisplayName: Gamepad
-    deviceDisplayColor: {r: 0.5137255, g: 0, b: 1, a: 1}
-    deviceDisplayIconSet: {fileID: 0}
+    deviceDisplaySettings: {fileID: 11400000, guid: 504fb0ee535a2ed4c866e228de2e7f90,
+      type: 2}
   disconnectedDeviceSettings:
     disconnectedDisplayName: Disconnected!
     disconnectedDisplayColor: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 1}

InputSystem_Warriors_Project/Assets/Scenes/Scene_Example_Warriors.unity

   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 31590763}
-  m_LocalRotation: {x: 0.08378541, y: -0.0021745143, z: 0.00018283591, w: 0.9964814}
+  m_LocalRotation: {x: 0.08378541, y: -0.002174523, z: 0.00018283662, w: 0.9964814}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 124915044}
-  m_LocalRotation: {x: 0.05312623, y: -0.0021791148, z: 0.00011593214, w: 0.99858546}
+  m_LocalRotation: {x: 0.05312623, y: -0.0021791146, z: 0.00011593214, w: 0.99858546}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
         m_Calls: []
   m_LegacyBlendHint: 0
   m_ComponentOwner: {fileID: 218367931}
+--- !u!1 &136852791
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 136852792}
+  m_Layer: 0
+  m_Name: UI - Disconnected Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &136852792
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 136852791}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 654247001}
+  m_Father: {fileID: 2060013782}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &171006040
 GameObject:
   m_ObjectHideFlags: 0
   - component: {fileID: 246201657}
   - component: {fileID: 246201655}
   m_Layer: 8
-  m_Name: UI Menu - Camera
+  m_Name: UI Overlay - Camera
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   - component: {fileID: 366602420}
   - component: {fileID: 366602421}
   m_Layer: 0
-  m_Name: UI Menu
+  m_Name: UI - Menu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
     type: 3}
   m_PrefabInstance: {fileID: 648522001}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &654247000
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 654247001}
+  - component: {fileID: 654247004}
+  - component: {fileID: 654247003}
+  - component: {fileID: 654247002}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &654247001
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 654247000}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 136852792}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &654247002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 654247000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &654247003
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 654247000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &654247004
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 654247000}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 963194227}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1001 &675367498
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_Script: {fileID: 11500000, guid: ad331c3afd647a044a6343361e5401a9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentGameMode: 0
+  currentGameMode: 1
   inScenePlayer: {fileID: 16277595}
   singlePlayerCameraMode: 0
   playerPrefab: {fileID: 1743518200311987069, guid: ca9ee4e0ea2b85646be0b08bab27e559,
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1833978498}
-  m_LocalRotation: {x: 0.18110336, y: -0.0021460743, z: 0.00039519716, w: 0.9834617}
+  m_LocalRotation: {x: 0.18110338, y: -0.002146107, z: 0.0003952032, w: 0.9834617}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   m_Children:
   - {fileID: 1912423617}
   - {fileID: 366602420}
+  - {fileID: 136852792}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

InputSystem_Warriors_Project/Assets/Scripts/Editor/DeviceDisplayConfiguratorEditor.cs

 public class DeviceDisplayConfiguratorEditor : Editor
 {
 
-    private ReorderableList listDevices;
+    private ReorderableList listDeviceSets;
-
-    private Rect rawPathColumn;
-    private Rect displayNameColumn;
-    private Rect displayColorColumn;
-    private Rect displayIconSetColumn;
 
     private void OnEnable()
     {
     {
         serializedObject.Update();
 
-        EditorGUILayout.LabelField("Device Settings", EditorStyles.boldLabel);
-        listDevices.DoLayoutList();
+        EditorGUILayout.LabelField("Device Sets", EditorStyles.boldLabel);
+        listDeviceSets.DoLayoutList();
 
         EditorGUILayout.PropertyField(disconnectedDeviceProperty);
 
     void DrawListOfDevices()
     {
-        listDevices = new ReorderableList(serializedObject, serializedObject.FindProperty("listDeviceSettings"), true, true, true, true);
+        listDeviceSets = new ReorderableList(serializedObject, serializedObject.FindProperty("listDeviceSets"), true, true, true, true);
-        listDevices.drawHeaderCallback = (Rect rect) => {
+        listDeviceSets.drawHeaderCallback = (Rect rect) => {
-            DrawColumnHeaders(rect, 10);
+            EditorGUI.LabelField(CalculateColumn(rect, 1, 15, 0), "Raw Path Name");
+            EditorGUI.LabelField(CalculateColumn(rect, 2, 15, 0), "Device Display Settings");
-        listDevices.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) => {
+        listDeviceSets.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) => {
-	        var element = listDevices.serializedProperty.GetArrayElementAtIndex(index);
+	        var element = listDeviceSets.serializedProperty.GetArrayElementAtIndex(index);
-
-            CalculateColumnSizes(rect, 0);
-
-	        EditorGUI.PropertyField(rawPathColumn, element.FindPropertyRelative("deviceRawPath"), GUIContent.none);
-            EditorGUI.PropertyField(displayNameColumn, element.FindPropertyRelative("deviceDisplayName"), GUIContent.none);
-            EditorGUI.PropertyField(displayIconSetColumn, element.FindPropertyRelative("deviceDisplayIconSet"), GUIContent.none);
-            EditorGUI.PropertyField(displayColorColumn, element.FindPropertyRelative("deviceDisplayColor"), GUIContent.none);
+	        EditorGUI.PropertyField(CalculateColumn(rect, 1, 0, 0), element.FindPropertyRelative("deviceRawPath"), GUIContent.none);
+            EditorGUI.PropertyField(CalculateColumn(rect, 2, 10, 10), element.FindPropertyRelative("deviceDisplaySettings"), GUIContent.none);
+        
-        };
-
-        //listDevices.elementHeight = EditorGUIUtility.singleLineHeight;
-        
+        };   
-    void DrawColumnHeaders(Rect rect, int extraPadding)
+    Rect CalculateColumn(Rect rect, int columnNumber, float xPadding, float xWidth)
+        float xPosition = rect.x; 
+        switch (columnNumber)
+        {
+            case 1:
+                xPosition = rect.x + xPadding;
+                break;
-        CalculateColumnSizes(rect, extraPadding);
+            case 2:
+                xPosition = rect.x + rect.width/2 + xPadding;
+                break;
+        }
+
-        EditorGUI.LabelField(rawPathColumn, "Raw Path Name");
-        EditorGUI.LabelField(displayNameColumn, "Display Name");
-        EditorGUI.LabelField(displayIconSetColumn, "Display Icon Set");
-        EditorGUI.LabelField(displayColorColumn, "Display Color");
+        return new Rect(xPosition, rect.y, rect.width / 2 - xWidth, EditorGUIUtility.singleLineHeight);
+    /*
-        /*
-        rawPathColumn = new Rect(rect.x, rect.y, rect.width/2 - 50 - 10, EditorGUIUtility.singleLineHeight);
-        displayNameColumn = new Rect(rect.x + rect.width/2 - 50, rect.y, rect.width/2 - 60, EditorGUIUtility.singleLineHeight);
-        displayColorColumn = new Rect(rect.x + rect.width - 100, rect.y, 100, EditorGUIUtility.singleLineHeight);
-        */
-        int gap = 10;
-        float thirdOfRect = rect.width/3;
+        rawPathColumn = new Rect(rect.x + extraPadding, rect.y, rect.width / 2 - 10, EditorGUIUtility.singleLineHeight);
+        deviceDisplaySettingsColumn = new Rect(rect.x + rect.width / 2 + extraPadding, rect.y, rect.width/2, EditorGUIUtility.singleLineHeight);
-        rawPathColumn = new Rect(rect.x, rect.y, thirdOfRect, EditorGUIUtility.singleLineHeight);
-        displayNameColumn = new Rect(rect.x + thirdOfRect + gap, rect.y, thirdOfRect - gap - gap, EditorGUIUtility.singleLineHeight);
-        displayIconSetColumn = new Rect(rect.x + thirdOfRect*2, rect.y, thirdOfRect / 2, EditorGUIUtility.singleLineHeight);
-        displayColorColumn  = new Rect(rect.x + rect.width - thirdOfRect /2 + gap, rect.y, (thirdOfRect / 2) - gap, EditorGUIUtility.singleLineHeight);
+    */
 
    
 }

InputSystem_Warriors_Project/Assets/Scripts/Utilities/DeviceDisplayConfigurator.cs

 [CreateAssetMenu(fileName = "Device Display Configurator", menuName = "Scriptable Objects/Device Display Configurator", order = 1)]
 public class DeviceDisplayConfigurator : ScriptableObject
 {
-
+    
-    public struct DeviceSettings
+    public struct DeviceSet
-        public string deviceDisplayName;
-        public Color deviceDisplayColor;
-        public DeviceDisplayIconSet deviceDisplayIconSet;
+        public DeviceDisplaySettings deviceDisplaySettings;
     }
 
     [System.Serializable]
         public Color disconnectedDisplayColor;
     }
 
-    public List<DeviceSettings> listDeviceSettings = new List<DeviceSettings>();
+    public List<DeviceSet> listDeviceSets = new List<DeviceSet>();
 
     public DisconnectedSettings disconnectedDeviceSettings;
 
     {
         string newDisplayName = null;
 
-        for(int i = 0; i < listDeviceSettings.Count; i++)
+        for(int i = 0; i < listDeviceSets.Count; i++)
-            if(listDeviceSettings[i].deviceRawPath == playerInputDeviceRawPath)
+            if(listDeviceSets[i].deviceRawPath == playerInputDeviceRawPath)
-                newDisplayName = listDeviceSettings[i].deviceDisplayName;
+                newDisplayName = listDeviceSets[i].deviceDisplaySettings.deviceDisplayName;
             }
         }
 
         
         Color newDisplayColor = fallbackDisplayColor;
 
-        for(int i = 0; i < listDeviceSettings.Count; i++)
+        for(int i = 0; i < listDeviceSets.Count; i++)
-            if(listDeviceSettings[i].deviceRawPath == playerInputDeviceRawPath)
+            if(listDeviceSets[i].deviceRawPath == playerInputDeviceRawPath)
-                newDisplayColor = listDeviceSettings[i].deviceDisplayColor;
+                newDisplayColor = listDeviceSets[i].deviceDisplaySettings.deviceDisplayColor;
             }
         }
 
 
         Sprite displaySpriteIcon = null;
 
-        for(int i = 0; i < listDeviceSettings.Count; i++)
+        for(int i = 0; i < listDeviceSets.Count; i++)
-            if(listDeviceSettings[i].deviceRawPath == playerInputDeviceRawPath)
+            if(listDeviceSets[i].deviceRawPath == playerInputDeviceRawPath)
-                if(listDeviceSettings[i].deviceDisplayIconSet != null)
+                if(listDeviceSets[i].deviceDisplaySettings.deviceHasContextIcons != null)
-                    displaySpriteIcon = FilterForDeviceInputBinding(listDeviceSettings[i], playerInputDeviceInputBinding);
+                    displaySpriteIcon = FilterForDeviceInputBinding(listDeviceSets[i], playerInputDeviceInputBinding);
                 }
             }
         }
 
-    Sprite FilterForDeviceInputBinding(DeviceSettings targetDeviceSetting, string inputBinding)
+    Sprite FilterForDeviceInputBinding(DeviceSet targetDeviceSet, string inputBinding)
     {
         Sprite selectedSpriteIcon = null;
 
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.buttonNorthIcon;  
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.buttonNorthIcon;  
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.buttonSouthIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.buttonSouthIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.buttonWestIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.buttonWestIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.buttonEastIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.buttonEastIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.triggerRightFrontIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.triggerRightFrontIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.triggerRightBackIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.triggerRightBackIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.triggerRightBackIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.triggerRightBackIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.triggerLeftFrontIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.triggerLeftFrontIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.triggerLeftBackIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.triggerLeftBackIcon;
-                selectedSpriteIcon = targetDeviceSetting.deviceDisplayIconSet.triggerLeftBackIcon;
+                selectedSpriteIcon = targetDeviceSet.deviceDisplaySettings.triggerLeftBackIcon;
                 break;
 
         }

InputSystem_Warriors_Project/Assets/Scripts/Utilities/DeviceDisplaySettings.cs.meta

 fileFormatVersion: 2
-guid: d75c723a6e777af4c9ae1c59aa3fc508
+guid: e9ea9a11d318323458a19965038cc9a3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_GamepadGeneric.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9ea9a11d318323458a19965038cc9a3, type: 3}
+  m_Name: DeviceDisplaySettings_GamepadGeneric
+  m_EditorClassIdentifier: 
+  deviceDisplayName: Gamepad
+  deviceDisplayColor: {r: 0.5137255, g: 0, b: 1, a: 1}
+  deviceHasContextIcons: 0
+  buttonNorthIcon: {fileID: 0}
+  buttonSouthIcon: {fileID: 0}
+  buttonWestIcon: {fileID: 0}
+  buttonEastIcon: {fileID: 0}
+  triggerRightFrontIcon: {fileID: 0}
+  triggerRightBackIcon: {fileID: 0}
+  triggerLeftFrontIcon: {fileID: 0}
+  triggerLeftBackIcon: {fileID: 0}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_GamepadGeneric.asset.meta

+fileFormatVersion: 2
+guid: 504fb0ee535a2ed4c866e228de2e7f90
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_Keyboard.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9ea9a11d318323458a19965038cc9a3, type: 3}
+  m_Name: DeviceDisplaySettings_Keyboard
+  m_EditorClassIdentifier: 
+  deviceDisplayName: Keyboard
+  deviceDisplayColor: {r: 1, g: 0.5764706, b: 0, a: 1}
+  deviceHasContextIcons: 0
+  buttonNorthIcon: {fileID: 0}
+  buttonSouthIcon: {fileID: 0}
+  buttonWestIcon: {fileID: 0}
+  buttonEastIcon: {fileID: 0}
+  triggerRightFrontIcon: {fileID: 0}
+  triggerRightBackIcon: {fileID: 0}
+  triggerLeftFrontIcon: {fileID: 0}
+  triggerLeftBackIcon: {fileID: 0}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_Keyboard.asset.meta

+fileFormatVersion: 2
+guid: ac37f2ab60bc829478fd1aa4775349e2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_NintendoSwitchProController.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9ea9a11d318323458a19965038cc9a3, type: 3}
+  m_Name: DeviceDisplaySettings_NintendoSwitchProController
+  m_EditorClassIdentifier: 
+  deviceDisplayName: Nintendo Switch
+  deviceDisplayColor: {r: 1, g: 0.1254902, b: 0, a: 1}
+  deviceHasContextIcons: 1
+  buttonNorthIcon: {fileID: 21300000, guid: e9a7fc567b15a604db3ecd50a7aa1b7c, type: 3}
+  buttonSouthIcon: {fileID: 21300000, guid: c6ae2910c99c4c045ba6e2473a9df908, type: 3}
+  buttonWestIcon: {fileID: 21300000, guid: 38ad6671fee7da74fa7dae825fba063e, type: 3}
+  buttonEastIcon: {fileID: 21300000, guid: 4b6115bd287f2bc4c9ef5a3139adf0e6, type: 3}
+  triggerRightFrontIcon: {fileID: 21300000, guid: 36f149afe5339614f9bd864c577fdb20,
+    type: 3}
+  triggerRightBackIcon: {fileID: 21300000, guid: 437bb87abdf0a4b49bad34954137058a,
+    type: 3}
+  triggerLeftFrontIcon: {fileID: 21300000, guid: 3ebbbbbee6115154a9a689365d4c868c,
+    type: 3}
+  triggerLeftBackIcon: {fileID: 21300000, guid: 5b3c19f5c4c0ba64e966b8b617c2c26f,
+    type: 3}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_NintendoSwitchProController.asset.meta

+fileFormatVersion: 2
+guid: 89e9fa8d62bd3af498178e24c1290877
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_PlayStationDualshock4.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9ea9a11d318323458a19965038cc9a3, type: 3}
+  m_Name: DeviceDisplaySettings_PlayStationDualshock4
+  m_EditorClassIdentifier: 
+  deviceDisplayName: PlayStation
+  deviceDisplayColor: {r: 0, g: 0.44705886, b: 1, a: 1}
+  deviceHasContextIcons: 1
+  buttonNorthIcon: {fileID: 21300000, guid: 72bbdf5c15867b941ac7f79185b77555, type: 3}
+  buttonSouthIcon: {fileID: 21300000, guid: 766e476b580fa2342a66ce531482d164, type: 3}
+  buttonWestIcon: {fileID: 21300000, guid: 5650772324f737c4692e4ee41e15c9da, type: 3}
+  buttonEastIcon: {fileID: 21300000, guid: 0cabbcedf5c82444b8cc57c6adfae34d, type: 3}
+  triggerRightFrontIcon: {fileID: 21300000, guid: 844dc6b26ef8d404498a011f84d2352e,
+    type: 3}
+  triggerRightBackIcon: {fileID: 21300000, guid: 74b024f118217924d99798bf923d2d2e,
+    type: 3}
+  triggerLeftFrontIcon: {fileID: 21300000, guid: c1d4a19b47662e843a6b4aac1dfbd7f0,
+    type: 3}
+  triggerLeftBackIcon: {fileID: 21300000, guid: ac37aede1951f9e41860895428f801b1,
+    type: 3}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_PlayStationDualshock4.asset.meta

+fileFormatVersion: 2
+guid: f66ca6a37f19cdd428693237266253d6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_XboxController.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9ea9a11d318323458a19965038cc9a3, type: 3}
+  m_Name: DeviceDisplaySettings_XboxController
+  m_EditorClassIdentifier: 
+  deviceDisplayName: Xbox
+  deviceDisplayColor: {r: 0.5137255, g: 0.9058824, b: 0.3137255, a: 1}
+  deviceHasContextIcons: 1
+  buttonNorthIcon: {fileID: 21300000, guid: 5f68108cbf049074080c98561049c673, type: 3}
+  buttonSouthIcon: {fileID: 21300000, guid: cb9bf2c3ad1d5d1488bc46dcde48367e, type: 3}
+  buttonWestIcon: {fileID: 21300000, guid: 939f2e271ef1ce349a1542734e808bd4, type: 3}
+  buttonEastIcon: {fileID: 21300000, guid: bf2936eb3a69e9748bc83d18b480e5b4, type: 3}
+  triggerRightFrontIcon: {fileID: 21300000, guid: 22aeba1eaebab4f478c9fab531549f53,
+    type: 3}
+  triggerRightBackIcon: {fileID: 21300000, guid: cdbe866bec2a09945be389fea4cca3b4,
+    type: 3}
+  triggerLeftFrontIcon: {fileID: 21300000, guid: 8b22131bcac398b428ce3b21ec8f9bb2,
+    type: 3}
+  triggerLeftBackIcon: {fileID: 21300000, guid: 226cdd2181712ce4986128c9b84d871b,
+    type: 3}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplaySettings_XboxController.asset.meta

+fileFormatVersion: 2
+guid: a5eab36e3f254db458d2b5578c87f0c5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/Scripts/Editor/DeviceDisplaySettingsEditor.cs

+using UnityEngine;
+using UnityEditor;
+using UnityEditorInternal;
+
+[CustomEditor(typeof(DeviceDisplaySettings))]
+public class DeviceDisplaySettingsEditor : Editor
+{
+
+    private DeviceDisplaySettings deviceDisplaySettings;
+
+    //Display Name
+    public SerializedProperty deviceDisplayNameProperty;
+
+    //Display Color
+    public SerializedProperty deviceDisplayColorProperty;
+
+    //Icons
+    public SerializedProperty deviceHasContextIconsProperty;
+
+    //Icons - Action Buttons
+    public SerializedProperty buttonNorthIconProperty;
+    public SerializedProperty buttonSouthIconProperty;
+    public SerializedProperty buttonWestIconProperty;
+    public SerializedProperty buttonEastIconProperty;
+
+    //Icon - Triggers
+    public SerializedProperty triggerRightFrontIconProperty;
+    public SerializedProperty triggerRightBackIconProperty;
+    public SerializedProperty triggerLeftFrontIconProperty;
+    public SerializedProperty triggerLeftBackIconProperty;
+
+    void OnEnable()
+    {
+        //Display Name
+        deviceDisplayNameProperty = serializedObject.FindProperty("deviceDisplayName");
+
+        //Display Color
+        deviceDisplayColorProperty = serializedObject.FindProperty("deviceDisplayColor");
+
+        //Icons
+        deviceHasContextIconsProperty = serializedObject.FindProperty("deviceHasContextIcons");
+
+        //Icons - Action Buttons
+        buttonNorthIconProperty = serializedObject.FindProperty("buttonNorthIcon");
+        buttonSouthIconProperty = serializedObject.FindProperty("buttonSouthIcon");
+        buttonWestIconProperty = serializedObject.FindProperty("buttonWestIcon");
+        buttonEastIconProperty = serializedObject.FindProperty("buttonEastIcon");
+
+        //Icon - Triggers
+        triggerRightFrontIconProperty = serializedObject.FindProperty("triggerRightFrontIcon");
+        triggerRightBackIconProperty = serializedObject.FindProperty("triggerRightBackIcon");
+        triggerLeftFrontIconProperty = serializedObject.FindProperty("triggerLeftFrontIcon");
+        triggerLeftBackIconProperty = serializedObject.FindProperty("triggerLeftBackIcon");  
+    }
+
+    public override void OnInspectorGUI()
+    {
+
+        deviceDisplaySettings = (DeviceDisplaySettings)target;
+
+        serializedObject.Update();
+
+        EditorGUILayout.LabelField("Display Name", EditorStyles.boldLabel);
+        EditorGUILayout.PropertyField(deviceDisplayNameProperty);
+
+        DrawSpaceGUI(2);
+
+        EditorGUILayout.LabelField("Display Color", EditorStyles.boldLabel);
+        EditorGUILayout.PropertyField(deviceDisplayColorProperty);
+
+        DrawSpaceGUI(2);
+
+        EditorGUILayout.LabelField("Icon Settings", EditorStyles.boldLabel);
+        EditorGUILayout.PropertyField(deviceHasContextIconsProperty);
+
+        if(deviceDisplaySettings.deviceHasContextIcons == true)
+        {
+
+            DrawSpaceGUI(3);
+            
+            EditorGUILayout.LabelField("Icons - Action Buttons", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(buttonNorthIconProperty);
+            EditorGUILayout.PropertyField(buttonSouthIconProperty);
+            EditorGUILayout.PropertyField(buttonWestIconProperty);
+            EditorGUILayout.PropertyField(buttonEastIconProperty);
+
+            DrawSpaceGUI(3);
+
+            EditorGUILayout.LabelField("Icons - Triggers", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(triggerRightFrontIconProperty);
+            EditorGUILayout.PropertyField(triggerRightBackIconProperty);
+            EditorGUILayout.PropertyField(triggerLeftFrontIconProperty);
+            EditorGUILayout.PropertyField(triggerLeftBackIconProperty);
+        }
+
+        serializedObject.ApplyModifiedProperties();
+
+    }
+
+    void DrawSpaceGUI(int amountOfSpace)
+    {
+        for(int i = 0; i < amountOfSpace; i++)
+        {
+            EditorGUILayout.Space();
+        }
+    }
+
+
+}

InputSystem_Warriors_Project/Assets/Scripts/Editor/DeviceDisplaySettingsEditor.cs.meta

+fileFormatVersion: 2
+guid: 3f730e945f15a0743976b5b42a8307ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/Scripts/Utilities/DeviceDisplaySettings.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "Device Display Settings", menuName = "Scriptable Objects/Device Display Settings", order = 1)]
+public class DeviceDisplaySettings : ScriptableObject
+{
+
+    public string deviceDisplayName;
+
+    public Color deviceDisplayColor;
+
+    public bool deviceHasContextIcons;
+
+    public Sprite buttonNorthIcon;
+    public Sprite buttonSouthIcon;
+    public Sprite buttonWestIcon;
+    public Sprite buttonEastIcon;
+
+    public Sprite triggerRightFrontIcon;
+    public Sprite triggerRightBackIcon;
+    public Sprite triggerLeftFrontIcon;
+    public Sprite triggerLeftBackIcon;
+
+}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayIconSet_NintendoSwitchProController.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d75c723a6e777af4c9ae1c59aa3fc508, type: 3}
-  m_Name: DeviceDisplayIconSet_NintendoSwitchProController
-  m_EditorClassIdentifier: 
-  buttonNorthIcon: {fileID: 21300000, guid: e9a7fc567b15a604db3ecd50a7aa1b7c, type: 3}
-  buttonSouthIcon: {fileID: 21300000, guid: c6ae2910c99c4c045ba6e2473a9df908, type: 3}
-  buttonWestIcon: {fileID: 21300000, guid: 38ad6671fee7da74fa7dae825fba063e, type: 3}
-  buttonEastIcon: {fileID: 21300000, guid: 4b6115bd287f2bc4c9ef5a3139adf0e6, type: 3}
-  triggerRightFrontIcon: {fileID: 21300000, guid: 36f149afe5339614f9bd864c577fdb20,
-    type: 3}
-  triggerRightBackIcon: {fileID: 21300000, guid: 437bb87abdf0a4b49bad34954137058a,
-    type: 3}
-  triggerLeftFrontIcon: {fileID: 21300000, guid: 3ebbbbbee6115154a9a689365d4c868c,
-    type: 3}
-  triggerLeftBackIcon: {fileID: 21300000, guid: 5b3c19f5c4c0ba64e966b8b617c2c26f,
-    type: 3}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayIconSet_NintendoSwitchProController.asset.meta

-fileFormatVersion: 2
-guid: 080ee8a352b96c945bec6b9e49866152
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayIconSet_Playstation4.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d75c723a6e777af4c9ae1c59aa3fc508, type: 3}
-  m_Name: DeviceDisplayIconSet_Playstation4
-  m_EditorClassIdentifier: 
-  buttonNorthIcon: {fileID: 21300000, guid: 72bbdf5c15867b941ac7f79185b77555, type: 3}
-  buttonSouthIcon: {fileID: 21300000, guid: 766e476b580fa2342a66ce531482d164, type: 3}
-  buttonWestIcon: {fileID: 21300000, guid: 5650772324f737c4692e4ee41e15c9da, type: 3}
-  buttonEastIcon: {fileID: 21300000, guid: 0cabbcedf5c82444b8cc57c6adfae34d, type: 3}
-  triggerRightFrontIcon: {fileID: 21300000, guid: 844dc6b26ef8d404498a011f84d2352e,
-    type: 3}
-  triggerRightBackIcon: {fileID: 21300000, guid: 74b024f118217924d99798bf923d2d2e,
-    type: 3}
-  triggerLeftFrontIcon: {fileID: 21300000, guid: c1d4a19b47662e843a6b4aac1dfbd7f0,
-    type: 3}
-  triggerLeftBackIcon: {fileID: 21300000, guid: ac37aede1951f9e41860895428f801b1,
-    type: 3}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayIconSet_Playstation4.asset.meta

-fileFormatVersion: 2
-guid: 662427c3f91ac2a46bca4fdc5ff9e2d6
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayIconSet_Xbox.asset

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d75c723a6e777af4c9ae1c59aa3fc508, type: 3}
-  m_Name: DeviceDisplayIconSet_Xbox
-  m_EditorClassIdentifier: 
-  buttonNorthIcon: {fileID: 21300000, guid: 5f68108cbf049074080c98561049c673, type: 3}
-  buttonSouthIcon: {fileID: 21300000, guid: cb9bf2c3ad1d5d1488bc46dcde48367e, type: 3}
-  buttonWestIcon: {fileID: 21300000, guid: 939f2e271ef1ce349a1542734e808bd4, type: 3}
-  buttonEastIcon: {fileID: 21300000, guid: bf2936eb3a69e9748bc83d18b480e5b4, type: 3}
-  triggerRightFrontIcon: {fileID: 21300000, guid: 22aeba1eaebab4f478c9fab531549f53,
-    type: 3}
-  triggerRightBackIcon: {fileID: 21300000, guid: cdbe866bec2a09945be389fea4cca3b4,
-    type: 3}
-  triggerLeftFrontIcon: {fileID: 21300000, guid: 8b22131bcac398b428ce3b21ec8f9bb2,
-    type: 3}
-  triggerLeftBackIcon: {fileID: 21300000, guid: 226cdd2181712ce4986128c9b84d871b,
-    type: 3}

InputSystem_Warriors_Project/Assets/DeviceDisplaySettings/DeviceDisplayIconSet_Xbox.asset.meta

-fileFormatVersion: 2
-guid: b45b544d7ca119b44886fdb47cc8830f
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

InputSystem_Warriors_Project/Assets/Scripts/Utilities/DeviceDisplayIconSet.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-[CreateAssetMenu(fileName = "Device Display Icon Set", menuName = "Scriptable Objects/Device Display Icon Set", order = 1)]
-public class DeviceDisplayIconSet : ScriptableObject
-{
-
-    [Header("Action Buttons")]
-    public Sprite buttonNorthIcon;
-    public Sprite buttonSouthIcon;
-    public Sprite buttonWestIcon;
-    public Sprite buttonEastIcon;
-
-    [Header("Triggers")]
-    public Sprite triggerRightFrontIcon;
-    public Sprite triggerRightBackIcon;
-    public Sprite triggerLeftFrontIcon;
-    public Sprite triggerLeftBackIcon;
-}