Move defines to runtime asmdef

techno-dwarf-works · Jan 24, 2024 · c8d0f79 · c8d0f79
1 parent 1e79030
commit c8d0f79
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Editor/SettingsTools/ProjectSettingsRegisterer.cs b/Editor/SettingsTools/ProjectSettingsRegisterer.cs
@@ -11,10 +11,6 @@ namespace Better.EditorTools.SettingsTools
 {
     public static class ProjectSettingsRegisterer
     {
-        public const string BetterPrefix = nameof(Better);
-        public const string ProjectPrefix = "Project";
-        public const string HighlightPrefix = "Highlight Settings";
-        public const string ResourcesPrefix = nameof(Resources);
 
         [SettingsProviderGroup]
         internal static SettingsProvider[] CreateSettingsProvider()

diff --git a/Editor/SettingsTools/ProjectSettingsTools.cs b/Editor/SettingsTools/ProjectSettingsTools.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using Better.Tools.Runtime;
 using Better.Tools.Runtime.Settings;
 using UnityEditor;
 using UnityEngine;
@@ -15,17 +16,17 @@ public ProjectSettingsTools(string namespacePrefix, string settingMenuItem)
         {
             NamespacePrefix = namespacePrefix;
             _folderPaths = new string[]
-                { ProjectSettingsRegisterer.BetterPrefix, NamespacePrefix, ProjectSettingsRegisterer.ResourcesPrefix };
-            var menuItemPrefix = $"{ProjectSettingsRegisterer.BetterPrefix}/{settingMenuItem}";
-            ProjectSettingKey = $"{ProjectSettingsRegisterer.ProjectPrefix}/{menuItemPrefix}";
+                { BetterEditorDefines.BetterPrefix, NamespacePrefix, BetterEditorDefines.ResourcesPrefix };
+            var menuItemPrefix = $"{BetterEditorDefines.BetterPrefix}/{settingMenuItem}";
+            ProjectSettingKey = $"{BetterEditorDefines.ProjectPrefix}/{menuItemPrefix}";
         }
 
         public ProjectSettingsTools(string namespacePrefix, string settingMenuItem, string[] settingsFolderNames)
         {
             NamespacePrefix = namespacePrefix;
             _folderPaths = settingsFolderNames;
-            var menuItemPrefix = $"{ProjectSettingsRegisterer.BetterPrefix}/{settingMenuItem}";
-            ProjectSettingKey = $"{ProjectSettingsRegisterer.ProjectPrefix}/{menuItemPrefix}";
+            var menuItemPrefix = $"{BetterEditorDefines.BetterPrefix}/{settingMenuItem}";
+            ProjectSettingKey = $"{BetterEditorDefines.ProjectPrefix}/{menuItemPrefix}";
         }
 
         private string GenerateResourcesRelativePath()

diff --git a/Runtime/BetterEditorDefines.cs b/Runtime/BetterEditorDefines.cs
@@ -1,9 +1,14 @@
 using System.Reflection;
+using UnityEngine;
 
 namespace Better.Tools.Runtime
 {
     public class BetterEditorDefines
     {
+        public const string BetterPrefix = nameof(Better);
+        public const string ProjectPrefix = "Project";
+        public const string HighlightPrefix = "Highlight Settings";
+        public const string ResourcesPrefix = nameof(Resources);
         public const string Editor = "UNITY_EDITOR";
 
         public const BindingFlags MethodFlags = BindingFlags.Public | BindingFlags.NonPublic |

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.uurha.bettereditortools",
   "displayName": "Better Editor Tools",
   "description": "Collection of useful tools for Unity Editor",
-  "version": "1.0.67",
+  "version": "1.0.68",
   "unity": "2020.1",
   "dependencies": {
     "com.uurha.betterdatastructures": "0.1.1",