Merge pull request #87 from github-for-unity/fixes/refactor-view

Refactoring BaseWindow and Subview to better handle initialization
github-for-unity · Jul 5, 2017 · e659480 · e659480
2 parents 9c57623 + e280096
commit e659480
Show file tree

Hide file tree

Showing 12 changed files with 167 additions and 153 deletions.
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -234,15 +234,13 @@ public void Dispose()
         public CancellationToken CancellationToken { get { return TaskManager.Token; } }
         public ITaskManager TaskManager { get; protected set; }
         public IGitClient GitClient { get; protected set; }
-
-
-        protected TaskScheduler UIScheduler { get; private set; }
-        protected SynchronizationContext SynchronizationContext { get; private set; }
-        protected IRepositoryManager RepositoryManager { get { return repositoryManager; } }
-
         public ISettings LocalSettings { get; protected set; }
         public ISettings SystemSettings { get; protected set; }
         public ISettings UserSettings { get; protected set; }
         public IUsageTracker UsageTracker { get; protected set; }
+
+        protected TaskScheduler UIScheduler { get; private set; }
+        protected SynchronizationContext SynchronizationContext { get; private set; }
+        protected IRepositoryManager RepositoryManager { get { return repositoryManager; } }
     }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationManager.cs
@@ -23,6 +23,7 @@ public ApplicationManager(IMainThreadSynchronizationContext synchronizationConte
 
         protected override void SetupMetrics()
         {
+
             new ActionTask(CancellationToken,
                     () => SetupMetrics(Environment.UnityVersion, ApplicationCache.Instance.FirstRun))
                 { Affinity = TaskAffinity.UI }
@@ -33,7 +34,7 @@ protected override void InitializeUI()
         {
             Logger.Trace("Restarted {0}", Environment.Repository);
             ProjectWindowInterface.Initialize(Environment.Repository);
-            var view = Window.GetView();
+            var view = Window.GetWindow();
             if (view != null)
                 view.Initialize(this);
         }

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs
@@ -11,8 +11,6 @@ namespace GitHub.Unity
     [InitializeOnLoad]
     class EntryPoint : ScriptableObject
     {
-        private static ApplicationManager appManager;
-
         // this may run on the loader thread if it's an appdomain restart
         static EntryPoint()
         {
@@ -69,6 +67,7 @@ private static bool ServerCertificateValidationCallback(object sender, X509Certi
             return true;
         }
 
+        private static ApplicationManager appManager;
         public static IApplicationManager ApplicationManager
         {
             get

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs
@@ -61,14 +61,14 @@ public override void InitializeView(IView parent)
             need2fa = busy = false;
         }
 
-        public override void OnShow()
+        public override void OnEnable()
         {
-            base.OnShow();
+            base.OnEnable();
         }
 
-        public override void OnHide()
+        public override void OnDisable()
         {
-            base.OnHide();
+            base.OnDisable();
         }
 
         public override void OnGUI()

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationWindow.cs
@@ -27,45 +27,45 @@ public static IView Open(Action<bool> onClose = null)
             return authWindow;
        }
 
-        public override void OnGUI()
+        public override void Initialize(IApplicationManager applicationManager)
         {
+            base.Initialize(applicationManager);
             if (authView == null)
-            {
-                CreateViews();
-            }
-            authView.OnGUI();
-        }
-
-        public override void Refresh()
-        {
-            authView.Refresh();
+                authView = new AuthenticationView();
+            authView.InitializeView(this);
         }
 
         public override void OnEnable()
         {
+            base.OnEnable();
+
             // Set window title
             titleContent = new GUIContent(Title, Styles.SmallLogo);
+            authView.OnEnable();
+        }
 
-            Utility.UnregisterReadyCallback(CreateViews);
-            Utility.RegisterReadyCallback(CreateViews);
-
-            Utility.UnregisterReadyCallback(ShowActiveView);
-            Utility.RegisterReadyCallback(ShowActiveView);
+        public override void OnDisable()
+        {
+            base.OnDisable();
+            authView.OnDisable();
         }
 
-        private void CreateViews()
+        public override void OnUI()
         {
-            if (authView == null)
-                authView = new AuthenticationView();
+            base.OnUI();
+            authView.OnGUI();
+        }
 
-            Initialize(EntryPoint.ApplicationManager);
-            authView.InitializeView(this);
+        public override void Refresh()
+        {
+            base.Refresh();
+            authView.Refresh();
         }
 
-        private void ShowActiveView()
+        public override void OnSelectionChange()
         {
-            authView.OnShow();
-            Refresh();
+            base.OnSelectionChange();
+            authView.OnSelectionChange();
         }
 
         public override void Finish(bool result)

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -44,9 +44,9 @@ public override void InitializeView(IView parent)
             targetMode = mode;
         }
 
-        public override void OnShow()
+        public override void OnEnable()
         {
-            base.OnShow();
+            base.OnEnable();
             if (Repository != null)
             {
                 Repository.OnLocalBranchListChanged += RunRefreshEmbeddedOnMainThread;
@@ -55,9 +55,9 @@ public override void OnShow()
             }
         }
 
-        public override void OnHide()
+        public override void OnDisable()
         {
-            base.OnHide();
+            base.OnDisable();
             if (Repository != null)
             {
                 Repository.OnLocalBranchListChanged -= RunRefreshEmbeddedOnMainThread;

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs
@@ -33,9 +33,9 @@ public override void InitializeView(IView parent)
             tree.InitializeView(this);
         }
 
-        public override void OnShow()
+        public override void OnEnable()
         {
-            base.OnShow();
+            base.OnEnable();
             if (Repository == null)
                 return;
 
@@ -44,9 +44,9 @@ public override void OnShow()
             Repository.Refresh();
         }
 
-        public override void OnHide()
+        public override void OnDisable()
         {
-            base.OnHide();
+            base.OnDisable();
             if (Repository == null)
                 return;
             Repository.OnRepositoryChanged -= RunStatusUpdateOnMainThread;

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/HistoryView.cs
@@ -59,19 +59,14 @@ class HistoryView : Subview
         [SerializeField] private List<GitLogEntry> history = new List<GitLogEntry>();
         [SerializeField] private bool isBusy;
 
-        public override void Initialize(IApplicationManager applicationManager)
+        public override void InitializeView(IView parent)
         {
-            base.Initialize(applicationManager);
+            base.InitializeView(parent);
+
             if (Manager != null)
             {
                 UpdateLog();
             }
-        }
-
-        public override void InitializeView(IView parent)
-        {
-            Logger.Trace("InitializeView(IView)");
-            base.InitializeView(parent);
 
             lastWidth = Position.width;
             selectionIndex = newSelectionIndex = -1;
@@ -86,9 +81,9 @@ public override void InitializeView(IView parent)
             }
         }
 
-        public override void OnShow()
+        public override void OnEnable()
         {
-            base.OnShow();
+            base.OnEnable();
             if (Repository != null)
             {
                 Repository.OnCommitChanged += UpdateLogOnMainThread;
@@ -97,9 +92,9 @@ public override void OnShow()
             UpdateLog();
         }
 
-        public override void OnHide()
+        public override void OnDisable()
         {
-            base.OnHide();
+            base.OnDisable();
             if (Repository != null)
             {
                 Repository.OnCommitChanged -= UpdateLogOnMainThread;

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/IView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/IView.cs
@@ -5,7 +5,8 @@ namespace GitHub.Unity
 {
     interface IView
     {
-        void Initialize(IApplicationManager applicationManager);
+        void OnEnable();
+        void OnDisable();
         void Refresh();
         void Redraw();
         Rect Position { get; }

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -119,9 +119,9 @@ private void Repository_OnActiveRemoteChanged(string remote)
             repositoryRemoteUrl = currentRemote.Value.Url;
         }
 
-        public override void OnShow()
+        public override void OnEnable()
         {
-            base.OnShow();
+            base.OnEnable();
             if (Repository == null)
                 return;
 
@@ -140,9 +140,9 @@ public override void OnShow()
             gitEmail = Repository.User.Email;
         }
 
-        public override void OnHide()
+        public override void OnDisable()
         {
-            base.OnHide();
+            base.OnDisable();
         }
 
         private void RunLocksUpdateOnMainThread(IEnumerable<GitLock> locks)