Fix icon colors on the dark theme

Author: shana

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

@@ -806,7 +806,7 @@ public static Texture2D ActiveBranchIcon
         {
             get
             {
-                return Utility.GetIcon("current-branch-indicator.png", "current-branch-indicator@2x.png");
+                return Utility.GetIcon("current-branch-indicator.png", "current-branch-indicator@2x.png", Utility.IsDarkTheme);
             }
         }
 
@@ -846,15 +846,15 @@ public static Texture2D SmallLogo
         {
             get
             {
-                return  Utility.GetIcon("small-logo.png");
+                return Utility.IsDarkTheme ? Utility.GetIcon("small-logo-light.png", "small-logo-light@2x.png") : Utility.GetIcon("small-logo.png", "small-logo@2x.png");
             }
         }
 
         public static Texture2D BigLogo
         {
             get
             {
-                return Utility.IsDarkTheme ? Utility.GetIcon("big-logo-light.png") : Utility.GetIcon("big-logo.png");
+                return Utility.IsDarkTheme ? Utility.GetIcon("big-logo-light.png", "big-logo-light@2x.png") : Utility.GetIcon("big-logo.png", "big-logo@2x.png");
             }
         }
 
@@ -870,15 +870,15 @@ public static Texture2D DotIcon
         {
             get
             {
-                return Utility.GetIcon("dot.png", "dot@2x.png");
+                return Utility.GetIcon("dot.png", "dot@2x.png", Utility.IsDarkTheme);
             }
         }
 
         public static Texture2D LocalCommitIcon
         {
             get
             {
-                return Utility.GetIcon("local-commit-icon.png", "local-commit-icon@2x.png");
+                return Utility.GetIcon("local-commit-icon.png", "local-commit-icon@2x.png", Utility.IsDarkTheme);
             }
         }
 
@@ -894,7 +894,7 @@ public static Texture2D RepoIcon
         {
             get
             {
-                return Utility.GetIcon("repo.png", "repo@2x.png");
+                return Utility.GetIcon("repo.png", "repo@2x.png", Utility.IsDarkTheme);
             }
         }
 
@@ -908,10 +908,10 @@ public static Texture2D LockIcon
 
         public static Texture2D EmptyStateInit
         {
-          get
-          {
-            return Utility.GetIcon("empty-state-init.png", "empty-state-init@2x.png");
-          }
+            get
+            {
+                return Utility.GetIcon("empty-state-init.png", "empty-state-init@2x.png");
+            }
         }
 
         public static Texture2D DropdownListIcon
@@ -926,7 +926,7 @@ public static Texture2D GlobeIcon
         {
             get
             {
-                return Utility.GetIcon("globe.png", "globe@2x.png");
+                return Utility.GetIcon("globe.png", "globe@2x.png", Utility.IsDarkTheme);
             }
         }
 

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

@@ -16,6 +16,7 @@ class Window : BaseWindow
         [NonSerialized] private Spinner spinner;
         [NonSerialized] private IProgress repositoryProgress;
         [NonSerialized] private IProgress appManagerProgress;
+        [NonSerialized] private bool firstOnGUI = true;
 
         [SerializeField] private double progressMessageClearTime = -1;
         [SerializeField] private double notificationClearTime = -1;
@@ -112,8 +113,6 @@ public override void Initialize(IApplicationManager applicationManager)
             LocksView.InitializeView(this);
             InitProjectView.InitializeView(this);
 
-            titleContent = new GUIContent(Title, Styles.SmallLogo);
-
             if (!HasRepository)
             {
                 changeTab = activeTab = SubTab.InitProject;
@@ -213,6 +212,12 @@ private void ValidateCachedData(IRepository repository)
 
         private void MaybeUpdateData()
         {
+            if (firstOnGUI)
+            {
+                titleContent = new GUIContent(Title, Styles.SmallLogo);
+            }
+            firstOnGUI = false;
+
             UriString host = null;
             if (!HasRepository || String.IsNullOrEmpty(Repository.CloneUrl))
             {