Changing popup button functionality to display an error label instead

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -53,6 +53,7 @@ class Styles
 
         private static GUIStyle label,
                                 boldLabel,
+                                centeredErrorLabel,
                                 errorLabel,
                                 deletedFileLabel,
                                 longMessageStyle,
@@ -337,6 +338,22 @@ public static GUIStyle ErrorLabel
             }
         }
 
+        public static GUIStyle CenteredErrorLabel
+        {
+            get
+            {
+                if (centeredErrorLabel == null)
+                {
+                    centeredErrorLabel = new GUIStyle(EditorStyles.label);
+                    centeredErrorLabel.alignment = TextAnchor.MiddleCenter;
+                    centeredErrorLabel.name = "CenteredErrorLabel";
+                    centeredErrorLabel.wordWrap = true;
+                    centeredErrorLabel.normal.textColor = Color.red;
+                }
+                return centeredErrorLabel;
+            }
+        }
+
         public static GUIStyle LongMessageStyle
         {
             get

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

@@ -9,10 +9,12 @@ 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.";
+        private const string NoUserOrEmailError = "Name and Email must be configured in Settings";
 
         [SerializeField] private bool isBusy;
         [SerializeField] private bool isUserDataPresent = true;
 
+        [NonSerialized] private string errorMessage;
         [NonSerialized] private bool userDataHasChanged;
 
         public override void InitializeView(IView parent)
@@ -81,25 +83,6 @@ public override void OnGUI()
 
             GUILayout.BeginVertical(Styles.GenericBoxStyle);
             {
-                if (!isUserDataPresent)
-                {
-                    GUILayout.FlexibleSpace();
-
-                    EditorGUI.BeginDisabledGroup(isBusy);
-                    {
-                        if (GUILayout.Button("Finish Git Configuration", "Button"))
-                        {
-                            PopupWindow.Open(PopupWindow.PopupViewType.UserSettingsView, completed => {
-                                if (completed)
-                                {
-                                    userDataHasChanged = true;
-                                }
-                            });
-                        }
-                    }
-                    EditorGUI.EndDisabledGroup();
-                }
-
                 GUILayout.FlexibleSpace();
 
                 GUILayout.Label(NoRepoDescription, Styles.CenteredLabel);
@@ -122,11 +105,26 @@ public override void OnGUI()
                 GUILayout.FlexibleSpace();
                 GUILayout.EndHorizontal();
 
+                ShowErrorMessage();
+
                 GUILayout.FlexibleSpace();
             }
             GUILayout.EndVertical();
         }
 
+        private void ShowErrorMessage()
+        {
+            if (errorMessage != null)
+            {
+                GUILayout.Space(Styles.BaseSpacing);
+                GUILayout.BeginHorizontal();
+                {
+                    GUILayout.Label(errorMessage, Styles.CenteredErrorLabel);
+                }
+                GUILayout.EndHorizontal();
+            }
+        }
+
         private void MaybeUpdateData()
         {
             if (userDataHasChanged)
@@ -160,6 +158,7 @@ private void CheckForUser()
 
                 isBusy = false;
                 isUserDataPresent = success && !String.IsNullOrEmpty(username) && !String.IsNullOrEmpty(email);
+                errorMessage = isUserDataPresent ? null : NoUserOrEmailError;
 
                 Logger.Trace("Finally: {0}", isUserDataPresent);
 

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

@@ -12,13 +12,11 @@ public enum PopupViewType
             None,
             PublishView,
             AuthenticationView,
-            UserSettingsView
         }
 
         [SerializeField] private PopupViewType activeViewType;
 
         [SerializeField] private AuthenticationView authenticationView;
-        [SerializeField] private UserSettingsView userSettingsView;
         [SerializeField] private PublishView publishView;
         [SerializeField] private LoadingView loadingView;
 
@@ -54,12 +52,10 @@ public override void Initialize(IApplicationManager applicationManager)
         {
             base.Initialize(applicationManager);
 
-            userSettingsView = userSettingsView ?? new UserSettingsView();
             publishView = publishView ?? new PublishView();
             authenticationView = authenticationView ?? new AuthenticationView();
             loadingView = loadingView ?? new LoadingView();
 
-            userSettingsView.InitializeView(this);
             publishView.InitializeView(this);
             authenticationView.InitializeView(this);
             loadingView.InitializeView(this);
@@ -127,8 +123,6 @@ private Subview ActiveView
                         return publishView;
                     case PopupViewType.AuthenticationView:
                         return authenticationView;
-                    case PopupViewType.UserSettingsView:
-                        return userSettingsView;
                     default:
                         return loadingView;
                 }