Updating BranchesView to get favorite branches in MaybeUpdateData

Author: StanleyGoldman

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

@@ -24,8 +24,8 @@ class BranchesView : Subview
         private const string WarningCheckoutBranchExistsOK = "Ok";
         private const string NewBranchCancelButton = "x";
         private const string NewBranchConfirmButton = "Create";
-        private const string FavoritesSetting = "Favorites";
-        private const string FavoritesTitle = "Favorites";
+        private const string FavoritesSetting = "Favourites";
+        private const string FavoritesTitle = "Favourites";
         private const string CreateBranchTitle = "Create Branch";
         private const string LocalTitle = "Local branches";
         private const string RemoteTitle = "Remote branches";
@@ -43,6 +43,7 @@ class BranchesView : Subview
         [NonSerialized] private List<GitBranch> newLocalBranches;
         [NonSerialized] private BranchTreeNode newNodeSelection;
         [NonSerialized] private BranchesMode targetMode;
+        [NonSerialized] private bool favouritesHasChanged;
 
         [SerializeField] private BranchTreeNode activeBranchNode;
         [SerializeField] private BranchTreeNode localRoot;
@@ -51,6 +52,7 @@ class BranchesView : Subview
         [SerializeField] private List<Remote> remotes = new List<Remote>();
         [SerializeField] private Vector2 scroll;
         [SerializeField] private BranchTreeNode selectedNode;
+        private List<string> favouritesList;
 
         public override void InitializeView(IView parent)
         {
@@ -62,6 +64,7 @@ public override void OnEnable()
         {
             base.OnEnable();
             AttachHandlers(Repository);
+            favouritesHasChanged = true;
         }
 
         public override void OnDisable()
@@ -70,6 +73,21 @@ public override void OnDisable()
             DetachHandlers(Repository);
         }
 
+        public override void OnDataUpdate()
+        {
+            base.OnDataUpdate();
+            MaybeUpdateData();
+        }
+
+        private void MaybeUpdateData()
+        {
+            if (favouritesHasChanged)
+            {
+                favouritesList = Manager.LocalSettings.Get(FavoritesSetting, new List<string>());
+                favouritesHasChanged = false;
+            }
+        }
+
         public override void OnRepositoryChanged(IRepository oldRepository)
         {
             base.OnRepositoryChanged(oldRepository);
@@ -268,12 +286,12 @@ public void OnEmbeddedGUI()
 
         private int CompareBranches(GitBranch a, GitBranch b)
         {
-            if (GetFavourite(a.Name))
+            if (IsFavourite(a.Name))
             {
                 return -1;
             }
 
-            if (GetFavourite(b.Name))
+            if (IsFavourite(b.Name))
             {
                 return 1;
             }
@@ -291,19 +309,19 @@ private int CompareBranches(GitBranch a, GitBranch b)
             return 0;
         }
 
-        private bool GetFavourite(BranchTreeNode branch)
+        private bool IsFavourite(BranchTreeNode branch)
         {
-            return GetFavourite(branch.Name);
+            return IsFavourite(branch.Name);
         }
 
-        private bool GetFavourite(string branchName)
+        private bool IsFavourite(string branchName)
         {
             if (string.IsNullOrEmpty(branchName))
             {
                 return false;
             }
 
-            return Manager.LocalSettings.Get(FavoritesSetting, new List<string>()).Contains(branchName);
+            return favouritesList.Contains(branchName);
         }
 
         private void OnLocalBranchesUpdate(IEnumerable<GitBranch> list)
@@ -334,7 +352,6 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
 
             // Prepare for updated favourites listing
             favourites.Clear();
-            var cachedFavs = Manager.LocalSettings.Get<List<string>>(FavoritesSetting, new List<string>());
 
             // Just build directly on the local root, keep track of active branch
             localRoot = new BranchTreeNode("", NodeType.Folder, false);
@@ -364,7 +381,7 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                 }
 
                 // Add to favourites
-                if (cachedFavs.Contains(branch.Name))
+                if (favouritesList.Contains(branch.Name))
                 {
                     favourites.Add(node);
                 }
@@ -408,7 +425,7 @@ private void BuildTree(IEnumerable<GitBranch> local, IEnumerable<GitBranch> remo
                 }
 
                 // Add to favourites
-                if (cachedFavs.Contains(branch.Name))
+                if (favouritesList.Contains(branch.Name))
                 {
                     favourites.Add(node);
                 }
@@ -619,7 +636,7 @@ private void OnTreeNodeGUI(BranchTreeNode node)
 
                 if (node.Type != NodeType.Folder)
                 {
-                    var favourite = GetFavourite(node);
+                    var favourite = IsFavourite(node);
                     if (Event.current.type == EventType.Repaint)
                     {
                         GUI.DrawTexture(favouriteRect, favourite ? Styles.FavouriteIconOn : Styles.FavouriteIconOff);
@@ -632,7 +649,7 @@ private void OnTreeNodeGUI(BranchTreeNode node)
                 }
             }
             // Favourite status
-            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && GetFavourite(node.Name))
+            else if (Event.current.type == EventType.Repaint && node.Type != NodeType.Folder && IsFavourite(node.Name))
             {
                 GUI.DrawTexture(favouriteRect, Styles.FavouriteIconOn);
             }