Update metas

Editor/CustomEditors/MultiEditorAttribute.cs → Editor/CustomEditors/Attributes/MultiEditorAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Better.Commons.EditorAddons.CustomEditors
+namespace Better.Commons.EditorAddons.CustomEditors.Attributes
 {
     /// <summary>
     ///   <para>Tells an Editor class which run-time type it's an editor for.</para>

Editor/CustomEditors/EditorExtension.cs → Editor/CustomEditors/Base/ExtendedEditor.cs

@@ -1,18 +1,18 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Better.Commons.EditorAddons.CustomEditors
+namespace Better.Commons.EditorAddons.CustomEditors.Base
 {
     /// <summary>
     /// Class represents base types for <see cref="MultiEditor"/>
     /// <remarks>Use <see cref="_target"/> and <see cref="_serializedObject"/> as cached fields</remarks>
     /// </summary>
-    public abstract class EditorExtension
+    public abstract class ExtendedEditor
     {
         protected readonly Object _target;
         protected readonly SerializedObject _serializedObject;
 
-        protected EditorExtension(Object target, SerializedObject serializedObject)
+        protected ExtendedEditor(Object target, SerializedObject serializedObject)
         {
             _target = target;
             _serializedObject = serializedObject;

Editor/CustomEditors/MultiEditor.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Better.Commons.EditorAddons.CustomEditors.Attributes;
+using Better.Commons.EditorAddons.CustomEditors.Base;
 using Better.Commons.EditorAddons.Extensions;
 using Better.Commons.Runtime.Extensions;
 using UnityEditor;
@@ -13,8 +15,8 @@ namespace Better.Commons.EditorAddons.CustomEditors
     [CustomEditor(typeof(Object), true)]
     internal sealed class MultiEditor : Editor
     {
-        private List<EditorExtension> _preExtensions = new List<EditorExtension>();
-        private List<EditorExtension> _afterExtensions = new List<EditorExtension>();
+        private List<ExtendedEditor> _preEditors = new List<ExtendedEditor>();
+        private List<ExtendedEditor> _postEditors = new List<ExtendedEditor>();
         private bool _overrideDefault;
 
         private void OnEnable()
@@ -56,7 +58,7 @@ bool WherePredicate((Type type, MultiEditorAttribute attribute) x)
                 return att.EditorFor == targetType;
             }
 
-            return typeof(EditorExtension).GetAllInheritedTypesWithoutUnityObject().Select(type => (type, type.GetCustomAttribute<MultiEditorAttribute>()))
+            return typeof(ExtendedEditor).GetAllInheritedTypesWithoutUnityObject().Select(type => (type, type.GetCustomAttribute<MultiEditorAttribute>()))
                 .Where(WherePredicate).OrderBy(x => x.Item2.Order).ToArray();
         }
 
@@ -75,15 +77,15 @@ private void Iterate(IReadOnlyList<(Type type, MultiEditorAttribute)> extensions
                     _overrideDefault = true;
                 }
 
-                var extension = (EditorExtension)Activator.CreateInstance(type, paramArray);
+                var extension = (ExtendedEditor)Activator.CreateInstance(type, paramArray);
                 extension.OnEnable();
                 if (betterEditorAttribute.Order < 0)
                 {
-                    _preExtensions.Add(extension);
+                    _preEditors.Add(extension);
                 }
                 else
                 {
-                    _afterExtensions.Add(extension);
+                    _postEditors.Add(extension);
                 }
             }
         }
@@ -92,44 +94,44 @@ public override void OnInspectorGUI()
         {
             using (var change = new EditorGUI.ChangeCheckScope())
             {
-                for (var i = 0; i < _preExtensions.Count; i++)
+                for (var i = 0; i < _preEditors.Count; i++)
                 {
-                    _preExtensions[i].OnInspectorGUI();
+                    _preEditors[i].OnInspectorGUI();
                 }
 
                 if (!_overrideDefault)
                 {
                     base.OnInspectorGUI();
                 }
 
-                for (var i = 0; i < _afterExtensions.Count; i++)
+                for (var i = 0; i < _postEditors.Count; i++)
                 {
-                    _afterExtensions[i].OnInspectorGUI();
+                    _postEditors[i].OnInspectorGUI();
                 }
 
                 if (!change.changed) return;
-                for (var i = 0; i < _preExtensions.Count; i++)
+                for (var i = 0; i < _preEditors.Count; i++)
                 {
-                    _preExtensions[i].OnChanged();
+                    _preEditors[i].OnChanged();
                 }
 
-                for (var i = 0; i < _afterExtensions.Count; i++)
+                for (var i = 0; i < _postEditors.Count; i++)
                 {
-                    _afterExtensions[i].OnChanged();
+                    _postEditors[i].OnChanged();
                 }
             }
         }
 
         private void OnDisable()
         {
-            for (var i = 0; i < _preExtensions.Count; i++)
+            for (var i = 0; i < _preEditors.Count; i++)
             {
-                _preExtensions[i].OnDisable();
+                _preEditors[i].OnDisable();
             }
 
-            for (var i = 0; i < _afterExtensions.Count; i++)
+            for (var i = 0; i < _postEditors.Count; i++)
             {
-                _afterExtensions[i].OnDisable();
+                _postEditors[i].OnDisable();
             }
         }
     }

