Organizing SettingsView

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using UnityEditor;
 using UnityEngine;
 
@@ -20,30 +18,25 @@ class SettingsView : Subview
         private const string MetricsOptInLabel = "Help us improve by sending anonymous usage data";
         private const string DefaultRepositoryRemoteName = "origin";
 
+        [NonSerialized] private bool currentLocksHasUpdate;
+        [NonSerialized] private bool currentRemoteHasUpdate;
         [NonSerialized] private bool isBusy;
+        [NonSerialized] private bool metricsHasChanged;
 
+        [SerializeField] private GitPathView gitPathView = new GitPathView();
+        [SerializeField] private bool hasRemote;
+        [SerializeField] private CacheUpdateEvent lastCurrentRemoteChangedEvent;
+        [SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
         [SerializeField] private List<GitLock> lockedFiles = new List<GitLock>();
+        [SerializeField] private int lockedFileSelection = -1;
         [SerializeField] private Vector2 lockScrollPos;
+        [SerializeField] private bool metricsEnabled;
+        [SerializeField] private string newRepositoryRemoteUrl;
         [SerializeField] private string repositoryRemoteName;
         [SerializeField] private string repositoryRemoteUrl;
         [SerializeField] private Vector2 scroll;
-        [SerializeField] private int lockedFileSelection = -1;
-        [SerializeField] private bool hasRemote;
-
-        [SerializeField] private string newRepositoryRemoteUrl;
-        
-        [SerializeField] private bool metricsEnabled;
-        [NonSerialized] private bool metricsHasChanged;
-        
-        [SerializeField] private GitPathView gitPathView = new GitPathView();
         [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView();
 
-        [SerializeField] private CacheUpdateEvent lastCurrentRemoteChangedEvent;
-        [NonSerialized] private bool currentRemoteHasUpdate;
-
-        [SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
-        [NonSerialized] private bool currentLocksHasUpdate;
-
         public override void InitializeView(IView parent)
         {
             base.InitializeView(parent);
@@ -91,10 +84,39 @@ public override void Refresh()
             userSettingsView.Refresh();
         }
 
+        public override void OnGUI()
+        {
+            scroll = GUILayout.BeginScrollView(scroll);
+            {
+                userSettingsView.OnGUI();
+
+                GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+
+                if (Repository != null)
+                {
+                    OnRepositorySettingsGUI();
+
+                    GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+
+                    OnGitLfsLocksGUI();
+
+                    GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
+                }
+
+                gitPathView.OnGUI();
+                OnPrivacyGui();
+                OnLoggingSettingsGui();
+            }
+
+            GUILayout.EndScrollView();
+        }
+
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
+            {
                 return;
+            }
 
             repository.CurrentRemoteChanged += RepositoryOnCurrentRemoteChanged;
             repository.LocksChanged += RepositoryOnLocksChanged;
@@ -104,61 +126,32 @@ private void RepositoryOnLocksChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLocksChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () =>
-                {
+                new ActionTask(TaskManager.Token, () => {
                     lastLocksChangedEvent = cacheUpdateEvent;
                     currentLocksHasUpdate = true;
                     Redraw();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                }) { Affinity = TaskAffinity.UI }.Start();
             }
         }
 
         private void RepositoryOnCurrentRemoteChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastCurrentRemoteChangedEvent.Equals(cacheUpdateEvent))
             {
-                new ActionTask(TaskManager.Token, () =>
-                {
+                new ActionTask(TaskManager.Token, () => {
                     lastCurrentRemoteChangedEvent = cacheUpdateEvent;
                     currentRemoteHasUpdate = true;
                     Redraw();
-                })
-                { Affinity = TaskAffinity.UI }.Start();
+                }) { Affinity = TaskAffinity.UI }.Start();
             }
         }
 
         private void DetachHandlers(IRepository repository)
         {
             if (repository == null)
-                return;
-        }
-
-        public override void OnGUI()
-        {
-            scroll = GUILayout.BeginScrollView(scroll);
             {
-                userSettingsView.OnGUI();
-
-                GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
-
-                if (Repository != null)
-                {
-                    OnRepositorySettingsGUI();
-
-                    GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
-
-                    OnGitLfsLocksGUI();
-
-                    GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
-                }
-
-                gitPathView.OnGUI();
-                OnPrivacyGui();
-                OnLoggingSettingsGui();
+                return;
             }
-
-            GUILayout.EndScrollView();
         }
 
         private void MaybeUpdateData()