Merge pull request #553 from github-for-unity/enhancements/window-loading-view

Window loading view

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs

@@ -40,10 +40,17 @@ private static void Initialize()
                 var oldLogPath = logPath.Parent.Combine(logPath.FileNameWithoutExtension + "-old" + logPath.ExtensionWithDot);
                 try
                 {
-                    oldLogPath.DeleteIfExists();
-                    if (logPath.FileExists())
+                    var shouldRotate = true;
+#if DEVELOPER_BUILD
+                    shouldRotate = new FileInfo(logPath).Length > 10 * 1024 * 1024;
+#endif
+                    if (shouldRotate)
                     {
-                        logPath.Move(oldLogPath);
+                        oldLogPath.DeleteIfExists();
+                        if (logPath.FileExists())
+                        {
+                            logPath.Move(oldLogPath);
+                        }
                     }
                 }
                 catch (Exception ex)

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

@@ -1,30 +1,37 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Octokit;
-using Rackspace.Threading;
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
 namespace GitHub.Unity
 {
     class LoadingView : Subview
     {
-        private static readonly Vector2 viewSize = new Vector2(300, 250);
+        private static readonly Vector2 MinViewSize = 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;
+            Size = MinViewSize;
         }
 
         public override void OnGUI()
-        {}
+        {
+            GUILayout.BeginVertical();
+            {
+                GUILayout.FlexibleSpace();
+                GUILayout.BeginHorizontal();
+                {
+                    GUILayout.FlexibleSpace();
+                    GUILayout.Label(WindowTitle);
+                    GUILayout.FlexibleSpace();
+                }
+                GUILayout.EndHorizontal();
+                GUILayout.FlexibleSpace();
+            }
+            GUILayout.EndVertical();
+        }
 
         public override bool IsBusy
         {

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

@@ -23,9 +23,10 @@ class Window : BaseWindow
         private const string Window_RepoBranchTooltip = "Active branch";
 
         [NonSerialized] private double notificationClearTime = -1;
-        [SerializeField] private SubTab changeTab = SubTab.History;
-        [SerializeField] private SubTab activeTab = SubTab.History;
+        [SerializeField] private SubTab changeTab = SubTab.Loading;
+        [SerializeField] private SubTab activeTab = SubTab.Loading;
         [SerializeField] private InitProjectView initProjectView = new InitProjectView();
+        [SerializeField] private LoadingView loadingView = new LoadingView();
         [SerializeField] private BranchesView branchesView = new BranchesView();
         [SerializeField] private ChangesView changesView = new ChangesView();
         [SerializeField] private HistoryView historyView = new HistoryView();
@@ -39,6 +40,7 @@ class Window : BaseWindow
 
         [SerializeField] private CacheUpdateEvent lastCurrentBranchAndRemoteChangedEvent;
         [NonSerialized] private bool currentBranchAndRemoteHasUpdate;
+        [NonSerialized] private bool gitExecutableIsSet;
 
         [MenuItem(LaunchMenu)]
         public static void Window_GitHub()
@@ -84,9 +86,20 @@ public override void Initialize(IApplicationManager applicationManager)
         {
             base.Initialize(applicationManager);
 
-            if (!HasRepository && activeTab != SubTab.InitProject && activeTab != SubTab.Settings)
-                changeTab = activeTab = SubTab.InitProject;
+            gitExecutableIsSet = !string.IsNullOrEmpty(Environment.GitExecutablePath);
+            if (gitExecutableIsSet)
+            {
+                if (!HasRepository)
+                {
+                    if (activeTab == SubTab.Loading)
+                    {
+                        Logger.Trace("Initialze set all tabs to InitProject");
+                        changeTab = activeTab = SubTab.InitProject;
+                    }
+                }
+            }
 
+            LoadingView.InitializeView(this);
             HistoryView.InitializeView(this);
             ChangesView.InitializeView(this);
             BranchesView.InitializeView(this);
@@ -139,10 +152,28 @@ public override void OnRepositoryChanged(IRepository oldRepository)
             DetachHandlers(oldRepository);
             AttachHandlers(Repository);
 
-            if (Repository != null && activeTab == SubTab.InitProject)
+            if (gitExecutableIsSet)
             {
-                changeTab = SubTab.History;
-                UpdateActiveTab();
+                if (HasRepository)
+                {
+                    if (activeTab == SubTab.InitProject)
+                    {
+                        Logger.Trace("OnRepositoryChanged set changeTab to History");
+
+                        changeTab = SubTab.History;
+                        UpdateActiveTab();
+                    }
+                }
+                else
+                {
+                    if (activeTab == SubTab.Loading)
+                    {
+                        Logger.Trace("OnRepositoryChanged set changeTab to InitProject");
+
+                        changeTab = SubTab.InitProject;
+                        UpdateActiveTab();
+                    }
+                }
             }
         }
 
@@ -165,12 +196,15 @@ public override void OnUI()
         {
             base.OnUI();
 
-            if (HasRepository)
-            {
-                DoHeaderGUI();
-            }
+            if(gitExecutableIsSet)
+            { 
+                if (HasRepository)
+                {
+                    DoHeaderGUI();
+                }
 
-            DoToolbarGUI();
+                DoToolbarGUI();
+            }
 
             // GUI for the active tab
             if (ActiveView != null)
@@ -370,6 +404,7 @@ private void SwitchView(Subview fromView, Subview toView)
 
             if (fromView != null)
                 fromView.OnDisable();
+
             toView.OnEnable();
             toView.OnDataUpdate();
 
@@ -442,6 +477,8 @@ private Subview ToView(SubTab tab)
         {
             switch (tab)
             {
+                case SubTab.Loading:
+                    return loadingView;
                 case SubTab.InitProject:
                     return initProjectView;
                 case SubTab.History:
@@ -457,6 +494,11 @@ private Subview ToView(SubTab tab)
             }
         }
 
+        public LoadingView LoadingView
+        {
+            get { return loadingView; }
+        }
+
         public HistoryView HistoryView
         {
             get { return historyView; }
@@ -495,6 +537,7 @@ public override bool IsBusy
         private enum SubTab
         {
             None,
+            Loading,
             InitProject,
             History,
             Changes,