Editor/Drawers/Base/FieldDrawer.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
-using Better.Commons.Runtime.Drawing.Attributes;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.Runtime.Drawers.Attributes;
 using UnityEditor;
 using UnityEngine;
 

Editor/Drawers/Base/MultiFieldDrawer.cs

@@ -2,8 +2,8 @@
 using System.Reflection;
 using Better.Commons.EditorAddons.Comparers;
 using Better.Commons.EditorAddons.Drawers.Caching;
-using Better.Commons.EditorAddons.Drawers.Utilities;
-using Better.Commons.Runtime.Drawing.Attributes;
+using Better.Commons.EditorAddons.Drawers.Utility;
+using Better.Commons.Runtime.Drawers.Attributes;
 using Better.Commons.Runtime.Extensions;
 using UnityEditor;
 

Editor/Drawers/Base/WrapperCollection.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Better.Commons.EditorAddons.Comparers;
-using Better.Commons.EditorAddons.Drawers.Utilities;
+using Better.Commons.EditorAddons.Drawers.Utility;
 using UnityEditor;
 
 namespace Better.Commons.EditorAddons.Drawers.Base

Editor/Drawers/Base/WrapperCollectionValue.cs

@@ -1,5 +1,5 @@
 using System;
-using Better.Commons.EditorAddons.Drawers.Utilities;
+using Better.Commons.EditorAddons.Drawers.Utility;
 
 namespace Better.Commons.EditorAddons.Drawers.Base
 {

Editor/Drawers/Base/HeightCacheValue.cs → Editor/Drawers/Caching/HeightCacheValue.cs

@@ -1,9 +1,8 @@
 using System;
-using Better.Commons.EditorAddons.Drawers.Caching;
 using Better.Commons.Runtime.Utility;
 using UnityEngine;
 
-namespace Better.Commons.EditorAddons.Drawers.Base
+namespace Better.Commons.EditorAddons.Drawers.Caching
 {
     public class HeightCacheValue : CacheValue<float>
     {

Editor/Drawers/Caching/ValidateCachedPropertiesUtility.cs

@@ -1,6 +1,6 @@
 using System;
 using Better.Commons.EditorAddons.Drawers.Base;
-using Better.Commons.EditorAddons.Drawers.Utilities;
+using Better.Commons.EditorAddons.Drawers.Utility;
 using Better.Commons.Runtime.Utility;
 using UnityEditor;
 

Editor/Drawers/MultiPropertyDrawer.cs

@@ -5,7 +5,7 @@
 using Better.Commons.EditorAddons.Drawers.Attributes;
 using Better.Commons.EditorAddons.Drawers.Base;
 using Better.Commons.Runtime.Comparers;
-using Better.Commons.Runtime.Drawing.Attributes;
+using Better.Commons.Runtime.Drawers.Attributes;
 using Better.Commons.Runtime.Extensions;
 using Better.Internal.Core.Runtime;
 using UnityEditor;

Editor/Drawers/Utilities/BaseUtility.cs → Editor/Drawers/Utility/BaseUtility.cs

@@ -5,7 +5,7 @@
 using Better.Commons.Runtime.Utility;
 using UnityEditor;
 
-namespace Better.Commons.EditorAddons.Drawers.Utilities
+namespace Better.Commons.EditorAddons.Drawers.Utility
 {
     public abstract class BaseUtility<THandler> where THandler : new()
     {

Editor/Drawers/Utilities/UtilityWrapper.cs → Editor/Drawers/Utility/UtilityWrapper.cs

@@ -1,4 +1,4 @@
-namespace Better.Commons.EditorAddons.Drawers.Utilities
+namespace Better.Commons.EditorAddons.Drawers.Utility
 {
     public abstract class UtilityWrapper
     {

Editor/DropDown/DropdownBase.cs → Editor/DropDown/Base/DropdownBase.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Better.Commons.EditorAddons.DropDown
+namespace Better.Commons.EditorAddons.DropDown.Base
 {
     public abstract class DropdownBase
     {

Editor/DropDown/DropdownCollection.cs

@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Better.Commons.EditorAddons.DropDown.Base;
+using Better.Commons.EditorAddons.Enums;
+using Better.Commons.EditorAddons.Extensions;
 using Better.Commons.EditorAddons.Utility;
 using Better.Commons.Runtime.DataStructures.Tree;
 using Better.Commons.Runtime.Utility;
@@ -77,7 +80,7 @@ private static TreeNode<DropdownBase> AddLeaf(TreeNode<DropdownBase> item, GUICo
         {
             if (bufferKey.image == null && state)
             {
-                bufferKey.image = DrawersUtility.GetIcon(IconType.Checkmark);
+                bufferKey.image = IconType.Checkmark.GetIcon();
             }
             return item.AddChild(new DropdownItem(bufferKey, onSelect, type));
         }

Editor/DropDown/DropdownItem.cs

@@ -1,4 +1,5 @@
 using System;
+using Better.Commons.EditorAddons.DropDown.Base;
 using UnityEngine;
 
 namespace Better.Commons.EditorAddons.DropDown

Editor/DropDown/DropdownSubTree.cs

@@ -1,4 +1,5 @@
-using Better.Commons.Runtime.DataStructures.Tree;
+using Better.Commons.EditorAddons.DropDown.Base;
+using Better.Commons.Runtime.DataStructures.Tree;
 using UnityEngine;
 
 namespace Better.Commons.EditorAddons.DropDown

Editor/DropDown/DropdownWindow.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Better.Commons.EditorAddons.DropDown.Base;
 using Better.Commons.EditorAddons.Helpers;
 using Better.Commons.EditorAddons.Utility;
 using Better.Commons.Runtime.DataStructures.Tree;
@@ -70,11 +71,11 @@ private void OnLostFocus()
         private void OnGUI()
         {
             EditorGUILayout.BeginVertical();
-            _searchText = DropdownGUI.DrawSearchField(_searchText, false);
+            _searchText = DropdownUtility.DrawSearchField(_searchText, false);
             var buffer = SearchResult(_currentNode, _searchText);
 
             var hasParent = _currentNode.Parent != null;
-            DropdownGUI.DrawHeader(hasParent ? _currentNode.Value.Content : _header,
+            DropdownUtility.DrawHeader(hasParent ? _currentNode.Value.Content : _header,
                 hasParent, OnBackClicked);
             var close = AnalyseUserInput(buffer);
             if (!close)
@@ -128,7 +129,7 @@ private bool DrawItems(List<TreeNode<DropdownBase>> buffer, GUIStyle buttonStyle
             {
                 var bufferContent = item.Value.Content;
                 size = Vector2.Max(buttonStyle.CalcSize(bufferContent), size);
-                if (DropdownGUI.DrawItem(item, item.Children.Count > 0, true))
+                if (DropdownUtility.DrawItem(item, item.Children.Count > 0, true))
                     shouldClose = item.Value.Invoke(this);
             }
 
@@ -194,15 +195,15 @@ private bool CaseEscape()
             }
 
             _searchText = string.Empty;
-            DropdownGUI.ClearSearchField();
+            DropdownUtility.ClearSearchField();
 
             return false;
         }
 
         private void ResolveSize(Vector2 size)
         {
             var width = Mathf.Max(position.width, size.x + 50f);
-            var height = UnityEditor.EditorGUIUtility.singleLineHeight * _maxLines + DrawersUtility.SpaceHeight;
+            var height = UnityEditor.EditorGUIUtility.singleLineHeight * _maxLines + ExtendedGUIUtility.SpaceHeight;
             var copy = position;
             copy.position = _display;
             copy.width = width;

Editor/EditorPopups/EditorPopup.cs

@@ -13,8 +13,7 @@ public class EditorPopup : EditorWindow
         public event Action FocusLost;
         public event Action Destroyed;
 
-        public static EditorPopup Initialize(Texture texture, Rect position, bool needUpdate,
-            bool destroyTexture = false)
+        public static EditorPopup Initialize(Texture texture, Rect position, bool needUpdate, bool destroyTexture = false)
         {
             var window = HasOpenInstances<EditorPopup>() ? GetWindow<EditorPopup>() : CreateInstance<EditorPopup>();
             window.position = position;

Editor/Enums/IconType.cs

@@ -0,0 +1,22 @@
+namespace Better.Commons.EditorAddons.Enums
+{
+    public enum IconType
+    {
+        None,
+        InfoMessage,
+        WarningMessage,
+        ErrorMessage,
+        Info,
+        View,
+        Close,
+        Search,
+        WhiteLine,
+        GrayLine,
+        WhiteDropdown,
+        GrayDropdown,
+        Checkmark,
+        GrayPlayButton,
+        PlusMore,
+        Minus
+    }
+}