Merge pull request #27 from techno-dwarf-works/feature/clean-up

Refactoring
techno-dwarf-works · Apr 10, 2024 · 2672b9d · 2672b9d
1 parent 7b01bd6
commit 2672b9d
Show file tree

Hide file tree

Showing 33 changed files with 89 additions and 88 deletions.
diff --git a/Editor/BetterValidation.Editor.asmdef b/Editor/BetterValidation.Editor.asmdef
@@ -3,15 +3,12 @@
     "rootNamespace": "Better.Validation.EditorAddons",
     "references": [
         "GUID:01df13aca8d01e24a911bcc3e8277031",
-        "GUID:443314a5a4e67c14a88ae223776b6554",
-        "GUID:1ac867a6259e45a1856740fe8f7623aa",
-        "GUID:28da8d3b12e3efa47928e0c9070f853d",
-        "GUID:19891d5296046644cbc12fcf3702cca3",
-        "GUID:a59e3daedde9ca94bba45364d4ead25f",
         "GUID:ecdd0819e3429eb44b13a432679a1135",
         "GUID:1862b35041b066d42ab4d3caf773657b",
         "GUID:af7fffdf1d83bc842b0f6e3a01efda16",
-        "GUID:441b78e90a9cf724ab41c6eed8c0b93d"
+        "GUID:441b78e90a9cf724ab41c6eed8c0b93d",
+        "GUID:8bd4b41f8da90144d9006c4d926c9679",
+        "GUID:55fbe2a01ca11514f94a66e7102c8895"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Editor/EditorAddons/Comparers.meta b/Editor/EditorAddons/Comparers.meta
diff --git a/...indowModule/GameObjectGroupingComparer.cs → ...s/Comparers/GameObjectGroupingComparer.cs b/...indowModule/GameObjectGroupingComparer.cs → ...s/Comparers/GameObjectGroupingComparer.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Better.EditorTools.EditorAddons.Comparers;
+using Better.Commons.Runtime.Comparers;
 using UnityEngine;
 
 namespace Better.Validation.EditorAddons.WindowModule

diff --git a/...Module/GameObjectGroupingComparer.cs.meta → ...parers/GameObjectGroupingComparer.cs.meta b/...Module/GameObjectGroupingComparer.cs.meta → ...parers/GameObjectGroupingComparer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/ValidationDrawer.cs b/Editor/EditorAddons/Drawers/ValidationDrawer.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
-using Better.EditorTools.EditorAddons.Attributes;
-using Better.EditorTools.EditorAddons.Drawers.Base;
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.EditorTools.EditorAddons.Helpers.Caching;
-using Better.EditorTools.Runtime.Attributes;
+using Better.Commons.EditorAddons.Drawers.Attributes;
+using Better.Commons.EditorAddons.Drawers.Base;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Drawers.Attributes;
 using Better.Validation.EditorAddons.Utility;
 using Better.Validation.EditorAddons.Wrappers;
 using Better.Validation.Runtime.Attributes;
@@ -55,7 +55,7 @@ protected override void PostDraw(Rect position, SerializedProperty property, GUI
             if (!_validationResult.IsValid)
             {
                 var (value, type) = _validationResult.Value;
-                DrawersHelper.HelpBox(value, type.GetIconType());
+                ExtendedGUIUtility.HelpBox(value, type.GetIconType());
             }
         }
 

diff --git a/Editor/EditorAddons/Iteration/Iterator.cs b/Editor/EditorAddons/Iteration/Iterator.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using Better.Validation.EditorAddons.ContextResolver;
 using Better.Validation.EditorAddons.Utility;
 using Better.Validation.EditorAddons.Wrappers;

diff --git a/Editor/EditorAddons/Iteration/IteratorFilter.cs b/Editor/EditorAddons/Iteration/IteratorFilter.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Text;
-using Better.EditorTools.EditorAddons.Drawers.Base;
-using Better.EditorTools.EditorAddons.Helpers.Caching;
-using Better.Extensions.EditorAddons;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Drawers.Base;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.EditorAddons.Extensions;
+using Better.Commons.Runtime.Extensions;
 using Better.Validation.EditorAddons.Utility;
 using Better.Validation.EditorAddons.Wrappers;
 using Better.Validation.Runtime.Attributes;

diff --git a/Editor/EditorAddons/PreBuildValidation/ValidationBuildProcess.cs b/Editor/EditorAddons/PreBuildValidation/ValidationBuildProcess.cs
@@ -2,14 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Better.Internal.Core.Runtime;
 using Better.Validation.EditorAddons.Settings;
 using Better.Validation.EditorAddons.WindowModule;
 using Better.Validation.Runtime.Attributes;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
-using UnityEngine;
 
 namespace Better.Validation.EditorAddons.PreBuildValidation
 {

diff --git a/Editor/EditorAddons/Settings/BuildValidationStepsDrawer.cs b/Editor/EditorAddons/Settings/BuildValidationStepsDrawer.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Linq;
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.EditorTools.EditorAddons.Helpers.DropDown;
-using Better.Extensions.EditorAddons;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.DropDown;
+using Better.Commons.EditorAddons.Enums;
+using Better.Commons.EditorAddons.Extensions;
+using Better.Commons.EditorAddons.Helpers;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Extensions;
 using Better.Validation.EditorAddons.PreBuildValidation;
 using UnityEditor;
 using UnityEditorInternal;
@@ -58,7 +60,7 @@ private void DrawElementCallback(Rect rect, int index, bool isActive, bool isFoc
         private void DrawButton(Rect rect, SerializedProperty serializedProperty, Type currentValue)
         {
             var typeName = currentValue == null ? NullName : currentValue.Name;
-            var content = DrawersHelper.GetIconGUIContent(IconType.GrayDropdown);
+            var content = IconType.GrayDropdown.GetIconGUIContent();
             content.text = typeName;
             var buttonPosition = GetPopupPosition(rect);
             if (GUI.Button(buttonPosition, content, Styles.Button))
@@ -87,7 +89,7 @@ private DropdownCollection GenerateItemsTree(SerializedProperty serializedProper
                 var guiContent = new GUIContent(typeName);
                 if (guiContent.image == null && type == currentValue)
                 {
-                    guiContent.image = DrawersHelper.GetIcon(IconType.Checkmark);
+                    guiContent.image = IconType.Checkmark.GetIcon();
                 }
 
                 var item = new DropdownItem(guiContent, OnSelectItem, new Tuple<SerializedProperty, Type>(serializedProperty, type));

diff --git a/Editor/EditorAddons/Utility/GameObjectExtensions.cs b/Editor/EditorAddons/Utility/GameObjectExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
+using Better.Commons.Runtime.Utility;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;

diff --git a/Editor/EditorAddons/Utility/ToolsGUIUtility.cs b/Editor/EditorAddons/Utility/ToolsGUIUtility.cs
@@ -1,4 +1,4 @@
-using Better.EditorTools.EditorAddons.Helpers;
+using Better.Commons.EditorAddons.Helpers;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Editor/EditorAddons/Utility/ValidationAttributeUtility.cs b/Editor/EditorAddons/Utility/ValidationAttributeUtility.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Better.EditorTools.EditorAddons.Comparers;
-using Better.EditorTools.EditorAddons.Utilities;
-using Better.EditorTools.EditorAddons.WrappersTypeCollection;
+using Better.Commons.EditorAddons.Drawers.Utility;
+using Better.Commons.EditorAddons.Drawers.WrappersTypeCollection;
+using Better.Commons.Runtime.Comparers;
 using Better.Validation.EditorAddons.Wrappers;
 using Better.Validation.Runtime.Attributes;
 

diff --git a/Editor/EditorAddons/Utility/ValidationExtensions.cs b/Editor/EditorAddons/Utility/ValidationExtensions.cs
@@ -1,5 +1,5 @@
 using System;
-using Better.EditorTools.EditorAddons.Helpers;
+using Better.Commons.EditorAddons.Enums;
 using Better.Validation.Runtime.Attributes;
 
 

diff --git a/Editor/EditorAddons/Utility/ValidationUtility.cs b/Editor/EditorAddons/Utility/ValidationUtility.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
+using Better.Commons.Runtime.Utility;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;

diff --git a/Editor/EditorAddons/WindowModule/CollectionDrawing/CollectionDrawer.cs b/Editor/EditorAddons/WindowModule/CollectionDrawing/CollectionDrawer.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
-using Better.EditorTools.EditorAddons.Helpers;
+using Better.Commons.EditorAddons.Enums;
+using Better.Commons.EditorAddons.Utility;
 using Better.Validation.EditorAddons.Utility;
 using UnityEditor;
 using UnityEngine;
@@ -40,20 +41,20 @@ protected virtual void DrawBox(ValidationCommandData data)
 
                 GUI.Box(verticalScore.rect, GUIContent.none, EditorStyles.helpBox);
 
-                EditorGUILayout.Space(DrawersHelper.SpaceHeight);
+                EditorGUILayout.Space(ExtendedGUIUtility.SpaceHeight);
 
                 DrawLabel(data);
 
-                EditorGUILayout.Space(DrawersHelper.SpaceHeight);
+                EditorGUILayout.Space(ExtendedGUIUtility.SpaceHeight);
                 var iconType = data.Type.GetIconType();
                 if (data.IsValid)
                 {
                     GUI.backgroundColor = Color.green;
                     iconType = IconType.Checkmark;
                 }
 
-                DrawersHelper.HelpBox(data.Result, iconType, false);
-                EditorGUILayout.Space(DrawersHelper.SpaceHeight);
+                ExtendedGUIUtility.HelpBox(data.Result, iconType, false);
+                EditorGUILayout.Space(ExtendedGUIUtility.SpaceHeight);
             }
 
             GUI.backgroundColor = bufferColor;
@@ -75,7 +76,7 @@ protected virtual void DrawLabel(ValidationCommandData data)
                 }
 
                 EditorGUILayout.LabelField(csIcon);
-                EditorGUILayout.Space(DrawersHelper.SpaceHeight);
+                EditorGUILayout.Space(ExtendedGUIUtility.SpaceHeight);
 
                 if (GUILayout.Button("Show"))
                 {

diff --git a/Editor/EditorAddons/WindowModule/CollectionDrawing/DefaultDrawer.cs b/Editor/EditorAddons/WindowModule/CollectionDrawing/DefaultDrawer.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Better.EditorTools.EditorAddons.Helpers;
+using Better.Commons.EditorAddons.Utility;
 using UnityEditor;
 
 namespace Better.Validation.EditorAddons.WindowModule.CollectionDrawing
@@ -29,7 +29,7 @@ public override void DrawCollection()
             foreach (var data in _dataList)
             {
                 DrawBox(data);
-                EditorGUILayout.Space(DrawersHelper.SpaceHeight);
+                EditorGUILayout.Space(ExtendedGUIUtility.SpaceHeight);
             }
         }
 

diff --git a/Editor/EditorAddons/WindowModule/CollectionDrawing/GroupDictionaryDrawer.cs b/Editor/EditorAddons/WindowModule/CollectionDrawing/GroupDictionaryDrawer.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Extensions;
 using Better.Validation.EditorAddons.Utility;
 using UnityEditor;
 
@@ -62,7 +62,7 @@ public override void DrawCollection()
                         foreach (var validationCommandData in value.Item2)
                         {
                             DrawBox(validationCommandData);
-                            EditorGUILayout.Space(DrawersHelper.SpaceHeight);
+                            EditorGUILayout.Space(ExtendedGUIUtility.SpaceHeight);
                         }
                     }
 

diff --git a/Editor/EditorAddons/WindowModule/CollectionDrawing/ObjectGroupDrawer.cs b/Editor/EditorAddons/WindowModule/CollectionDrawing/ObjectGroupDrawer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Object = UnityEngine.Object;
 
 namespace Better.Validation.EditorAddons.WindowModule.CollectionDrawing

diff --git a/Editor/EditorAddons/WindowModule/CollectionDrawing/TypeGroupDrawer.cs b/Editor/EditorAddons/WindowModule/CollectionDrawing/TypeGroupDrawer.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Better.Validation.Runtime.Attributes;
 
 namespace Better.Validation.EditorAddons.WindowModule.CollectionDrawing

diff --git a/Editor/EditorAddons/WindowModule/Pages/ButtonPage.cs b/Editor/EditorAddons/WindowModule/Pages/ButtonPage.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Helpers;
+using Better.Commons.Runtime.Extensions;
 using Better.Validation.EditorAddons.Utility;
 using UnityEditor;
 using UnityEngine;

diff --git a/Editor/EditorAddons/WindowModule/Pages/ResultPage.cs b/Editor/EditorAddons/WindowModule/Pages/ResultPage.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Extensions;
 using Better.Validation.EditorAddons.Utility;
 using Better.Validation.EditorAddons.WindowModule.CollectionDrawing;
 using UnityEditor;
@@ -112,7 +112,7 @@ private void DrawCommandList()
         private static GUIStyle GetScrollStyle()
         {
             var style = new GUIStyle();
-            var space = (int)DrawersHelper.SpaceHeight;
+            var space = (int)ExtendedGUIUtility.SpaceHeight;
             style.margin = new RectOffset(space, space, space, space);
             return style;
         }

diff --git a/Editor/EditorAddons/WindowModule/ValidationWindow.cs b/Editor/EditorAddons/WindowModule/ValidationWindow.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Better.Extensions.Runtime;
+using Better.Commons.Runtime.Extensions;
 using UnityEditor;
 using UnityEngine;
 

diff --git a/Editor/EditorAddons/Wrappers/DataValidationWrapper.cs b/Editor/EditorAddons/Wrappers/DataValidationWrapper.cs
@@ -1,8 +1,9 @@
 using System.Reflection;
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.EditorTools.EditorAddons.Helpers.Caching;
-using Better.Extensions.EditorAddons;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.EditorAddons.Extensions;
+using Better.Commons.EditorAddons.Helpers;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Extensions;
 using Better.Internal.Core.Runtime;
 using Better.Validation.Runtime.Attributes;
 
@@ -17,7 +18,7 @@ public override CacheValue<string> Validate()
 
             var propertyContainer = Property.GetPropertyContainer();
             var method = propertyContainer.GetType().GetMethod(att.MethodName, Defines.MethodFlags);
-            var methodName = DrawersHelper.BeautifyFormat(att.MethodName);
+            var methodName = ExtendedGUIUtility.BeautifyFormat(att.MethodName);
             if (method == null)
             {
                 return GetNotValidCache($"Method with name {methodName} not found");
@@ -33,7 +34,7 @@ public override CacheValue<string> Validate()
             if (parameterInfo.ParameterType != fieldCache.Type)
             {
                 return GetNotValidCache(
-                    $"Method with name {methodName} has parameter of type {DrawersHelper.BeautifyFormat(parameterInfo.ParameterType.Name)}. But used on field of type {DrawersHelper.BeautifyFormat(fieldCache.Type.Name)}");
+                    $"Method with name {methodName} has parameter of type {ExtendedGUIUtility.BeautifyFormat(parameterInfo.ParameterType.Name)}. But used on field of type {ExtendedGUIUtility.BeautifyFormat(fieldCache.Type.Name)}");
             }
 
             if (method.IsStatic)
@@ -59,7 +60,7 @@ private CacheValue<string> InvokeMethod(MethodInfo method, CachedFieldInfo field
                 {
                     var name = fieldCache.FieldInfo.FieldType.IsArrayOrList() ? Property.GetArrayPath() : propertyContainer.GetType().Name;
                     return GetNotValidCache(
-                        $"Validation failed of {DrawersHelper.BeautifyFormat(fieldCache.FieldInfo.Name)} in {DrawersHelper.BeautifyFormat(name)}");
+                        $"Validation failed of {ExtendedGUIUtility.BeautifyFormat(fieldCache.FieldInfo.Name)} in {ExtendedGUIUtility.BeautifyFormat(name)}");
                 }
             }
             else if (method.ReturnType == typeof(string))

diff --git a/Editor/EditorAddons/Wrappers/MissingComponentWrapper.cs b/Editor/EditorAddons/Wrappers/MissingComponentWrapper.cs
@@ -1,4 +1,4 @@
-using Better.EditorTools.EditorAddons.Helpers.Caching;
+using Better.Commons.EditorAddons.Drawers.Caching;
 using Better.Validation.Runtime.Attributes;
 using UnityEngine;
 

diff --git a/Editor/EditorAddons/Wrappers/MissingReferenceWrapper.cs b/Editor/EditorAddons/Wrappers/MissingReferenceWrapper.cs
@@ -1,6 +1,6 @@
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.EditorTools.EditorAddons.Helpers.Caching;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Extensions;
 using UnityEditor;
 
 namespace Better.Validation.EditorAddons.Wrappers
@@ -11,7 +11,7 @@ public override CacheValue<string> Validate()
         {
             if (Property.objectReferenceValue.IsNullOrDestroyed())
             {
-                var fieldName = DrawersHelper.BeautifyFormat(Property.displayName);
+                var fieldName = ExtendedGUIUtility.BeautifyFormat(Property.displayName);
                 if (Property.objectReferenceInstanceIDValue != 0)
                 {
                     return GetNotValidCache($"Object in {fieldName} field is missing reference");

diff --git a/Editor/EditorAddons/Wrappers/NotNullWrapper.cs b/Editor/EditorAddons/Wrappers/NotNullWrapper.cs
@@ -1,6 +1,6 @@
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.EditorTools.EditorAddons.Helpers.Caching;
-using Better.Extensions.Runtime;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.EditorAddons.Utility;
+using Better.Commons.Runtime.Extensions;
 using UnityEditor;
 
 namespace Better.Validation.EditorAddons.Wrappers
@@ -11,7 +11,7 @@ public override CacheValue<string> Validate()
         {
             if (Property.objectReferenceValue.IsNullOrDestroyed())
             {
-                var fieldName = DrawersHelper.BeautifyFormat(Property.displayName);
+                var fieldName = ExtendedGUIUtility.BeautifyFormat(Property.displayName);
                 if (Property.objectReferenceInstanceIDValue != 0)
                 {
                     return GetNotValidCache($"Object in {fieldName} field is missing reference");

diff --git a/Editor/EditorAddons/Wrappers/PrefabWrapper.cs b/Editor/EditorAddons/Wrappers/PrefabWrapper.cs
@@ -1,5 +1,5 @@
-using Better.EditorTools.EditorAddons.Helpers;
-using Better.EditorTools.EditorAddons.Helpers.Caching;
+using Better.Commons.EditorAddons.Drawers.Caching;
+using Better.Commons.EditorAddons.Utility;
 using UnityEditor;
 
 namespace Better.Validation.EditorAddons.Wrappers
@@ -17,7 +17,7 @@ public override CacheValue<string> Validate()
             var obj = Property.objectReferenceValue;
             if (!PrefabUtility.IsPartOfPrefabAsset(obj))
             {
-                var str = DrawersHelper.BeautifyFormat(Property.displayName);
+                var str = ExtendedGUIUtility.BeautifyFormat(Property.displayName);
                 if (!PrefabUtility.IsPartOfNonAssetPrefabInstance(obj))
                 {
                     return GetNotValidCache($"Object in {str} field is not prefab");