A dedicated view to initialize the project

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

@@ -102,6 +102,7 @@
     <Compile Include="UI\IView.cs" />
     <Compile Include="UI\LoadingView.cs" />
     <Compile Include="UI\PublishView.cs" />
+    <Compile Include="UI\InitProjectView.cs" />
     <Compile Include="UI\UserSettingsView.cs" />
     <Compile Include="UI\GitPathView.cs" />
     <Compile Include="UI\SettingsView.cs" />

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

@@ -17,21 +17,15 @@ public virtual void Initialize(IApplicationManager applicationManager)
             Logger.Trace("Initialize ApplicationManager:{0} Initialized:{1}", applicationManager, initialized);
         }
 
-        public void InitializeWindow(IApplicationManager applicationManager)
+        public void InitializeWindow(IApplicationManager applicationManager, bool requiresRedraw = true)
         {
-            if (inLayout)
-            {
-                initializeWasCalled = true;
-                cachedManager = applicationManager;
-                return;
-            }
-
+            initialized = true;
+            initializeWasCalled = true;
             Manager = applicationManager;
             cachedRepository = Environment.Repository;
-            initialized = true;
             Initialize(applicationManager);
-            OnRepositoryChanged(null);
-            Redraw();
+            if (requiresRedraw)
+                Redraw();
         }
 
         public virtual void Redraw()
@@ -51,14 +45,14 @@ public virtual void Awake()
         {
             Logger.Trace("Awake Initialized:{0}", initialized);
             if (!initialized)
-                InitializeWindow(EntryPoint.ApplicationManager);
+                InitializeWindow(EntryPoint.ApplicationManager, false);
         }
 
         public virtual void OnEnable()
         {
             Logger.Trace("OnEnable Initialized:{0}", initialized);
             if (!initialized)
-                InitializeWindow(EntryPoint.ApplicationManager);
+                InitializeWindow(EntryPoint.ApplicationManager, false);
         }
 
         public virtual void OnDisable()
@@ -81,8 +75,9 @@ private void OnGUI()
         {
             if (Event.current.type == EventType.layout)
             {
-                if (cachedRepository != Environment.Repository)
+                if (cachedRepository != Environment.Repository || initializeWasCalled)
                 {
+                    initializeWasCalled = false;
                     OnRepositoryChanged(cachedRepository);
                     cachedRepository = Environment.Repository;
                 }
@@ -95,11 +90,6 @@ private void OnGUI()
             if (Event.current.type == EventType.repaint)
             {
                 inLayout = false;
-                if (initializeWasCalled)
-                {
-                    initializeWasCalled = false;
-                    InitializeWindow(cachedManager);
-                }
             }
         }
 
@@ -113,7 +103,7 @@ public virtual void OnSelectionChange()
         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; } }
+        public bool HasRepository { get { return Repository != null; } }
 
         protected ITaskManager TaskManager { get { return Manager.TaskManager; } }
         protected IGitClient GitClient { get { return Manager.GitClient; } }

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

@@ -28,8 +28,6 @@ class HistoryView : Subview
         private const string PushConfirmCancel = "Cancel";
         private const string CommitDetailsTitle = "Commit details";
         private const string ClearSelectionButton = "×";
-        private const string NoRepoTitle = "No Git repository found for this project";
-        private const string NoRepoDescription = "Initialize a Git repository to track changes and collaborate with others.";
         private const string PublishButton = "Publish";
         private const string FetchActionTitle = "Fetch Changes";
         private const string FetchButtonText = "Fetch";
@@ -116,12 +114,6 @@ public override void OnSelectionChange()
 
         public override void OnGUI()
         {
-            if (!HasRepository)
-            {
-                DoOfferToInitializeRepositoryGUI();
-                return;
-            }
-
             OnEmbeddedGUI();
         }
 
@@ -223,66 +215,6 @@ private void MaybeUpdateData()
             }
         }
 
