Uses com.nomnom.easier-custom-preferences for the pref window

Author: nomnomab

Editor/PreferenceWindow.cs

@@ -1,93 +1,74 @@
 using System.Collections.Generic;
 using System.Linq;
+using Nomnom.EasierCustomPreferences.Editor;
 using UnityEditor;
 using UnityEngine;
 
 namespace Nomnom.ProjectWindowExtensions.Editor {
+	[PreferencesName("Project Window Extensions")]
+	[PreferencesKeyword("Project", "Window", "Extensions")]
 	internal static class PreferenceWindow {
 		private const string DEF_COPY_PASTE = "NOM_PROJECT_COPY_PASTE";
 		private const string DEF_MORE_FILES = "NOM_PROJECT_MORE_FILES";
-
-		private static ProjectWindowSettingsHandler.Settings _currentSettings;
 
-		[SettingsProvider]
-		public static SettingsProvider CreateProvider() {
-			_currentSettings = ProjectWindowSettingsHandler.GetEditorSettings();
-			
-			var provider = new SettingsProvider("Preferences/Project Window Extensions", SettingsScope.User) {
-				label = "Project Window Extensions",
-
-				guiHandler = searchContext => {
-					ProjectWindowGUI.Draw(_currentSettings);
-
-					if (GUILayout.Button("Apply")) {
-						ProjectWindowSettingsHandler.SetEditorSettings(_currentSettings);
-						
-						// update preprocessors
-						string definesString =
-							PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
-						List<string> allDefines = definesString.Split(';').ToList();
-
-						bool containsCopyPaste = allDefines.Contains(DEF_COPY_PASTE);
-						bool containsMoreFiles = allDefines.Contains(DEF_MORE_FILES);
-						
-						if (containsCopyPaste && !_currentSettings.UseCopyPaste) {
-							allDefines.Remove(DEF_COPY_PASTE);
-						} else if (!containsCopyPaste && _currentSettings.UseCopyPaste) {
-							allDefines.Add(DEF_COPY_PASTE);
-						}
-						
-						if (containsMoreFiles && !_currentSettings.UseAdditionalFiles) {
-							allDefines.Remove(DEF_MORE_FILES);
-						} else if (!containsMoreFiles && _currentSettings.UseAdditionalFiles) {
-							allDefines.Add(DEF_MORE_FILES);
-						}
-						
-						PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, string.Join(";", allDefines));
-						AssetDatabase.Refresh();
-					}
-				},
-
-				// Keywords for the search bar in the Unity Preferences menu
-				keywords = new HashSet<string>(new[] {"Project", "Window", "Extensions"})
-			};
-
-			return provider;
-		}
-	}
-
-	internal sealed class ProjectWindowSettingsHandler {
 		private const string KEY_USE_COPY_PASTE = "nomnom.project-window-extensions.use-copy-paste";
 		private const string KEY_USE_ADDITIONAL_FILES = "nomnom.project-window-extensions.use-additional-files";
+		
+		private static GUIContent _useCopyPasteText = new GUIContent("Use Copy/Paste");
+		private static GUIContent _useAdditionalFilesText = new GUIContent("Use Additional Files");
+
+		[SettingsProvider]
+		public static SettingsProvider CreateProvider() => CustomPreferences.GetProvider(typeof(PreferenceWindow), false);
 
-		public static Settings GetEditorSettings() {
+		public static Settings OnDeserialize() {
 			return new Settings {
 				UseCopyPaste = EditorPrefs.GetBool(KEY_USE_COPY_PASTE, true),
 				UseAdditionalFiles = EditorPrefs.GetBool(KEY_USE_ADDITIONAL_FILES, true),
 			};
 		}
 
-		public static void SetEditorSettings(Settings settings) {
+		public static void OnSerialize(Settings settings) {
 			EditorPrefs.SetBool(KEY_USE_COPY_PASTE, settings.UseCopyPaste);
 			EditorPrefs.SetBool(KEY_USE_ADDITIONAL_FILES, settings.UseAdditionalFiles);
 		}
+		
+		public static void OnGUI(string searchContext, Settings obj) {
+			EditorGUI.indentLevel++;
+			obj.UseCopyPaste = EditorGUILayout.ToggleLeft(_useCopyPasteText, obj.UseCopyPaste);
+			obj.UseAdditionalFiles = EditorGUILayout.ToggleLeft(_useAdditionalFilesText, obj.UseAdditionalFiles);
+			EditorGUI.indentLevel--;
+
+			if (GUILayout.Button("Apply")) {
+				OnSerialize(obj);
+						
+				// update preprocessors
+				string definesString =
+					PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+				List<string> allDefines = definesString.Split(';').ToList();
 
+				bool containsCopyPaste = allDefines.Contains(DEF_COPY_PASTE);
+				bool containsMoreFiles = allDefines.Contains(DEF_MORE_FILES);
+						
+				if (containsCopyPaste && !obj.UseCopyPaste) {
+					allDefines.Remove(DEF_COPY_PASTE);
+				} else if (!containsCopyPaste && obj.UseCopyPaste) {
+					allDefines.Add(DEF_COPY_PASTE);
+				}
+						
+				if (containsMoreFiles && !obj.UseAdditionalFiles) {
+					allDefines.Remove(DEF_MORE_FILES);
+				} else if (!containsMoreFiles && obj.UseAdditionalFiles) {
+					allDefines.Add(DEF_MORE_FILES);
+				}
+						
+				PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, string.Join(";", allDefines));
+				AssetDatabase.Refresh();
+			}
+		}
+		
 		internal sealed class Settings {
 			public bool UseCopyPaste;
 			public bool UseAdditionalFiles;
 		}
 	}
-
-	internal static class ProjectWindowGUI {
-		private static GUIContent _useCopyPasteText = new GUIContent("Use Copy/Paste");
-		private static GUIContent _useAdditionalFilesText = new GUIContent("Use Additional Files");
-
-
-		public static void Draw(ProjectWindowSettingsHandler.Settings settings) {
-			EditorGUI.indentLevel++;
-			settings.UseCopyPaste = EditorGUILayout.ToggleLeft(_useCopyPasteText, settings.UseCopyPaste);
-			settings.UseAdditionalFiles = EditorGUILayout.ToggleLeft(_useAdditionalFilesText, settings.UseAdditionalFiles);
-			EditorGUI.indentLevel--;
-		}
-	}
 }

Editor/com.nomnom.project-window-extensions.Editor.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "com.nomnom.project-window-extensions.Editor",
     "rootNamespace": "Nomnom.ProjectWindowExtensions",
-    "references": [],
+    "references": [
+        "com.nomnom.easier-custom-preferences.Editor"
+    ],
     "includePlatforms": [
         "Editor"
     ],

package.json

@@ -1,11 +1,14 @@
 {
   "name": "com.nomnom.project-window-extensions",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "displayName": "Project Window Extensions",
   "description": "This aims to improve the usability of the project window.",
   "unity": "2020.3",
   "unityRelease": "20f1",
   "licensesUrl": "https://choosealicense.com/licenses/mit/",
+  "dependencies": {
+    "com.nomnom.easier-custom-preferences": "1.1.1"
+  },
   "keywords": [
     "nomnom",
     "project",