Merge pull request #28 from spoiledcat/fixes/misc

Hierarchy Icons feature, Project icons visibility toggle, difftool support, Settings UI cleanup, NRE fix in the settings view.

src/com.spoiledcat.git.api/Api/Application/ApplicationConfiguration.cs

@@ -1,5 +1,3 @@
-using System.Reflection;
-
 namespace Unity.VersionControl.Git
 {
     public static class ApplicationConfiguration
@@ -8,5 +6,29 @@ public static class ApplicationConfiguration
         public const int DefaultGitTimeout = 5000;
         public static int WebTimeout { get; set; } = DefaultWebTimeout;
         public static int GitTimeout { get; set; } = DefaultGitTimeout;
+        public static bool HierarchyIconsEnabled { get; set; } = true;
+        public static bool HierarchyIconsIndented { get; set; } = false;
+        public static int HierarchyIconsOffsetRight { get; set; } = 0;
+        public static int HierarchyIconsOffsetLeft { get; set; } = 0;
+        public static HierarchyIconAlignment HierarchyIconsAlignment { get; set; } = HierarchyIconAlignment.Right;
+        public static bool ProjectIconsEnabled { get; set; } = true;
+
+        public static void Initialize(ISettings settings)
+        {
+            WebTimeout = settings.Get(Constants.WebTimeoutKey, WebTimeout);
+            GitTimeout = settings.Get(Constants.GitTimeoutKey, GitTimeout);
+            HierarchyIconsEnabled = settings.Get(Constants.HierarchyIconsEnabledKey, HierarchyIconsEnabled);
+            HierarchyIconsIndented = settings.Get(Constants.HierarchyIconsIndentedKey, HierarchyIconsIndented);
+            HierarchyIconsOffsetRight = settings.Get(Constants.HierarchyIconsOffsetRightKey, HierarchyIconsOffsetRight);
+            HierarchyIconsOffsetLeft = settings.Get(Constants.HierarchyIconsOffsetLeftKey, HierarchyIconsOffsetLeft);
+            HierarchyIconsAlignment = (HierarchyIconAlignment) settings.Get(Constants.HierarchyIconsAlignmentKey, (int)HierarchyIconsAlignment);
+            ProjectIconsEnabled = settings.Get(Constants.ProjectIconsEnabledKey, ProjectIconsEnabled);
+        }
+
+        public enum HierarchyIconAlignment
+        {
+            Right = 0,
+            Left = 1,
+        }
     }
 }

src/com.spoiledcat.git.api/Api/Application/ApplicationManagerBase.cs

