code_style: change static methods of ViewModels.Preference to member function

love-linger · love-linger · commit 720b2b65f3bf · 2024-07-22T15:34:31.000+08:00
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
@@ -520,7 +520,7 @@ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop
             desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };
 
             var pref = ViewModels.Preference.Instance;
-            if (pref.ShouldCheck4UpdateOnStartup)
+            if (pref.ShouldCheck4UpdateOnStartup())
             {
                 pref.Save();
                 Check4Update();
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
@@ -130,7 +130,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var normalizedPath = path.Replace("\\", "/");
-                    var node = Preference.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
+                    var node = Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);
                     _launcher.OpenRepositoryInTab(node, _page);
                 });
 
diff --git a/src/ViewModels/CreateGroup.cs b/src/ViewModels/CreateGroup.cs
@@ -21,7 +21,7 @@ public CreateGroup(RepositoryNode parent)
 
         public override Task<bool> Sure()
         {
-            Preference.AddNode(new RepositoryNode()
+            Preference.Instance.AddNode(new RepositoryNode()
             {
                 Id = Guid.NewGuid().ToString(),
                 Name = _name,
diff --git a/src/ViewModels/DeleteRepositoryNode.cs b/src/ViewModels/DeleteRepositoryNode.cs
@@ -18,7 +18,7 @@ public DeleteRepositoryNode(RepositoryNode node)
 
         public override Task<bool> Sure()
         {
-            Preference.RemoveNode(_node);
+            Preference.Instance.RemoveNode(_node);
             return null;
         }
 
diff --git a/src/ViewModels/EditRepositoryNode.cs b/src/ViewModels/EditRepositoryNode.cs
@@ -48,7 +48,7 @@ public override Task<bool> Sure()
             _node.Bookmark = _bookmark;
 
             if (needSort)
-                Preference.SortByRenamedNode(_node);
+                Preference.Instance.SortByRenamedNode(_node);
 
             return null;
         }
diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs
@@ -31,7 +31,7 @@ public override Task<bool> Sure()
                 CallUIThread(() =>
                 {
                     var normalizedPath = _targetPath.Replace("\\", "/");
-                    Preference.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
+                    Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);
                 });
 
                 return true;
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
@@ -1,11 +1,9 @@
 ﻿using System;
 using System.IO;
 
-using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Media;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -34,6 +32,7 @@ public Launcher(string startupRepo)
             Pages = new AvaloniaList<LauncherPage>();
             AddNewTab();
 
+            var pref = Preference.Instance;
             if (!string.IsNullOrEmpty(startupRepo))
             {
                 var root = new Commands.QueryRepositoryRootPath(startupRepo).Result();
@@ -48,14 +47,14 @@ public Launcher(string startupRepo)
                 }
 
                 var normalized = root.Replace("\\", "/");
-                var node = Preference.FindOrAddNodeByRepositoryPath(normalized, null, false);
+                var node = pref.FindOrAddNodeByRepositoryPath(normalized, null, false);
                 OpenRepositoryInTab(node, null);
             }
-            else if (Preference.Instance.RestoreTabs)
+            else if (pref.RestoreTabs)
             {
-                foreach (var id in Preference.Instance.OpenedTabs)
+                foreach (var id in pref.OpenedTabs)
                 {
-                    var node = Preference.FindNode(id);
+                    var node = pref.FindNode(id);
                     if (node == null)
                     {
                         node = new RepositoryNode()
@@ -70,7 +69,7 @@ public Launcher(string startupRepo)
                     OpenRepositoryInTab(node, null);
                 }
 
-                var lastActiveIdx = Preference.Instance.LastActiveTabIdx;
+                var lastActiveIdx = pref.LastActiveTabIdx;
                 if (lastActiveIdx >= 0 && lastActiveIdx < Pages.Count)
                     ActivePage = Pages[lastActiveIdx];
             }
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
@@ -43,7 +43,7 @@ public static Preference Instance
                 if (_instance.MonospaceFont == null)
                     _instance.MonospaceFont = new FontFamily("fonts:SourceGit#JetBrains Mono");
 
-                if (!_instance.IsGitConfigured)
+                if (!_instance.IsGitConfigured())
                     _instance.GitInstallPath = Native.OS.FindGitExecutable();
 
                 return _instance;
@@ -213,12 +213,6 @@ public Models.ChangeViewMode CommitChangeViewMode
             set => SetProperty(ref _commitChangeViewMode, value);
         }
 
-        [JsonIgnore]
-        public bool IsGitConfigured
-        {
-            get => !string.IsNullOrEmpty(GitInstallPath) && File.Exists(GitInstallPath);
-        }
-
         public string GitInstallPath
         {
             get => Native.OS.GitExecutable;
@@ -326,28 +320,30 @@ public double LastCheckUpdateTime
             set;
         } = 0;
 
-        [JsonIgnore]
-        public bool ShouldCheck4UpdateOnStartup
+        public bool IsGitConfigured()
         {
-            get
-            {
-                if (!_check4UpdatesOnStartup)
-                    return false;
+            var path = GitInstallPath;
+            return !string.IsNullOrEmpty(path) && File.Exists(path);
+        }
+
+        public bool ShouldCheck4UpdateOnStartup()
+        {
+            if (!_check4UpdatesOnStartup)
+                return false;
 
-                var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime();
-                var now = DateTime.Now;
+            var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime();
+            var now = DateTime.Now;
 
-                if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day)
-                    return false;
+            if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day)
+                return false;
 
-                LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds;
-                return true;
-            }
+            LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds;
+            return true;
         }
 
