Merge pull request #273 from github-for-unity/enhancements/subview-is-busy

Adding IsBusy to IView

Author: StanleyGoldman

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

@@ -29,34 +29,8 @@ class AuthenticationView : Subview
         [NonSerialized] private string errorMessage;
         [NonSerialized] private bool enterPressed;
         [NonSerialized] private string password = "";
-
         [NonSerialized] private AuthenticationService authenticationService;
-        private AuthenticationService AuthenticationService
-        {
-            get
-            {
-                if (authenticationService == null)
-                {
-                    UriString host;
-                    if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
-                    {
-                        host = new UriString(Repository.CloneUrl.ToRepositoryUri()
-                            .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
-                    }
-                    else
-                    {
-                        host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
-                    }
 
-                    AuthenticationService = new AuthenticationService(host, Platform.Keychain);
-                }
-                return authenticationService;
-            }
-            set
-            {
-                authenticationService = value;
-            }
-        }
 
         public override void InitializeView(IView parent)
         {
@@ -250,5 +224,37 @@ private void ShowErrorMessage()
                 GUILayout.Label(errorMessage, Styles.ErrorLabel);
             }
         }
+
+        private AuthenticationService AuthenticationService
+        {
+            get
+            {
+                if (authenticationService == null)
+                {
+                    UriString host;
+                    if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
+                    {
+                        host = new UriString(Repository.CloneUrl.ToRepositoryUri()
+                            .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+                    }
+                    else
+                    {
+                        host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+                    }
+
+                    AuthenticationService = new AuthenticationService(host, Platform.Keychain);
+                }
+                return authenticationService;
+            }
+            set
+            {
+                authenticationService = value;
+            }
+        }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }

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

@@ -111,6 +111,7 @@ public virtual void OnSelectionChange()
 
         public Rect Position { get { return position; } }
         public IApplicationManager Manager { get; private set; }
+        public abstract bool IsBusy { get; }
         public IRepository Repository { get { return inLayout ? cachedRepository : Environment.Repository; } }
         public bool HasRepository { get { return Environment.RepositoryPath != null; } }
 

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

@@ -751,6 +751,11 @@ private void OnTreeNodeChildrenGUI(BranchTreeNode node)
             }
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         private enum NodeType
         {
             Folder,

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

@@ -19,9 +19,9 @@ class ChangesView : Subview
         private const string OneChangedFileLabel = "1 changed file";
         private const string NoChangedFilesLabel = "No changed files";
 
-        [NonSerialized] private bool busy = true;
-        [SerializeField] private string commitBody = "";
+        [NonSerialized] private bool isBusy = true;
 
+        [SerializeField] private string commitBody = "";
         [SerializeField] private string commitMessage = "";
         [SerializeField] private string currentBranch = "[unknown]";
         [SerializeField] private Vector2 horizontalScroll;
@@ -72,10 +72,9 @@ private void OnStatusUpdate(GitStatus update)
             // (Re)build tree
             tree.UpdateEntries(update.Entries.Where(x => x.Status != GitFileStatus.Ignored).ToList());
 
-            busy = false;
+            isBusy = false;
         }
 
-
         public override void OnGUI()
         {
             GUILayout.BeginHorizontal();
@@ -144,7 +143,7 @@ private void OnCommitDetailsAreaGUI()
                     GUILayout.Space(Styles.CommitAreaPadding);
 
                     // Disable committing when already committing or if we don't have all the data needed
-                    EditorGUI.BeginDisabledGroup(busy || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
+                    EditorGUI.BeginDisabledGroup(isBusy || string.IsNullOrEmpty(commitMessage) || !tree.CommitTargets.Any(t => t.Any));
                     {
                         GUILayout.BeginHorizontal();
                         {
@@ -187,7 +186,7 @@ private void SelectNone()
         private void Commit()
         {
             // Do not allow new commits before we have received one successful update
-            busy = true;
+            isBusy = true;
 
             var files = Enumerable.Range(0, tree.Entries.Count)
                 .Where(i => tree.CommitTargets[i].All)
@@ -210,8 +209,13 @@ private void Commit()
                     {
                         commitMessage = "";
                         commitBody = "";
-                        busy = false;
+                        isBusy = false;
                     }).Start();
         }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }

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

@@ -86,12 +86,6 @@ public override void OnGUI()
             GUILayout.EndVertical();
         }
 
-        private void OnCommitTreeChange()
-        {
-            Height = 0f;
-            Redraw();
-        }
-
         public void UpdateEntries(IList<GitStatusEntry> newEntries)
         {
             // Handle the empty list scenario
@@ -112,6 +106,12 @@ public void UpdateEntries(IList<GitStatusEntry> newEntries)
             OnCommitTreeChange();
         }
 
+        private void OnCommitTreeChange()
+        {
+            Height = 0f;
+            Redraw();
+        }
+
         private void TreeNode(FileTreeNode node)
         {
             GUILayout.Space(Styles.TreeVerticalSpacing);
@@ -275,7 +275,13 @@ private void TreeNode(FileTreeNode node)
             GUILayout.EndHorizontal();
         }
 
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
+
         public float Height { get; protected set; }
+
         public bool Readonly { get; set; }
 
         public IList<GitStatusEntry> Entries

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

@@ -47,6 +47,7 @@ class HistoryView : Subview
         [NonSerialized] private int selectionIndex;
         [NonSerialized] private bool updated = true;
         [NonSerialized] private bool useScrollTime;
+        [NonSerialized] private bool isBusy;
 
         [SerializeField] private Vector2 detailsScroll;
         [SerializeField] private Object historyTarget;
@@ -57,7 +58,6 @@ class HistoryView : Subview
 
         [SerializeField] private ChangesetTreeView changesetTree = new ChangesetTreeView();
         [SerializeField] private List<GitLogEntry> history = new List<GitLogEntry>();
-        [SerializeField] private bool isBusy;
         [SerializeField] private string currentRemote;
         [SerializeField] private bool isPublished;
 
@@ -124,6 +124,7 @@ public override void OnGUI()
 
             OnEmbeddedGUI();
         }
+
         private void AttachHandlers(IRepository repository)
         {
             if (repository == null)
@@ -745,6 +746,11 @@ private void DrawTimelineRectAroundIconRect(Rect parentRect, Rect iconRect)
             EditorGUI.DrawRect(bottomTimelineRect, timelineBarColor);
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         private float EntryHeight
         {
             get { return Styles.HistoryEntryHeight + Styles.HistoryEntryPadding; }

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

@@ -15,5 +15,6 @@ interface IView
         IRepository Repository { get; }
         bool HasRepository { get; }
         IApplicationManager Manager { get; }
+        bool IsBusy { get; }
     }
 }

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

@@ -25,5 +25,10 @@ public override void InitializeView(IView parent)
 
         public override void OnGUI()
         {}
+
+        public override bool IsBusy
+        {
+            get { return false; }
+        }
     }
 }

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

@@ -108,6 +108,11 @@ public override void OnDestroy()
             OnClose = null;
         }
 
+        public override bool IsBusy
+        {
+            get { return ActiveView.IsBusy; }
+        }
+
         private Subview ActiveView
         {
             get

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

@@ -235,6 +235,11 @@ public override void OnGUI()
             EditorGUI.EndDisabledGroup();
         }
 
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+
         private bool IsFormValid
         {
             get { return !string.IsNullOrEmpty(repoName) && !isBusy && selectedOwner != 0; }