Merge pull request #261 from github-for-unity/fixes/initialize-view-with-configuration

Adding functionality to configure git exec, name and email before project init

Author: shana

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

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using UnityEditor;
 using UnityEngine;
 
@@ -38,7 +34,6 @@ class GitPathView : Subview
         public override void OnEnable()
         {
             base.OnEnable();
-
             gitExecHasChanged = true;
         }
 

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

@@ -1,11 +1,6 @@
-#pragma warning disable 649
-
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace GitHub.Unity
 {
@@ -14,20 +9,24 @@ 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 UserSettingsView userSettingsView = new UserSettingsView();
+        [SerializeField] private GitPathView gitPathView = new GitPathView();
         [SerializeField] private bool isBusy;
-        [SerializeField] private bool isPublished;
 
-        public override void OnDataUpdate()
+        public override void InitializeView(IView parent)
         {
-            base.OnDataUpdate();
-            MaybeUpdateData();
+            base.InitializeView(parent);
+            userSettingsView.InitializeView(this);
+            gitPathView.InitializeView(this);
         }
 
-        public override void OnRepositoryChanged(IRepository oldRepository)
+        public override void OnDataUpdate()
         {
-            base.OnRepositoryChanged(oldRepository);
-            Refresh();
+            base.OnDataUpdate();
+
+            userSettingsView.OnDataUpdate();
+            gitPathView.OnDataUpdate();
         }
 
         public override void OnGUI()
@@ -61,6 +60,10 @@ public override void OnGUI()
             }
             EditorGUILayout.EndHorizontal();
 
+            gitPathView.OnGUI();
+
+            userSettingsView.OnGUI();
+
             GUILayout.BeginVertical(Styles.GenericBoxStyle);
             {
                 GUILayout.FlexibleSpace();
@@ -70,7 +73,7 @@ public override void OnGUI()
                 GUILayout.BeginHorizontal();
                 GUILayout.FlexibleSpace();
 
-                EditorGUI.BeginDisabledGroup(isBusy);
+                EditorGUI.BeginDisabledGroup(IsBusy);
                 {
                     if (GUILayout.Button(Localization.InitializeRepositoryButtonText, "Button"))
                     {
@@ -90,14 +93,9 @@ public override void OnGUI()
             GUILayout.EndVertical();
         }
 
-        private void MaybeUpdateData()
-        {
-            isPublished = Repository != null && Repository.CurrentRemote.HasValue;
-        }
-
         public override bool IsBusy
         {
-            get { return isBusy; }
+            get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; }
         }
     }
 }

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

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using UnityEditor;
 using UnityEngine;
 
@@ -21,7 +17,6 @@ class UserSettingsView : Subview
 
         [SerializeField] private string gitName;
         [SerializeField] private string gitEmail;
-
         [SerializeField] private string newGitName;
         [SerializeField] private string newGitEmail;
         [SerializeField] private User cachedUser;
@@ -32,13 +27,6 @@ public override void OnDataUpdate()
             MaybeUpdateData();
         }
 
-        public override void OnRepositoryChanged(IRepository oldRepository)
-        {
-            base.OnRepositoryChanged(oldRepository);
-
-            Refresh();
-        }
-
         public override void OnGUI()
         {
             GUILayout.Label(GitConfigTitle, EditorStyles.boldLabel);
@@ -108,11 +96,6 @@ public override void OnGUI()
             EditorGUI.EndDisabledGroup();
         }
 
-        public override bool IsBusy
-        {
-            get { return isBusy; }
-        }
-
         private void MaybeUpdateData()
         {
             if (Repository == null)
@@ -154,5 +137,10 @@ private void MaybeUpdateData()
             newGitName = gitName = Repository.User.Name;
             newGitEmail = gitEmail = Repository.User.Email;
         }
+
+        public override bool IsBusy
+        {
+            get { return isBusy; }
+        }
     }
 }