-        private void DoOfferToInitializeRepositoryGUI()
-        {
-            var headerRect = EditorGUILayout.BeginHorizontal(Styles.HeaderBoxStyle);
-            {
-                GUILayout.Space(5);
-                GUILayout.BeginVertical(GUILayout.Width(16));
-                {
-                    GUILayout.Space(5);
-
-                    var iconRect = GUILayoutUtility.GetRect(new GUIContent(Styles.BigLogo), GUIStyle.none, GUILayout.Height(20), GUILayout.Width(20));
-                    iconRect.y = headerRect.center.y - (iconRect.height / 2);
-                    GUI.DrawTexture(iconRect, Styles.BigLogo, ScaleMode.ScaleToFit);
-
-                    GUILayout.Space(5);
-                }
-                GUILayout.EndVertical();
-
-                GUILayout.Space(5);
-
-                GUILayout.BeginVertical();
-                {
-                    var headerContent = new GUIContent(NoRepoTitle);
-                    var headerTitleRect = GUILayoutUtility.GetRect(headerContent, Styles.HeaderTitleStyle);
-                    headerTitleRect.y = headerRect.center.y - (headerTitleRect.height / 2);
-
-                    GUI.Label(headerTitleRect, headerContent, Styles.HeaderTitleStyle);
-                }
-                GUILayout.EndVertical();
-            }
-            EditorGUILayout.EndHorizontal();
-
-            GUILayout.BeginVertical(Styles.GenericBoxStyle);
-            {
-                GUILayout.FlexibleSpace();
-
-                GUILayout.Label(NoRepoDescription, Styles.CenteredLabel);
-
-                GUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();
-
-                EditorGUI.BeginDisabledGroup(isBusy);
-                {
-                    if (GUILayout.Button(Localization.InitializeRepositoryButtonText, "Button"))
-                    {
-                        isBusy = true;
-                        Manager.InitializeRepository()
-                            .FinallyInUI(() => isBusy = false)
-                            .Start();
-                    }
-                }
-                EditorGUI.EndDisabledGroup();
-
-                GUILayout.FlexibleSpace();
-                GUILayout.EndHorizontal();
-
-                GUILayout.FlexibleSpace();
-            }
-            GUILayout.EndVertical();
-        }
-
         public void OnEmbeddedGUI()
         {
             // History toolbar

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

@@ -0,0 +1,103 @@
+#pragma warning disable 649
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace GitHub.Unity
+{
+    [Serializable]
+    class InitProjectView : Subview
+    {
+        private const string NoRepoTitle = "No Git repository found for this project";
+        private const string NoRepoDescription = "Initialize a Git repository to track changes and collaborate with others.";
+
+        [SerializeField] private bool isBusy;
+        [SerializeField] private bool isPublished;
+
+        public override void OnDataUpdate()
+        {
+            base.OnDataUpdate();
+            MaybeUpdateData();
+        }
+
+        public override void OnRepositoryChanged(IRepository oldRepository)
+        {
+            base.OnRepositoryChanged(oldRepository);
+            Refresh();
+        }
+
+        public override void OnGUI()
+        {
+            var headerRect = EditorGUILayout.BeginHorizontal(Styles.HeaderBoxStyle);
+            {
+                GUILayout.Space(5);
+                GUILayout.BeginVertical(GUILayout.Width(16));
+                {
+                    GUILayout.Space(5);
+
+                    var iconRect = GUILayoutUtility.GetRect(new GUIContent(Styles.BigLogo), GUIStyle.none, GUILayout.Height(20), GUILayout.Width(20));
+                    iconRect.y = headerRect.center.y - (iconRect.height / 2);
+                    GUI.DrawTexture(iconRect, Styles.BigLogo, ScaleMode.ScaleToFit);
+
+                    GUILayout.Space(5);
+                }
+                GUILayout.EndVertical();
+
+                GUILayout.Space(5);
+
+                GUILayout.BeginVertical();
+                {
+                    var headerContent = new GUIContent(NoRepoTitle);
+                    var headerTitleRect = GUILayoutUtility.GetRect(headerContent, Styles.HeaderTitleStyle);
+                    headerTitleRect.y = headerRect.center.y - (headerTitleRect.height / 2);
+
+                    GUI.Label(headerTitleRect, headerContent, Styles.HeaderTitleStyle);
+                }
+                GUILayout.EndVertical();
+            }
+            EditorGUILayout.EndHorizontal();
+
+            GUILayout.BeginVertical(Styles.GenericBoxStyle);
+            {
+                GUILayout.FlexibleSpace();
+
+                GUILayout.Label(NoRepoDescription, Styles.CenteredLabel);
+
+                GUILayout.BeginHorizontal();
+                GUILayout.FlexibleSpace();
+
+                EditorGUI.BeginDisabledGroup(isBusy);
+                {
+                    if (GUILayout.Button(Localization.InitializeRepositoryButtonText, "Button"))
+                    {
+                        isBusy = true;
+                        Manager.InitializeRepository()
+                               .FinallyInUI(() => isBusy = false)
+                               .Start();
+                    }
+                }
+                EditorGUI.EndDisabledGroup();
+
+                GUILayout.FlexibleSpace();
+                GUILayout.EndHorizontal();
+
+                GUILayout.FlexibleSpace();
+            }
+            GUILayout.EndVertical();
+        }
+
+        private void MaybeUpdateData()
+        {
+            isPublished = Repository != null && Repository.CurrentRemote.HasValue;
+        }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
+    }
+}