Merge pull request #106 from brunomikoski/feature/fixes

Feature/fixes

Author: brunomikoski

CHANGELOG.MD

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+# [1.9.4]
+### Changed
+- Fixed namespace settings not been stored properly after changing once on the Wizard
+- Fixed `NullReference` on GetItemHeight()
+
 # [1.9.3]
 ### Add
 - Automatically define namespace for static collection generated file based on `CollectionItem`
@@ -356,6 +361,7 @@ public bool IsValidConsumable(Consumable consumable)
  - First initial working version 
 
 
+[1.9.4]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.4
 [1.9.3]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.3
 [1.9.2]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.2
 [1.9.1]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.9.1

Scripts/Editor/Core/CollectionCustomEditor.cs

@@ -116,9 +116,9 @@ private void OnClickToAddNewItem(Rect buttonRect, ReorderableList list)
 
         private float GetCollectionItemHeight(int index)
         {
-            if (itemHidden == null || itemHidden[index])
-                return 0;
-            
+            if (itemHidden == null || itemHidden[index] || index > itemHidden.Length - 1)
+                return EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+
             return Mathf.Max(
                 heights[index],
                 EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing

Scripts/Editor/Core/ScriptableObjectCollectionSettings.cs

@@ -14,7 +14,7 @@ public class ScriptableObjectCollectionSettings : ScriptableObjectForPreferences
         public string DefaultGeneratedScriptsPath => defaultGeneratedScriptsPath;
 
         [FormerlySerializedAs("defaultNamespace")] [SerializeField]
-        private string namespacePrefix = "CompanyName";
+        private string namespacePrefix;
         public string NamespacePrefix => namespacePrefix;
 
         [SerializeField]

Scripts/Editor/Wizzard/CreateCollectionWizard.cs

@@ -327,6 +327,9 @@ private static CreateCollectionWizard GetWindowInstance()
         private void OnEnable()
         {
             windowInstance = this;
+
+            if (string.IsNullOrEmpty(NamespacePrefix))
+                NamespacePrefix = Application.companyName;
         }
 
         public static void Show(string targetPath)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "unity": "2018.4",
   "description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping then into a collection and exposing then by code or nice inspectors!",
   "keywords": [