fix: Fixed Settings view,

alex-bulat · alex-bulat · commit e3ce67a7c08c · 2025-07-25T15:16:46.000+02:00
Merge branch 'main' of https://github.com/jahro-console/unity-package
diff --git a/Editor/View/JahroEditorView.cs b/Editor/View/JahroEditorView.cs
@@ -69,11 +69,28 @@ public void CreateGUI()
 
             _projectSettings = JahroProjectSettings.LoadOrCreate();
 
+            _projectSettings.OnSettingsChanged += SaveProjectSettings;
+
             SetWindowMode(WindowMode.LOADING);
 
             CheckVersion();
         }
 
+        private void OnDestroy()
+        {
+            _projectSettings.OnSettingsChanged -= SaveProjectSettings;
+        }
+
+        private void SaveProjectSettings()
+        {
+            if (_projectSettings != null)
+            {
+                EditorUtility.SetDirty(_projectSettings);
+                AssetDatabase.SaveAssets();
+                AssetDatabase.Refresh();
+            }
+        }
+
         private async void CheckVersion()
         {
             try
diff --git a/Editor/View/SettingsView.cs b/Editor/View/SettingsView.cs
@@ -1,6 +1,5 @@
 using UnityEngine;
 using UnityEngine.UIElements;
-using JahroConsole.Core.Network;
 using JahroConsole.Core.Data;
 using System;
 using UnityEditor.UIElements;
@@ -25,18 +24,15 @@ public class SettingsView
         private Button _projectOverviewButton;
         private Button _teamOverviewButton;
         private Button _accountSettingsButton;
-
         private Toggle _jahroEnableToggle;
         private Toggle _autoDisableToggle;
         private EnumField _launchKeyField;
         private Toggle _keyboardShortcutsToggle;
         private Toggle _mobileTapAreaToggle;
         private Toggle _dublicateLogsToggle;
         private MaskField _assembliesField;
-
         private List<string> _assembliesNames = new List<string>();
         private int _assembliesFlag;
-
         public event Action OnResetApiKey;
 
         public SettingsView(VisualElement root)
@@ -164,20 +160,18 @@ public void Initialize(KeyValidator.ValidateKeyResponse validation, JahroProject
             if (_projectSettings.ActiveAssemblies == null)
             {
                 _projectSettings.ActiveAssemblies = new List<string>();
-            }
-
-            if (_projectSettings.ActiveAssemblies.Count == 0 && _assembliesNames != null && _assembliesNames.Count > 0)
-            {
-                _projectSettings.ActiveAssemblies.AddRange(_assembliesNames);
-                EditorUtility.SetDirty(_projectSettings);
+                if (_assembliesNames != null && _assembliesNames.Count > 0)
+                {
+                    _projectSettings.ActiveAssemblies = new List<string>(_assembliesNames);
+                }
             }
 
             UpdateAssemblySelection();
 
-            SetupDataBinding();
+            SetupManualBinding();
         }
 
-        private void SetupDataBinding()
+        private void SetupManualBinding()
         {
             if (_projectSettings == null) return;
 
@@ -187,7 +181,6 @@ private void SetupDataBinding()
                 _jahroEnableToggle.RegisterValueChangedCallback(evt =>
                 {
                     _projectSettings.JahroEnabled = evt.newValue;
-                    SaveProjectSettings();
                 });
             }
 
@@ -197,7 +190,6 @@ private void SetupDataBinding()
                 _autoDisableToggle.RegisterValueChangedCallback(evt =>
                 {
                     _projectSettings.AutoDisableInRelease = evt.newValue;
-                    SaveProjectSettings();
                 });
             }
 
@@ -207,7 +199,6 @@ private void SetupDataBinding()
                 _keyboardShortcutsToggle.RegisterValueChangedCallback(evt =>
                 {
                     _projectSettings.UseLaunchKeyboardShortcut = evt.newValue;
-                    SaveProjectSettings();
                 });
             }
 