-        public static void AddNode(RepositoryNode node, RepositoryNode to = null)
+        public void AddNode(RepositoryNode node, RepositoryNode to = null)
         {
-            var collection = to == null ? _instance._repositoryNodes : to.SubNodes;
+            var collection = to == null ? _repositoryNodes : to.SubNodes;
             var list = new List<RepositoryNode>();
             list.AddRange(collection);
             list.Add(node);
@@ -364,14 +360,14 @@ public static void AddNode(RepositoryNode node, RepositoryNode to = null)
                 collection.Add(one);
         }
 
-        public static RepositoryNode FindNode(string id)
+        public RepositoryNode FindNode(string id)
         {
-            return FindNodeRecursive(id, _instance.RepositoryNodes);
+            return FindNodeRecursive(id, RepositoryNodes);
         }
 
-        public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)
+        public RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)
         {
-            var node = FindNodeRecursive(repo, _instance.RepositoryNodes);
+            var node = FindNodeRecursive(repo, RepositoryNodes);
             if (node == null)
             {
                 node = new RepositoryNode()
@@ -392,9 +388,9 @@ public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, Reposito
             return node;
         }
 
-        public static void MoveNode(RepositoryNode node, RepositoryNode to = null)
+        public void MoveNode(RepositoryNode node, RepositoryNode to = null)
         {
-            if (to == null && _instance._repositoryNodes.Contains(node))
+            if (to == null && _repositoryNodes.Contains(node))
                 return;
             if (to != null && to.SubNodes.Contains(node))
                 return;
@@ -403,14 +399,14 @@ public static void MoveNode(RepositoryNode node, RepositoryNode to = null)
             AddNode(node, to);
         }
 
-        public static void RemoveNode(RepositoryNode node)
+        public void RemoveNode(RepositoryNode node)
         {
-            RemoveNodeRecursive(node, _instance._repositoryNodes);
+            RemoveNodeRecursive(node, _repositoryNodes);
         }
 
-        public static void SortByRenamedNode(RepositoryNode node)
+        public void SortByRenamedNode(RepositoryNode node)
         {
-            var container = FindNodeContainer(node, _instance._repositoryNodes);
+            var container = FindNodeContainer(node, _repositoryNodes);
             if (container == null)
                 return;
 
@@ -435,7 +431,7 @@ public void Save()
             File.WriteAllText(_savePath, data);
         }
 
-        private static RepositoryNode FindNodeRecursive(string id, AvaloniaList<RepositoryNode> collection)
+        private RepositoryNode FindNodeRecursive(string id, AvaloniaList<RepositoryNode> collection)
         {
             foreach (var node in collection)
             {
@@ -450,7 +446,7 @@ private static RepositoryNode FindNodeRecursive(string id, AvaloniaList<Reposito
             return null;
         }
 
-        private static AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
+        private AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
         {
             foreach (var sub in collection)
             {
@@ -465,7 +461,7 @@ private static AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode nod
             return null;
         }
 
-        private static bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
+        private bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList<RepositoryNode> collection)
         {
             if (collection.Contains(node))
             {
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -965,7 +965,7 @@ public void OpenSubmodule(string submodule)
             var root = Path.GetFullPath(Path.Combine(_fullpath, submodule));
             var normalizedPath = root.Replace("\\", "/");
 
-            var node = Preference.FindNode(normalizedPath);
+            var node = Preference.Instance.FindNode(normalizedPath);
             if (node == null)
             {
                 node = new RepositoryNode()
@@ -996,7 +996,7 @@ public void PruneWorktrees()
 
         public void OpenWorktree(Models.Worktree worktree)
         {
-            var node = Preference.FindNode(worktree.FullPath);
+            var node = Preference.Instance.FindNode(worktree.FullPath);
             if (node == null)
             {
                 node = new RepositoryNode()
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -23,13 +24,13 @@ public string SearchFilter
             set
             {
                 if (SetProperty(ref _searchFilter, value))
-                    Referesh();
+                    Refresh();
             }
         }
 
         public void InitRepository(string path, RepositoryNode parent)
         {
-            if (!Preference.Instance.IsGitConfigured)
+            if (!Preference.Instance.IsGitConfigured())
             {
                 App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured"));
                 return;
@@ -43,7 +44,7 @@ public void InitRepository(string path, RepositoryNode parent)
 
         public void Clone()
         {
-            if (!Preference.Instance.IsGitConfigured)
+            if (!Preference.Instance.IsGitConfigured())
             {
                 App.RaiseException(string.Empty, App.Text("NotConfigured"));
                 return;
@@ -58,7 +59,7 @@ public void Clone()
 
         public void OpenTerminal()
         {
-            if (!Preference.Instance.IsGitConfigured)
+            if (!Preference.Instance.IsGitConfigured())
             {
                 App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured"));
             }
@@ -81,7 +82,7 @@ public void AddRootNode()
 
         public void MoveNode(RepositoryNode from, RepositoryNode to)
         {
-            Preference.MoveNode(from, to);
+            Preference.Instance.MoveNode(from, to);
         }
 
         public ContextMenu CreateContextMenu(RepositoryNode node)
@@ -166,7 +167,7 @@ public ContextMenu CreateContextMenu(RepositoryNode node)
             return menu;
         }
 
-        private void Referesh()
+        private void Refresh()
         {
             if (string.IsNullOrWhiteSpace(_searchFilter))
             {
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
@@ -139,7 +139,7 @@ public Preference()
             });
 
             var ver = string.Empty;
-            if (pref.IsGitConfigured)
+            if (pref.IsGitConfigured())
             {
                 var config = new Commands.Config(null).ListAll();
 
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
@@ -37,9 +37,9 @@ private void SetupTreeNodeDragAndDrop(object sender, RoutedEventArgs _)
 
         private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (sender is Grid grid && DataContext is ViewModels.Welcome vm)
+            if (sender is Grid grid)
             {
-                var menu = vm.CreateContextMenu(grid.DataContext as ViewModels.RepositoryNode);
+                var menu = ViewModels.Welcome.Instance.CreateContextMenu(grid.DataContext as ViewModels.RepositoryNode);
                 grid.OpenContextMenu(menu);
                 e.Handled = true;
             }
@@ -109,9 +109,7 @@ private void DropOnTreeView(object sender, DragEventArgs e)
             if (e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
             {
                 e.Handled = true;
-
-                if (DataContext is ViewModels.Welcome vm)
-                    vm.MoveNode(moved, null);
+                ViewModels.Welcome.Instance.MoveNode(moved, null);
             }
             else if (e.Data.Contains(DataFormats.Files))
             {
@@ -173,8 +171,8 @@ private void DropOnTreeNode(object sender, DragEventArgs e)
             {
                 e.Handled = true;
 
-                if (to != moved && DataContext is ViewModels.Welcome vm)
-                    vm.MoveNode(moved, to);
+                if (to != moved)
+                    ViewModels.Welcome.Instance.MoveNode(moved, to);
             }
             else if (e.Data.Contains(DataFormats.Files))
             {
@@ -222,12 +220,12 @@ private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent
             var root = new Commands.QueryRepositoryRootPath(path).Result();
             if (string.IsNullOrEmpty(root))
             {
-                (DataContext as ViewModels.Welcome)?.InitRepository(path, parent);
+                ViewModels.Welcome.Instance.InitRepository(path, parent);
                 return;
             }
 
             var normalizedPath = root.Replace("\\", "/");
-            var node = ViewModels.Preference.FindOrAddNodeByRepositoryPath(normalizedPath, parent, true);
+            var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, parent, true);
             var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
             launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
         }
diff --git a/src/Views/WelcomeToolbar.axaml.cs b/src/Views/WelcomeToolbar.axaml.cs
@@ -44,12 +44,12 @@ private void OpenOrInitRepository(string path, ViewModels.RepositoryNode parent
             var root = new Commands.QueryRepositoryRootPath(path).Result();
             if (string.IsNullOrEmpty(root))
             {
-                (DataContext as ViewModels.Welcome)?.InitRepository(path, parent);
+                ViewModels.Welcome.Instance.InitRepository(path, parent);
                 return;
             }
 
             var normalizedPath = root.Replace("\\", "/");
-            var node = ViewModels.Preference.FindOrAddNodeByRepositoryPath(normalizedPath, parent, true);
+            var node = ViewModels.Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, parent, true);
             var launcher = this.FindAncestorOfType<Launcher>()?.DataContext as ViewModels.Launcher;
             launcher?.OpenRepositoryInTab(node, launcher.ActivePage);
         }

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private void TryLaunchedAsNormal(IClassicDesktopStyleApplicationLifetime desktop`
`520`	`520`	`desktop.MainWindow = new Views.Launcher() { DataContext = _launcher };`
`521`	`521`
`522`	`522`	`var pref = ViewModels.Preference.Instance;`
`523`		`- if (pref.ShouldCheck4UpdateOnStartup)`
	`523`	`+ if (pref.ShouldCheck4UpdateOnStartup())`
`524`	`524`	`{`
`525`	`525`	`pref.Save();`
`526`	`526`	`Check4Update();`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public override Task<bool> Sure()`
`130`	`130`	`CallUIThread(() =>`
`131`	`131`	`{`
`132`	`132`	`var normalizedPath = path.Replace("\\", "/");`
`133`		`- var node = Preference.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);`
	`133`	`+ var node = Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, null, true);`
`134`	`134`	`_launcher.OpenRepositoryInTab(node, _page);`
`135`	`135`	`});`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public CreateGroup(RepositoryNode parent)`
`21`	`21`
`22`	`22`	`public override Task<bool> Sure()`
`23`	`23`	`{`
`24`		`- Preference.AddNode(new RepositoryNode()`
	`24`	`+ Preference.Instance.AddNode(new RepositoryNode()`
`25`	`25`	`{`
`26`	`26`	`Id = Guid.NewGuid().ToString(),`
`27`	`27`	`Name = _name,`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public DeleteRepositoryNode(RepositoryNode node)`
`18`	`18`
`19`	`19`	`public override Task<bool> Sure()`
`20`	`20`	`{`
`21`		`- Preference.RemoveNode(_node);`
	`21`	`+ Preference.Instance.RemoveNode(_node);`
`22`	`22`	`return null;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public override Task<bool> Sure()`
`48`	`48`	`_node.Bookmark = _bookmark;`
`49`	`49`
`50`	`50`	`if (needSort)`
`51`		`- Preference.SortByRenamedNode(_node);`
	`51`	`+ Preference.Instance.SortByRenamedNode(_node);`
`52`	`52`
`53`	`53`	`return null;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public override Task<bool> Sure()`
`31`	`31`	`CallUIThread(() =>`
`32`	`32`	`{`
`33`	`33`	`var normalizedPath = _targetPath.Replace("\\", "/");`
`34`		`- Preference.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);`
	`34`	`+ Preference.Instance.FindOrAddNodeByRepositoryPath(normalizedPath, _parentNode, true);`
`35`	`35`	`});`
`36`	`36`
`37`	`37`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
`3`	`3`
`4`		`-using Avalonia;`
`5`	`4`	`using Avalonia.Collections;`
`6`	`5`	`using Avalonia.Controls;`
`7`	`6`	`using Avalonia.Input;`
`8`		`-using Avalonia.Media;`
`9`	`7`
`10`	`8`	`using CommunityToolkit.Mvvm.ComponentModel;`
`11`	`9`
`@@ -34,6 +32,7 @@ public Launcher(string startupRepo)`
`34`	`32`	`Pages = new AvaloniaList<LauncherPage>();`
`35`	`33`	`AddNewTab();`
`36`	`34`
	`35`	`+ var pref = Preference.Instance;`
`37`	`36`	`if (!string.IsNullOrEmpty(startupRepo))`
`38`	`37`	`{`
`39`	`38`	`var root = new Commands.QueryRepositoryRootPath(startupRepo).Result();`
`@@ -48,14 +47,14 @@ public Launcher(string startupRepo)`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`var normalized = root.Replace("\\", "/");`
`51`		`- var node = Preference.FindOrAddNodeByRepositoryPath(normalized, null, false);`
	`50`	`+ var node = pref.FindOrAddNodeByRepositoryPath(normalized, null, false);`
`52`	`51`	`OpenRepositoryInTab(node, null);`
`53`	`52`	`}`
`54`		`- else if (Preference.Instance.RestoreTabs)`
	`53`	`+ else if (pref.RestoreTabs)`
`55`	`54`	`{`
`56`		`- foreach (var id in Preference.Instance.OpenedTabs)`
	`55`	`+ foreach (var id in pref.OpenedTabs)`
`57`	`56`	`{`
`58`		`- var node = Preference.FindNode(id);`
	`57`	`+ var node = pref.FindNode(id);`
`59`	`58`	`if (node == null)`
`60`	`59`	`{`
`61`	`60`	`node = new RepositoryNode()`
`@@ -70,7 +69,7 @@ public Launcher(string startupRepo)`
`70`	`69`	`OpenRepositoryInTab(node, null);`
`71`	`70`	`}`
`72`	`71`
`73`		`- var lastActiveIdx = Preference.Instance.LastActiveTabIdx;`
	`72`	`+ var lastActiveIdx = pref.LastActiveTabIdx;`
`74`	`73`	`if (lastActiveIdx >= 0 && lastActiveIdx < Pages.Count)`
`75`	`74`	`ActivePage = Pages[lastActiveIdx];`
`76`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static Preference Instance`
`43`	`43`	`if (_instance.MonospaceFont == null)`
`44`	`44`	`_instance.MonospaceFont = new FontFamily("fonts:SourceGit#JetBrains Mono");`
`45`	`45`
`46`		`- if (!_instance.IsGitConfigured)`
	`46`	`+ if (!_instance.IsGitConfigured())`
`47`	`47`	`_instance.GitInstallPath = Native.OS.FindGitExecutable();`
`48`	`48`
`49`	`49`	`return _instance;`
`@@ -213,12 +213,6 @@ public Models.ChangeViewMode CommitChangeViewMode`
`213`	`213`	`set => SetProperty(ref _commitChangeViewMode, value);`
`214`	`214`	`}`
`215`	`215`
`216`		`- [JsonIgnore]`
`217`		`- public bool IsGitConfigured`
`218`		`- {`
`219`		`- get => !string.IsNullOrEmpty(GitInstallPath) && File.Exists(GitInstallPath);`
`220`		`- }`
`221`		`-`
`222`	`216`	`public string GitInstallPath`
`223`	`217`	`{`
`224`	`218`	`get => Native.OS.GitExecutable;`
`@@ -326,28 +320,30 @@ public double LastCheckUpdateTime`
`326`	`320`	`set;`
`327`	`321`	`} = 0;`
`328`	`322`
`329`		`- [JsonIgnore]`
`330`		`- public bool ShouldCheck4UpdateOnStartup`
	`323`	`+ public bool IsGitConfigured()`
`331`	`324`	`{`
`332`		`- get`
`333`		`- {`
`334`		`- if (!_check4UpdatesOnStartup)`
`335`		`- return false;`
	`325`	`+ var path = GitInstallPath;`
	`326`	`+ return !string.IsNullOrEmpty(path) && File.Exists(path);`
	`327`	`+ }`
	`328`	`+`
	`329`	`+ public bool ShouldCheck4UpdateOnStartup()`
	`330`	`+ {`
	`331`	`+ if (!_check4UpdatesOnStartup)`
	`332`	`+ return false;`
`336`	`333`
`337`		`- var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime();`
`338`		`- var now = DateTime.Now;`
	`334`	`+ var lastCheck = DateTime.UnixEpoch.AddSeconds(LastCheckUpdateTime).ToLocalTime();`
	`335`	`+ var now = DateTime.Now;`
`339`	`336`
`340`		`- if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day)`
`341`		`- return false;`
	`337`	`+ if (lastCheck.Year == now.Year && lastCheck.Month == now.Month && lastCheck.Day == now.Day)`
	`338`	`+ return false;`
`342`	`339`
`343`		`- LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds;`
`344`		`- return true;`
`345`		`- }`
	`340`	`+ LastCheckUpdateTime = now.Subtract(DateTime.UnixEpoch.ToLocalTime()).TotalSeconds;`
	`341`	`+ return true;`
`346`	`342`	`}`
`347`	`343`
`348`		`- public static void AddNode(RepositoryNode node, RepositoryNode to = null)`
	`344`	`+ public void AddNode(RepositoryNode node, RepositoryNode to = null)`
`349`	`345`	`{`
`350`		`- var collection = to == null ? _instance._repositoryNodes : to.SubNodes;`
	`346`	`+ var collection = to == null ? _repositoryNodes : to.SubNodes;`
`351`	`347`	`var list = new List<RepositoryNode>();`
`352`	`348`	`list.AddRange(collection);`
`353`	`349`	`list.Add(node);`
`@@ -364,14 +360,14 @@ public static void AddNode(RepositoryNode node, RepositoryNode to = null)`
`364`	`360`	`collection.Add(one);`
`365`	`361`	`}`
`366`	`362`
`367`		`- public static RepositoryNode FindNode(string id)`
	`363`	`+ public RepositoryNode FindNode(string id)`
`368`	`364`	`{`
`369`		`- return FindNodeRecursive(id, _instance.RepositoryNodes);`
	`365`	`+ return FindNodeRecursive(id, RepositoryNodes);`
`370`	`366`	`}`
`371`	`367`
`372`		`- public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)`
	`368`	`+ public RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode parent, bool shouldMoveNode)`
`373`	`369`	`{`
`374`		`- var node = FindNodeRecursive(repo, _instance.RepositoryNodes);`
	`370`	`+ var node = FindNodeRecursive(repo, RepositoryNodes);`
`375`	`371`	`if (node == null)`
`376`	`372`	`{`
`377`	`373`	`node = new RepositoryNode()`
`@@ -392,9 +388,9 @@ public static RepositoryNode FindOrAddNodeByRepositoryPath(string repo, Reposito`
`392`	`388`	`return node;`
`393`	`389`	`}`
`394`	`390`
`395`		`- public static void MoveNode(RepositoryNode node, RepositoryNode to = null)`
	`391`	`+ public void MoveNode(RepositoryNode node, RepositoryNode to = null)`
`396`	`392`	`{`
`397`		`- if (to == null && _instance._repositoryNodes.Contains(node))`
	`393`	`+ if (to == null && _repositoryNodes.Contains(node))`
`398`	`394`	`return;`
`399`	`395`	`if (to != null && to.SubNodes.Contains(node))`
`400`	`396`	`return;`
`@@ -403,14 +399,14 @@ public static void MoveNode(RepositoryNode node, RepositoryNode to = null)`
`403`	`399`	`AddNode(node, to);`
`404`	`400`	`}`
`405`	`401`
`406`		`- public static void RemoveNode(RepositoryNode node)`
	`402`	`+ public void RemoveNode(RepositoryNode node)`
`407`	`403`	`{`
`408`		`- RemoveNodeRecursive(node, _instance._repositoryNodes);`
	`404`	`+ RemoveNodeRecursive(node, _repositoryNodes);`
`409`	`405`	`}`
`410`	`406`
`411`		`- public static void SortByRenamedNode(RepositoryNode node)`
	`407`	`+ public void SortByRenamedNode(RepositoryNode node)`
`412`	`408`	`{`
`413`		`- var container = FindNodeContainer(node, _instance._repositoryNodes);`
	`409`	`+ var container = FindNodeContainer(node, _repositoryNodes);`
`414`	`410`	`if (container == null)`
`415`	`411`	`return;`
`416`	`412`
`@@ -435,7 +431,7 @@ public void Save()`
`435`	`431`	`File.WriteAllText(_savePath, data);`
`436`	`432`	`}`
`437`	`433`
`438`		`- private static RepositoryNode FindNodeRecursive(string id, AvaloniaList<RepositoryNode> collection)`
	`434`	`+ private RepositoryNode FindNodeRecursive(string id, AvaloniaList<RepositoryNode> collection)`
`439`	`435`	`{`
`440`	`436`	`foreach (var node in collection)`
`441`	`437`	`{`
`@@ -450,7 +446,7 @@ private static RepositoryNode FindNodeRecursive(string id, AvaloniaList<Reposito`
`450`	`446`	`return null;`
`451`	`447`	`}`
`452`	`448`
`453`		`- private static AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode node, AvaloniaList<RepositoryNode> collection)`
	`449`	`+ private AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode node, AvaloniaList<RepositoryNode> collection)`
`454`	`450`	`{`
`455`	`451`	`foreach (var sub in collection)`
`456`	`452`	`{`
`@@ -465,7 +461,7 @@ private static AvaloniaList<RepositoryNode> FindNodeContainer(RepositoryNode nod`
`465`	`461`	`return null;`
`466`	`462`	`}`
`467`	`463`
`468`		`- private static bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList<RepositoryNode> collection)`
	`464`	`+ private bool RemoveNodeRecursive(RepositoryNode node, AvaloniaList<RepositoryNode> collection)`
`469`	`465`	`{`
`470`	`466`	`if (collection.Contains(node))`
`471`	`467`	`{`
Original file line number	Diff line number	Diff line change
`@@ -965,7 +965,7 @@ public void OpenSubmodule(string submodule)`
`965`	`965`	`var root = Path.GetFullPath(Path.Combine(_fullpath, submodule));`
`966`	`966`	`var normalizedPath = root.Replace("\\", "/");`
`967`	`967`
`968`		`- var node = Preference.FindNode(normalizedPath);`
	`968`	`+ var node = Preference.Instance.FindNode(normalizedPath);`
`969`	`969`	`if (node == null)`
`970`	`970`	`{`
`971`	`971`	`node = new RepositoryNode()`
`@@ -996,7 +996,7 @@ public void PruneWorktrees()`
`996`	`996`
`997`	`997`	`public void OpenWorktree(Models.Worktree worktree)`
`998`	`998`	`{`
`999`		`- var node = Preference.FindNode(worktree.FullPath);`
	`999`	`+ var node = Preference.Instance.FindNode(worktree.FullPath);`
`1000`	`1000`	`if (node == null)`
`1001`	`1001`	`{`
`1002`	`1002`	`node = new RepositoryNode()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+`
`2`	`3`	`using Avalonia;`
`3`	`4`	`using Avalonia.Collections;`
`4`	`5`	`using Avalonia.Controls;`
`@@ -23,13 +24,13 @@ public string SearchFilter`
`23`	`24`	`set`
`24`	`25`	`{`
`25`	`26`	`if (SetProperty(ref _searchFilter, value))`
`26`		`- Referesh();`
	`27`	`+ Refresh();`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public void InitRepository(string path, RepositoryNode parent)`
`31`	`32`	`{`
`32`		`- if (!Preference.Instance.IsGitConfigured)`
	`33`	`+ if (!Preference.Instance.IsGitConfigured())`
`33`	`34`	`{`
`34`	`35`	`App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured"));`
`35`	`36`	`return;`
`@@ -43,7 +44,7 @@ public void InitRepository(string path, RepositoryNode parent)`
`43`	`44`
`44`	`45`	`public void Clone()`
`45`	`46`	`{`
`46`		`- if (!Preference.Instance.IsGitConfigured)`
	`47`	`+ if (!Preference.Instance.IsGitConfigured())`
`47`	`48`	`{`
`48`	`49`	`App.RaiseException(string.Empty, App.Text("NotConfigured"));`
`49`	`50`	`return;`
`@@ -58,7 +59,7 @@ public void Clone()`
`58`	`59`
`59`	`60`	`public void OpenTerminal()`
`60`	`61`	`{`
`61`		`- if (!Preference.Instance.IsGitConfigured)`
	`62`	`+ if (!Preference.Instance.IsGitConfigured())`
`62`	`63`	`{`
`63`	`64`	`App.RaiseException(PopupHost.Active.GetId(), App.Text("NotConfigured"));`
`64`	`65`	`}`
`@@ -81,7 +82,7 @@ public void AddRootNode()`
`81`	`82`
`82`	`83`	`public void MoveNode(RepositoryNode from, RepositoryNode to)`
`83`	`84`	`{`
`84`		`- Preference.MoveNode(from, to);`
	`85`	`+ Preference.Instance.MoveNode(from, to);`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`public ContextMenu CreateContextMenu(RepositoryNode node)`
`@@ -166,7 +167,7 @@ public ContextMenu CreateContextMenu(RepositoryNode node)`
`166`	`167`	`return menu;`
`167`	`168`	`}`
`168`	`169`
`169`		`- private void Referesh()`
	`170`	`+ private void Refresh()`
`170`	`171`	`{`
`171`	`172`	`if (string.IsNullOrWhiteSpace(_searchFilter))`
`172`	`173`	`{`