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

shana · web-flow · commit e659480c9c0e · 2017-07-05T18:00:24.000+02:00
Refactoring BaseWindow and Subview to better handle initialization
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)
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public ApplicationManager(IMainThreadSynchronizationContext synchronizationConte`
`23`	`23`
`24`	`24`	`protected override void SetupMetrics()`
`25`	`25`	`{`
	`26`	`+`
`26`	`27`	`new ActionTask(CancellationToken,`
`27`	`28`	`() => SetupMetrics(Environment.UnityVersion, ApplicationCache.Instance.FirstRun))`
`28`	`29`	`{ Affinity = TaskAffinity.UI }`
`@@ -33,7 +34,7 @@ protected override void InitializeUI()`
`33`	`34`	`{`
`34`	`35`	`Logger.Trace("Restarted {0}", Environment.Repository);`
`35`	`36`	`ProjectWindowInterface.Initialize(Environment.Repository);`
`36`		`- var view = Window.GetView();`
	`37`	`+ var view = Window.GetWindow();`
`37`	`38`	`if (view != null)`
`38`	`39`	`view.Initialize(this);`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ namespace GitHub.Unity`
`11`	`11`	`[InitializeOnLoad]`
`12`	`12`	`class EntryPoint : ScriptableObject`
`13`	`13`	`{`
`14`		`- private static ApplicationManager appManager;`
`15`		`-`
`16`	`14`	`// this may run on the loader thread if it's an appdomain restart`
`17`	`15`	`static EntryPoint()`
`18`	`16`	`{`
`@@ -69,6 +67,7 @@ private static bool ServerCertificateValidationCallback(object sender, X509Certi`
`69`	`67`	`return true;`
`70`	`68`	`}`
`71`	`69`
	`70`	`+ private static ApplicationManager appManager;`
`72`	`71`	`public static IApplicationManager ApplicationManager`
`73`	`72`	`{`
`74`	`73`	`get`
Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,14 @@ public override void InitializeView(IView parent)`
`61`	`61`	`need2fa = busy = false;`
`62`	`62`	`}`
`63`	`63`
`64`		`- public override void OnShow()`
	`64`	`+ public override void OnEnable()`
`65`	`65`	`{`
`66`		`- base.OnShow();`
	`66`	`+ base.OnEnable();`
`67`	`67`	`}`
`68`	`68`
`69`		`- public override void OnHide()`
	`69`	`+ public override void OnDisable()`
`70`	`70`	`{`
`71`		`- base.OnHide();`
	`71`	`+ base.OnDisable();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public override void OnGUI()`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ public override void InitializeView(IView parent)`
`44`	`44`	`targetMode = mode;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public override void OnShow()`
	`47`	`+ public override void OnEnable()`
`48`	`48`	`{`
`49`		`- base.OnShow();`
	`49`	`+ base.OnEnable();`
`50`	`50`	`if (Repository != null)`
`51`	`51`	`{`
`52`	`52`	`Repository.OnLocalBranchListChanged += RunRefreshEmbeddedOnMainThread;`
`@@ -55,9 +55,9 @@ public override void OnShow()`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public override void OnHide()`
	`58`	`+ public override void OnDisable()`
`59`	`59`	`{`
`60`		`- base.OnHide();`
	`60`	`+ base.OnDisable();`
`61`	`61`	`if (Repository != null)`
`62`	`62`	`{`
`63`	`63`	`Repository.OnLocalBranchListChanged -= RunRefreshEmbeddedOnMainThread;`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public override void InitializeView(IView parent)`
`33`	`33`	`tree.InitializeView(this);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public override void OnShow()`
	`36`	`+ public override void OnEnable()`
`37`	`37`	`{`
`38`		`- base.OnShow();`
	`38`	`+ base.OnEnable();`
`39`	`39`	`if (Repository == null)`
`40`	`40`	`return;`
`41`	`41`
`@@ -44,9 +44,9 @@ public override void OnShow()`
`44`	`44`	`Repository.Refresh();`
`45`	`45`	`}`
`46`	`46`
`47`		`- public override void OnHide()`
	`47`	`+ public override void OnDisable()`
`48`	`48`	`{`
`49`		`- base.OnHide();`
	`49`	`+ base.OnDisable();`
`50`	`50`	`if (Repository == null)`
`51`	`51`	`return;`
`52`	`52`	`Repository.OnRepositoryChanged -= RunStatusUpdateOnMainThread;`
Original file line number	Diff line number	Diff line change
`@@ -59,19 +59,14 @@ class HistoryView : Subview`
`59`	`59`	`[SerializeField] private List<GitLogEntry> history = new List<GitLogEntry>();`
`60`	`60`	`[SerializeField] private bool isBusy;`
`61`	`61`
`62`		`- public override void Initialize(IApplicationManager applicationManager)`
	`62`	`+ public override void InitializeView(IView parent)`
`63`	`63`	`{`
`64`		`- base.Initialize(applicationManager);`
	`64`	`+ base.InitializeView(parent);`
	`65`	`+`
`65`	`66`	`if (Manager != null)`
`66`	`67`	`{`
`67`	`68`	`UpdateLog();`
`68`	`69`	`}`
`69`		`- }`
`70`		`-`
`71`		`- public override void InitializeView(IView parent)`
`72`		`- {`
`73`		`- Logger.Trace("InitializeView(IView)");`
`74`		`- base.InitializeView(parent);`
`75`	`70`
`76`	`71`	`lastWidth = Position.width;`
`77`	`72`	`selectionIndex = newSelectionIndex = -1;`
`@@ -86,9 +81,9 @@ public override void InitializeView(IView parent)`
`86`	`81`	`}`
`87`	`82`	`}`
`88`	`83`
`89`		`- public override void OnShow()`
	`84`	`+ public override void OnEnable()`
`90`	`85`	`{`
`91`		`- base.OnShow();`
	`86`	`+ base.OnEnable();`
`92`	`87`	`if (Repository != null)`
`93`	`88`	`{`
`94`	`89`	`Repository.OnCommitChanged += UpdateLogOnMainThread;`
`@@ -97,9 +92,9 @@ public override void OnShow()`
`97`	`92`	`UpdateLog();`
`98`	`93`	`}`
`99`	`94`
`100`		`- public override void OnHide()`
	`95`	`+ public override void OnDisable()`
`101`	`96`	`{`
`102`		`- base.OnHide();`
	`97`	`+ base.OnDisable();`
`103`	`98`	`if (Repository != null)`
`104`	`99`	`{`
`105`	`100`	`Repository.OnCommitChanged -= UpdateLogOnMainThread;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ namespace GitHub.Unity`
`5`	`5`	`{`
`6`	`6`	`interface IView`
`7`	`7`	`{`
`8`		`- void Initialize(IApplicationManager applicationManager);`
	`8`	`+ void OnEnable();`
	`9`	`+ void OnDisable();`
`9`	`10`	`void Refresh();`
`10`	`11`	`void Redraw();`
`11`	`12`	`Rect Position { get; }`
Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,9 @@ private void Repository_OnActiveRemoteChanged(string remote)`
`119`	`119`	`repositoryRemoteUrl = currentRemote.Value.Url;`
`120`	`120`	`}`
`121`	`121`
`122`		`- public override void OnShow()`
	`122`	`+ public override void OnEnable()`
`123`	`123`	`{`
`124`		`- base.OnShow();`
	`124`	`+ base.OnEnable();`
`125`	`125`	`if (Repository == null)`
`126`	`126`	`return;`
`127`	`127`
`@@ -140,9 +140,9 @@ public override void OnShow()`
`140`	`140`	`gitEmail = Repository.User.Email;`
`141`	`141`	`}`
`142`	`142`
`143`		`- public override void OnHide()`
	`143`	`+ public override void OnDisable()`
`144`	`144`	`{`
`145`		`- base.OnHide();`
	`145`	`+ base.OnDisable();`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`private void RunLocksUpdateOnMainThread(IEnumerable<GitLock> locks)`