@@ -217,7 +208,6 @@ private void SetupDataBinding()
                 _mobileTapAreaToggle.RegisterValueChangedCallback(evt =>
                 {
                     _projectSettings.UseLaunchTapArea = evt.newValue;
-                    SaveProjectSettings();
                 });
             }
 
@@ -227,7 +217,6 @@ private void SetupDataBinding()
                 _dublicateLogsToggle.RegisterValueChangedCallback(evt =>
                 {
                     _projectSettings.DuplicateToUnityConsole = evt.newValue;
-                    SaveProjectSettings();
                 });
             }
 
@@ -237,32 +226,37 @@ private void SetupDataBinding()
                 _launchKeyField.RegisterValueChangedCallback(evt =>
                 {
                     _projectSettings.LaunchKey = (KeyCode)evt.newValue;
-                    SaveProjectSettings();
                 });
             }
 
             if (_assembliesField != null)
             {
                 _assembliesField.RegisterValueChangedCallback(evt =>
                 {
-                    if (_assembliesNames != null && _assembliesNames.Count > 0)
+                    if (_projectSettings != null && _assembliesNames != null && _assembliesNames.Count > 0)
                     {
                         _assembliesFlag = (int)evt.newValue;
 
-                        _projectSettings.ActiveAssemblies.Clear();
+                        var newActiveAssemblies = new List<string>(_projectSettings.ActiveAssemblies);
 
                         for (int i = 0; i < _assembliesNames.Count; i++)
                         {
+                            string name = _assembliesNames[i];
+                            bool active = newActiveAssemblies.Contains(name);
                             int layer = 1 << i;
                             bool selected = (_assembliesFlag & layer) != 0;
 
-                            if (selected)
+                            if (!active && selected)
                             {
-                                _projectSettings.ActiveAssemblies.Add(_assembliesNames[i]);
+                                newActiveAssemblies.Add(name);
+                            }
+                            else if (active && !selected)
+                            {
+                                newActiveAssemblies.Remove(name);
                             }
                         }
 
-                        SaveProjectSettings();
+                        _projectSettings.ActiveAssemblies = newActiveAssemblies;
                     }
                 });
             }
@@ -301,13 +295,6 @@ public void Hide()
             _container.style.display = DisplayStyle.None;
         }
 
-        private void SaveProjectSettings()
-        {
-            if (_projectSettings != null)
-            {
-                EditorUtility.SetDirty(_projectSettings);
-                AssetDatabase.SaveAssets();
-            }
-        }
+
     }
 }
diff --git a/Runtime/Core/Context/JahroConfig.cs b/Runtime/Core/Context/JahroConfig.cs
@@ -10,17 +10,17 @@ public enum Environment
 
         internal const Environment ENV = Environment.PROD;
 
-        public static readonly string CurrentVersion = "0.1.0-alpha.7";
+        public static readonly string CurrentVersion = "0.1.0-alpha.9";
 
         internal static readonly string RegisterUrl = "https://console.jahro.io";
 
         public static readonly string ChangelogUrl = "https://jahro.io/changelog";
 
         internal static readonly string DocumentationRoot = "https://docs.jahro.io/";
 
-        internal static readonly string DocumentationWatcherOverview = "https://docs.jahro.io/start-here/watcher";
+        internal static readonly string DocumentationWatcherOverview = "https://jahro.io/docs/watcher";
 
-        internal static readonly string DocumentationCommandsOverview = "https://docs.jahro.io/start-here/commands";
+        internal static readonly string DocumentationCommandsOverview = "https://jahro.io/docs/unity-commands";
 
         internal static readonly string HostUrl = ENV == Environment.PROD ? "https://api.jahro.io/jahro-api" : "http://localhost:3000";
     }
