Add a loading view and make it so the PopupWindow always has an active view

Author: shana

src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj

@@ -100,6 +100,7 @@
     <Compile Include="UI\ChangesView.cs" />
     <Compile Include="UI\HistoryView.cs" />
     <Compile Include="UI\IView.cs" />
+    <Compile Include="UI\LoadingView.cs" />
     <Compile Include="UI\PublishView.cs" />
     <Compile Include="UI\SettingsView.cs" />
     <Compile Include="UI\Subview.cs" />

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

@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Octokit;
+using Rackspace.Threading;
+using UnityEditor;
+using UnityEngine;
+
+namespace GitHub.Unity
+{
+    class LoadingView : Subview
+    {
+        private static readonly Vector2 viewSize = new Vector2(300, 250);
+
+        private const string WindowTitle = "Loading...";
+        private const string Header = "";
+
+
+        public override void InitializeView(IView parent)
+        {
+            base.InitializeView(parent);
+            Title = WindowTitle;
+            Size = viewSize;
+        }
+
+        public override void OnGUI()
+        {}
+    }
+}

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

@@ -9,15 +9,16 @@ class PopupWindow : BaseWindow
     {
         public enum PopupViewType
         {
+            None,
             PublishView,
             AuthenticationView
         }
 
-        [NonSerialized] private Subview activeView;
-
         [SerializeField] private PopupViewType activeViewType;
+
         [SerializeField] private AuthenticationView authenticationView;
         [SerializeField] private PublishView publishView;
+        [SerializeField] private LoadingView loadingView;
 
         public event Action<bool> OnClose;
 
@@ -53,50 +54,37 @@ public override void Initialize(IApplicationManager applicationManager)
 
             publishView = publishView ?? new PublishView();
             authenticationView = authenticationView ?? new AuthenticationView();
+            loadingView = loadingView ?? new LoadingView();
 
             publishView.InitializeView(this);
             authenticationView.InitializeView(this);
+            loadingView.InitializeView(this);
         }
 
         public override void OnEnable()
         {
             base.OnEnable();
 
-            if (ActiveView != null)
-            {
-                minSize = maxSize = ActiveView.Size;
-                ActiveView.OnEnable();
-            }
+            minSize = maxSize = ActiveView.Size;
+            ActiveView.OnEnable();
         }
 
         public override void OnDisable()
         {
             base.OnDisable();
-
-            if (ActiveView != null)
-            {
-                ActiveView.OnDisable();
-            }
+            ActiveView.OnDisable();
         }
 
         public override void OnUI()
         {
             base.OnUI();
-
-            if (ActiveView != null)
-            {
-                ActiveView.OnGUI();
-            }
+            ActiveView.OnGUI();
         }
 
         public override void Refresh()
         {
             base.Refresh();
-
-            if (ActiveView != null)
-            {
-                ActiveView.Refresh();
-            }
+            ActiveView.Refresh();
         }
 
         public override void OnSelectionChange()
@@ -122,37 +110,24 @@ public override void OnDestroy()
 
         private Subview ActiveView
         {
-            get { return activeView; }
+            get
+            {
+                switch (activeViewType)
+                {
+                    case PopupViewType.PublishView:
+                        return publishView;
+                    case PopupViewType.AuthenticationView:
+                        return authenticationView;
+                    default:
+                        return loadingView;
+                }
+            }
         }
 
         private PopupViewType ActiveViewType
         {
             get { return activeViewType; }
-            set
-            {
-                var valueChanged = false;
-                if (activeViewType != value)
-                {
-                    valueChanged = true;
-                    activeViewType = value;
-                }
-
-                if (activeView == null || valueChanged)
-                {
-                    switch (activeViewType)
-                    {
-                        case PopupViewType.PublishView:
-                            activeView = publishView;
-                            break;
-
-                        case PopupViewType.AuthenticationView:
-                            activeView = authenticationView;
-                            break;
-
-                        default: throw new ArgumentOutOfRangeException("value", value, null);
-                    }
-                }
-            }
+            set { activeViewType = value; }
         }
     }
 }