@@ -35,8 +35,7 @@ public ApplicationManagerBase(SynchronizationContext synchronizationContext, IGi
         public void Initialize()
         {
             LogHelper.TracingEnabled = UserSettings.Get(Constants.TraceLoggingKey, false);
-            ApplicationConfiguration.WebTimeout = UserSettings.Get(Constants.WebTimeoutKey, ApplicationConfiguration.WebTimeout);
-            ApplicationConfiguration.GitTimeout = UserSettings.Get(Constants.GitTimeoutKey, ApplicationConfiguration.GitTimeout);
+            ApplicationConfiguration.Initialize(UserSettings);
             progress.OnProgress += progressReporter.UpdateProgress;
         }
 

src/com.spoiledcat.git.api/Api/Helpers/Constants.cs

@@ -4,13 +4,16 @@ namespace Unity.VersionControl.Git
 {
     public static class Constants
     {
-        public const string GuidKey = "Guid";
-        public const string MetricsKey = "MetricsEnabled";
-        public const string UsageFile = "metrics.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
         public const string WebTimeoutKey = "WebTimeout";
         public const string GitTimeoutKey = "GitTimeout";
+        public const string HierarchyIconsEnabledKey = "HierarchyIconsEnabled";
+        public const string HierarchyIconsIndentedKey = "HierarchyIconsIndented";
+        public const string HierarchyIconsOffsetRightKey = "HierarchyIconsOffsetRight";
+        public const string HierarchyIconsOffsetLeftKey = "HierarchyIconsOffsetLeft";
+        public const string HierarchyIconsAlignmentKey = "HierarchyIconsAlignment";
+        public const string ProjectIconsEnabledKey = "ProjectIconsEnabled";
         public const string Iso8601Format = @"yyyy-MM-dd\THH\:mm\:ss.fffzzz";
         public const string Iso8601FormatZ = @"yyyy-MM-dd\THH\:mm\:ss\Z";
         public static readonly string[] Iso8601Formats = {

src/com.spoiledcat.git.api/Api/Platform/Settings.cs

@@ -172,9 +172,8 @@ protected virtual void LoadFromCache(string path)
                 if (c != null)
                 {
                     // upgrade from old format
-                    if (c.ContainsKey("GitHubUnity"))
+                    if (c.TryGetValue("GitHubUnity", out var oldRoot))
                     {
-                        var oldRoot = c["GitHubUnity"];
                         cacheData = oldRoot.FromObject<Dictionary<string, object>>();
                         SaveToCache(path);
                     }

src/com.spoiledcat.git.ui/Editor/ApplicationManager.cs

@@ -2,8 +2,8 @@
 using System.Reflection;
 using System.Threading;
 using Unity.Editor.Tasks;
+using Unity.VersionControl.Git.UI;
 using UnityEditor;
-using UnityEngine;
 using UnityEngine.Events;
 
 namespace Unity.VersionControl.Git
@@ -34,6 +34,7 @@ public override void InitializeUI()
             isBusy = false;
             LfsLocksModificationProcessor.Initialize(Environment, Platform);
             ProjectWindowInterface.Initialize(this);
+            HierarchyWindowInterface.Initialize();
             var window = Window.GetWindow();
             if (window != null)
                 window.InitializeWindow(this);

src/com.spoiledcat.git.ui/Editor/Misc/Styles.cs

@@ -3,7 +3,7 @@
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
 
-namespace Unity.VersionControl.Git
+namespace Unity.VersionControl.Git.UI
 {
     class Styles
     {
@@ -30,8 +30,6 @@ class Styles
                            CommitAreaPadding = 5f,
                            PublishViewSpacingHeight = 5f,
                            MinCommitTreePadding = 20f,
-                           FoldoutWidth = 11f,
-                           FoldoutIndentation = -2f,
                            TreePadding = 12f,
                            TreeIndentation = 12f,
                            TreeRootIndentation = -5f,
@@ -51,6 +49,11 @@ class Styles
                            GitIgnoreRulesFileRatio = .3f,
                            GitIgnoreRulesLineRatio = .5f;
 
+        const int
+            FoldoutContentRightPadding = 6,
+            FoldoutContentBottomPadding = 4,
+            FoldoutIndentation = 15;
+
         public const int HalfSpacing = (int)(BaseSpacing / 2);
 
         private const string WarningLabel = "<b>Warning:</b> {0}";
@@ -752,7 +755,7 @@ public static GUIStyle BoldCenteredLabel
                 return boldCenteredLabel;
             }
         }
-        
+
         public static GUIStyle CommitDescriptionFieldStyle
         {
             get
@@ -1168,6 +1171,86 @@ public static GUIStyle LockMetaDataStyle
             }
         }
 
+        private static GUIStyle indentedBox;
+        public static GUIStyle IndentedBox
+        {
+            get
+            {
+                if (indentedBox == null)
+                {
+                    indentedBox = new GUIStyle
+                    {
+                        padding = new RectOffset(FoldoutIndentation, 0, 0, 0),
+                    };
+                }
+
+                return indentedBox;
+            }
+        }
+
+        private static GUIStyle foldoutContent;
+        public static GUIStyle FoldoutContent
+        {
+            get
+            {
+                if (foldoutContent == null)
+                {
+                    foldoutContent = new GUIStyle
+                    {
+                        padding = new RectOffset(FoldoutIndentation, FoldoutContentRightPadding, 0, FoldoutContentBottomPadding),
+                    };
+                }
+
+                return foldoutContent;
+            }
+        }
+
         private static string GetIconName(string name) => Utility.IsDarkTheme ? name + "-light" : name;
     }
+
+    public static partial class Controls
+    {
+        public static bool Foldout(bool value, string label)
+        {
+            EditorGUILayout.BeginVertical(EditorStyles.helpBox);
+            EditorGUILayout.BeginHorizontal();
+
+            var ret = EditorGUILayout.Toggle(value, Styles.Foldout);
+
+            EditorGUILayout.EndHorizontal();
+            EditorGUILayout.EndVertical();
+
+            var rect = GUILayoutUtility.GetLastRect();
+            rect.x += 20;
+            rect.width -= 20;
+
+            EditorGUI.LabelField(rect, label, Styles.BoldLabel);
+
+            return ret;
+        }
+
+        public static bool FoldoutScope(bool open, string title, Action draw)
+        {
+            var ret = Foldout(open, title);
+
+            if (ret)
+            {
+                GUILayout.BeginVertical(Styles.FoldoutContent, GUILayout.ExpandWidth(true));
+                draw();
+                GUILayout.EndVertical();
+            }
+
+            return ret;
+        }
+
+        public static void DoControl<T>(T val, Func<T, T> draw, Action<T> update)
+        {
+            EditorGUI.BeginChangeCheck();
+            T updated = draw(val);
+            if (EditorGUI.EndChangeCheck())
+            {
+                update(updated);
+            }
+        }
+    }
 }

src/com.spoiledcat.git.ui/Editor/Misc/UnityExtensions.cs

@@ -0,0 +1,10 @@
+using UnityObject=UnityEngine.Object;
+
+namespace Unity.VersionControl.Git.Extensions
+{
+	public static class UnityExtensions
+	{
+
+		public static T Ref<T>(this T obj) where T : UnityObject => obj != null ? obj : null;
+	}
+}

src/com.spoiledcat.git.ui/Editor/Misc/Utility.cs

@@ -6,6 +6,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using Unity.Editor.Tasks.Logging;
+using Unity.VersionControl.Git.UI;
 
 namespace Unity.VersionControl.Git
 {
@@ -31,12 +32,12 @@ public static Texture2D GetIcon(string filename, string filename2x = null, bool
 
             if (!filename.EndsWith(".png"))
                 filename += ".png";
-                
+
             var key = invertColors ? "dark_" + filename : "light_" + filename;
 
-            if (iconCache.ContainsKey(key))
+            if (iconCache.TryGetValue(key, out var icon))
             {
-                return iconCache[key];
+                return icon;
             }
 
             Texture2D texture2D;

src/com.spoiledcat.git.ui/Editor/UI/BaseWindow.cs

@@ -1,4 +1,3 @@
-using Unity.VersionControl.Git;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +6,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.VersionControl.Git
+namespace Unity.VersionControl.Git.UI
 {
     public abstract class BaseWindow :  EditorWindow, IView
     {

src/com.spoiledcat.git.ui/Editor/UI/BranchesView.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using SpoiledCat.Git;
@@ -8,7 +7,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.VersionControl.Git
+namespace Unity.VersionControl.Git.UI
 {
     [Serializable]
     class BranchesView : Subview

src/com.spoiledcat.git.ui/Editor/UI/ChangesTreeControl.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.VersionControl.Git.UI;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;

src/com.spoiledcat.git.ui/Editor/UI/ChangesView.cs

@@ -7,7 +7,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.VersionControl.Git
+namespace Unity.VersionControl.Git.UI
 {
     using IO;
 
@@ -171,7 +171,7 @@ private void OnTreeGUI(Rect rect)
 
                 var treeRenderRect = treeChanges.Render(rect, treeScroll,
                     node => { },
-                    node => { },
+                    ShowDiff,
                     node => {
                         var menu = CreateContextMenu(node);
                         menu.ShowAsContext();
@@ -188,31 +188,7 @@ private GenericMenu CreateContextMenu(ChangesTreeNode node)
         {
             var genericMenu = new GenericMenu();
 
-            genericMenu.AddItem(new GUIContent("Show Diff"), false, () =>
-            {
-                ITask<SPath[]> calculateDiff = null;
-                if (node.IsFolder)
-                {
-                    calculateDiff = CalculateFolderDiff(node);
-                }
-                else
-                {
-                    calculateDiff = CalculateFileDiff(node);
-                }
-                calculateDiff.FinallyInUI((s, ex, leftRight) =>
-                {
-                    if (s)
-                        EditorUtility.InvokeDiffTool(
-                            leftRight[0].IsInitialized ? leftRight[0].FileName : null,
-                            leftRight[0].IsInitialized ? leftRight[0].MakeAbsolute().ToString() : null,
-                            leftRight[1].IsInitialized ? leftRight[1].FileName : null,
-                            leftRight[1].IsInitialized ? leftRight[1].MakeAbsolute().ToString() : null,
-                            null, null);
-                    else
-                        ex.Rethrow();
-                })
-                .Start();
-            });
+            genericMenu.AddItem(new GUIContent("Show Diff"), false, () => ShowDiff(node));
 
             genericMenu.AddSeparator("");
 
@@ -250,6 +226,29 @@ private GenericMenu CreateContextMenu(ChangesTreeNode node)
             return genericMenu;
         }
 
+        private void ShowDiff(ChangesTreeNode node)
+        {
+            ITask<SPath[]> calculateDiff = null;
+            if (node.IsFolder)
+            {
+                calculateDiff = CalculateFolderDiff(node);
+            }
+            else
+            {
+                calculateDiff = CalculateFileDiff(node);
+            }
+
+            calculateDiff.FinallyInUI((s, ex, leftRight) => {
+                if (s)
+                    EditorUtility.InvokeDiffTool(leftRight[0].IsInitialized ? leftRight[0].FileName : null,
+                        leftRight[0].IsInitialized ? leftRight[0].MakeAbsolute().ToString() : null,
+                        leftRight[1].IsInitialized ? leftRight[1].FileName : null,
+                        leftRight[1].IsInitialized ? leftRight[1].MakeAbsolute().ToString() : null, null, null);
+                else
+                    ex.Rethrow();
+            }).Start();
+        }
+
         private ITask<SPath[]> CalculateFolderDiff(ChangesTreeNode node)
         {
             var rightFile = node.Path.ToSPath();

src/com.spoiledcat.git.ui/Editor/UI/FileHistoryWindow.cs

@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.VersionControl.Git
+namespace Unity.VersionControl.Git.UI
 {
     using IO;