diff --git a/Runtime/Core/Data/JahroProjectSettings.cs b/Runtime/Core/Data/JahroProjectSettings.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 using System.Linq;
+using System;
 
 namespace JahroConsole.Core.Data
 {
-
     public class JahroProjectSettings : ScriptableObject, IProjectSettings
     {
         [SerializeField]
@@ -31,21 +31,116 @@ public class JahroProjectSettings : ScriptableObject, IProjectSettings
         [SerializeField]
         private bool _autoDisableInRelease;
 
-        public bool JahroEnabled { get => _jahroEnabled; set => _jahroEnabled = value; }
+        public event Action OnSettingsChanged;
 
-        public bool UseLaunchKeyboardShortcut { get => _useLaunchKeyboardShortcut; set => _useLaunchKeyboardShortcut = value; }
+        public bool JahroEnabled
+        {
+            get => _jahroEnabled;
+            set
+            {
+                if (_jahroEnabled != value)
+                {
+                    _jahroEnabled = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public bool UseLaunchTapArea { get => _useLaunchTapArea; set => _useLaunchTapArea = value; }
+        public bool UseLaunchKeyboardShortcut
+        {
+            get => _useLaunchKeyboardShortcut;
+            set
+            {
+                if (_useLaunchKeyboardShortcut != value)
+                {
+                    _useLaunchKeyboardShortcut = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public KeyCode LaunchKey { get => _launchKey; set => _launchKey = value; }
+        public bool UseLaunchTapArea
+        {
+            get => _useLaunchTapArea;
+            set
+            {
+                if (_useLaunchTapArea != value)
+                {
+                    _useLaunchTapArea = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public List<string> ActiveAssemblies { get => _activeAssemblies; set => _activeAssemblies = value; }
+        public KeyCode LaunchKey
+        {
+            get => _launchKey;
+            set
+            {
+                if (_launchKey != value)
+                {
+                    _launchKey = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public bool DuplicateToUnityConsole { get => _duplicateToUnityConsole; set => _duplicateToUnityConsole = value; }
+        public List<string> ActiveAssemblies
+        {
+            get => _activeAssemblies;
+            set
+            {
+                if (_activeAssemblies != value)
+                {
+                    _activeAssemblies = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public string APIKey { get => _APIKey; set => _APIKey = value; }
+        public bool DuplicateToUnityConsole
+        {
+            get => _duplicateToUnityConsole;
+            set
+            {
+                if (_duplicateToUnityConsole != value)
+                {
+                    _duplicateToUnityConsole = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public bool AutoDisableInRelease { get => _autoDisableInRelease; set => _autoDisableInRelease = value; }
+        public string APIKey
+        {
+            get => _APIKey;
+            set
+            {
+                if (_APIKey != value)
+                {
+                    _APIKey = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
+        public bool AutoDisableInRelease
+        {
+            get => _autoDisableInRelease;
+            set
+            {
+                if (_autoDisableInRelease != value)
+                {
+                    _autoDisableInRelease = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
+        private void NotifySettingsChanged()
+        {
+            OnSettingsChanged?.Invoke();
+        }
 
         public static bool isSettingsFileExists()
         {
@@ -67,15 +162,14 @@ public static JahroProjectSettings CreateDefault()
         {
             var settings = ScriptableObject.CreateInstance<JahroProjectSettings>();
             settings._APIKey = "";
-            settings.JahroEnabled = true;
+            settings._jahroEnabled = true;
             settings._useLaunchKeyboardShortcut = true;
             settings._useLaunchTapArea = true;
             settings._activeAssemblies = new List<string>();
             settings._duplicateToUnityConsole = false;
             settings._launchKey = KeyCode.BackQuote;
             settings._autoDisableInRelease = false;
 
-
 #if UNITY_EDITOR
             var assemblies = UnityEditor.Compilation.CompilationPipeline.GetAssemblies(UnityEditor.Compilation.AssembliesType.Player)
                 .Where(assembly =>
@@ -92,6 +186,5 @@ public static JahroProjectSettings CreateDefault()
 #endif
             return settings;
         }
-
     }
 }
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "io.jahro.console",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.9",
   "displayName": "Jahro",
   "description": "Jahro is a powerful and easy-to-use Unity debugging console and runtime tool. Effortlessly execute commands, monitor variables in real-time, capture logs, and sync snapshots to analyze your game like never before. Perfect for developers who want a smarter way to debug, test, and optimize their Unity projects!",
-  "unity": "2019.1",
+  "unity": "2021.1",
   "unityRelease": "0b5",
   "dependencies": {},
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`	`using UnityEngine.UIElements;`
`3`		`-using JahroConsole.Core.Network;`
`4`	`3`	`using JahroConsole.Core.Data;`
`5`	`4`	`using System;`
`6`	`5`	`using UnityEditor.UIElements;`
`@@ -25,18 +24,15 @@ public class SettingsView`
`25`	`24`	`private Button _projectOverviewButton;`
`26`	`25`	`private Button _teamOverviewButton;`
`27`	`26`	`private Button _accountSettingsButton;`
`28`		`-`
`29`	`27`	`private Toggle _jahroEnableToggle;`
`30`	`28`	`private Toggle _autoDisableToggle;`
`31`	`29`	`private EnumField _launchKeyField;`
`32`	`30`	`private Toggle _keyboardShortcutsToggle;`
`33`	`31`	`private Toggle _mobileTapAreaToggle;`
`34`	`32`	`private Toggle _dublicateLogsToggle;`
`35`	`33`	`private MaskField _assembliesField;`
`36`		`-`
`37`	`34`	`private List<string> _assembliesNames = new List<string>();`
`38`	`35`	`private int _assembliesFlag;`
`39`		`-`
`40`	`36`	`public event Action OnResetApiKey;`
`41`	`37`
`42`	`38`	`public SettingsView(VisualElement root)`
`@@ -164,20 +160,18 @@ public void Initialize(KeyValidator.ValidateKeyResponse validation, JahroProject`
`164`	`160`	`if (_projectSettings.ActiveAssemblies == null)`
`165`	`161`	`{`
`166`	`162`	`_projectSettings.ActiveAssemblies = new List<string>();`
`167`		`- }`
`168`		`-`
`169`		`- if (_projectSettings.ActiveAssemblies.Count == 0 && _assembliesNames != null && _assembliesNames.Count > 0)`
`170`		`- {`
`171`		`- _projectSettings.ActiveAssemblies.AddRange(_assembliesNames);`
`172`		`- EditorUtility.SetDirty(_projectSettings);`
	`163`	`+ if (_assembliesNames != null && _assembliesNames.Count > 0)`
	`164`	`+ {`
	`165`	`+ _projectSettings.ActiveAssemblies = new List<string>(_assembliesNames);`
	`166`	`+ }`
`173`	`167`	`}`
`174`	`168`
`175`	`169`	`UpdateAssemblySelection();`
`176`	`170`
`177`		`- SetupDataBinding();`
	`171`	`+ SetupManualBinding();`
`178`	`172`	`}`
`179`	`173`
`180`		`- private void SetupDataBinding()`
	`174`	`+ private void SetupManualBinding()`
`181`	`175`	`{`
`182`	`176`	`if (_projectSettings == null) return;`
`183`	`177`
`@@ -187,7 +181,6 @@ private void SetupDataBinding()`
`187`	`181`	`_jahroEnableToggle.RegisterValueChangedCallback(evt =>`
`188`	`182`	`{`
`189`	`183`	`_projectSettings.JahroEnabled = evt.newValue;`
`190`		`- SaveProjectSettings();`
`191`	`184`	`});`
`192`	`185`	`}`
`193`	`186`
`@@ -197,7 +190,6 @@ private void SetupDataBinding()`
`197`	`190`	`_autoDisableToggle.RegisterValueChangedCallback(evt =>`
`198`	`191`	`{`
`199`	`192`	`_projectSettings.AutoDisableInRelease = evt.newValue;`
`200`		`- SaveProjectSettings();`
`201`	`193`	`});`
`202`	`194`	`}`
`203`	`195`
`@@ -207,7 +199,6 @@ private void SetupDataBinding()`
`207`	`199`	`_keyboardShortcutsToggle.RegisterValueChangedCallback(evt =>`
`208`	`200`	`{`
`209`	`201`	`_projectSettings.UseLaunchKeyboardShortcut = evt.newValue;`
`210`		`- SaveProjectSettings();`
`211`	`202`	`});`
`212`	`203`	`}`
`213`	`204`
`@@ -217,7 +208,6 @@ private void SetupDataBinding()`
`217`	`208`	`_mobileTapAreaToggle.RegisterValueChangedCallback(evt =>`
`218`	`209`	`{`
`219`	`210`	`_projectSettings.UseLaunchTapArea = evt.newValue;`
`220`		`- SaveProjectSettings();`
`221`	`211`	`});`
`222`	`212`	`}`
`223`	`213`
`@@ -227,7 +217,6 @@ private void SetupDataBinding()`
`227`	`217`	`_dublicateLogsToggle.RegisterValueChangedCallback(evt =>`
`228`	`218`	`{`
`229`	`219`	`_projectSettings.DuplicateToUnityConsole = evt.newValue;`
`230`		`- SaveProjectSettings();`
`231`	`220`	`});`
`232`	`221`	`}`
`233`	`222`
`@@ -237,32 +226,37 @@ private void SetupDataBinding()`
`237`	`226`	`_launchKeyField.RegisterValueChangedCallback(evt =>`
`238`	`227`	`{`
`239`	`228`	`_projectSettings.LaunchKey = (KeyCode)evt.newValue;`
`240`		`- SaveProjectSettings();`
`241`	`229`	`});`
`242`	`230`	`}`
`243`	`231`
`244`	`232`	`if (_assembliesField != null)`
`245`	`233`	`{`
`246`	`234`	`_assembliesField.RegisterValueChangedCallback(evt =>`
`247`	`235`	`{`
`248`		`- if (_assembliesNames != null && _assembliesNames.Count > 0)`
	`236`	`+ if (_projectSettings != null && _assembliesNames != null && _assembliesNames.Count > 0)`
`249`	`237`	`{`
`250`	`238`	`_assembliesFlag = (int)evt.newValue;`
`251`	`239`
`252`		`- _projectSettings.ActiveAssemblies.Clear();`
	`240`	`+ var newActiveAssemblies = new List<string>(_projectSettings.ActiveAssemblies);`
`253`	`241`
`254`	`242`	`for (int i = 0; i < _assembliesNames.Count; i++)`
`255`	`243`	`{`
	`244`	`+ string name = _assembliesNames[i];`
	`245`	`+ bool active = newActiveAssemblies.Contains(name);`
`256`	`246`	`int layer = 1 << i;`
`257`	`247`	`bool selected = (_assembliesFlag & layer) != 0;`
`258`	`248`
`259`		`- if (selected)`
	`249`	`+ if (!active && selected)`
`260`	`250`	`{`
`261`		`- _projectSettings.ActiveAssemblies.Add(_assembliesNames[i]);`
	`251`	`+ newActiveAssemblies.Add(name);`
	`252`	`+ }`
	`253`	`+ else if (active && !selected)`
	`254`	`+ {`
	`255`	`+ newActiveAssemblies.Remove(name);`
`262`	`256`	`}`
`263`	`257`	`}`
`264`	`258`
`265`		`- SaveProjectSettings();`
	`259`	`+ _projectSettings.ActiveAssemblies = newActiveAssemblies;`
`266`	`260`	`}`
`267`	`261`	`});`
`268`	`262`	`}`
`@@ -301,13 +295,6 @@ public void Hide()`
`301`	`295`	`_container.style.display = DisplayStyle.None;`
`302`	`296`	`}`
`303`	`297`
`304`		`- private void SaveProjectSettings()`
`305`		`- {`
`306`		`- if (_projectSettings != null)`
`307`		`- {`
`308`		`- EditorUtility.SetDirty(_projectSettings);`
`309`		`- AssetDatabase.SaveAssets();`
`310`		`- }`
`311`		`- }`
	`298`	`+`
`312`	`299`	`}`
`313`	`300`	`}`