From 4af8cc18d27062b9f83d91ce6a6046f2617f1f6c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 7 May 2024 14:12:33 +0800
Subject: [PATCH] fix: welcome page should use a shared singleton instance to
 manage and filter repositories (#117)

---
 src/ViewModels/Launcher.cs     | 2 +-
 src/ViewModels/LauncherPage.cs | 2 +-
 src/ViewModels/Repository.cs   | 1 -
 src/ViewModels/Welcome.cs      | 9 ++-------
 src/Views/Welcome.axaml        | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index e8bace1e..1fdc8d54 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -114,7 +114,7 @@ namespace SourceGit.ViewModels
                     repo.Close();
 
                     last.Node = new RepositoryNode() { Id = Guid.NewGuid().ToString() };
-                    last.Data = new Welcome();
+                    last.Data = Welcome.Instance;
 
                     GC.Collect();
                 }
diff --git a/src/ViewModels/LauncherPage.cs b/src/ViewModels/LauncherPage.cs
index 00c145b3..5fce2bf3 100644
--- a/src/ViewModels/LauncherPage.cs
+++ b/src/ViewModels/LauncherPage.cs
@@ -27,7 +27,7 @@ namespace SourceGit.ViewModels
         public LauncherPage()
         {
             _node = new RepositoryNode() { Id = Guid.NewGuid().ToString() };
-            _data = new Welcome();
+            _data = Welcome.Instance;
         }
 
         public LauncherPage(RepositoryNode node, Repository repo)
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 73a500b5..bff80053 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -8,7 +8,6 @@ using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
-using Avalonia.Platform;
 using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index a6fa1a8a..d4569d05 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -9,10 +9,7 @@ namespace SourceGit.ViewModels
 {
     public class Welcome : ObservableObject
     {
-        public bool IsClearSearchVisible
-        {
-            get => !string.IsNullOrEmpty(_searchFilter);
-        }
+        public static Welcome Instance => _instance;
 
         public AvaloniaList<RepositoryNode> RepositoryNodes
         {
@@ -25,10 +22,7 @@ namespace SourceGit.ViewModels
             set
             {
                 if (SetProperty(ref _searchFilter, value))
-                {
                     Referesh();
-                    OnPropertyChanged(nameof(IsClearSearchVisible));
-                }
             }
         }
 
@@ -205,6 +199,7 @@ namespace SourceGit.ViewModels
             }
         }
 
+        private static Welcome _instance = new Welcome();
         private string _searchFilter = string.Empty;
     }
 }
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 96e6bb14..fef229a2 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -42,7 +42,7 @@
           </TextBox.InnerLeftContent>
 
           <TextBox.InnerRightContent>
-            <Button Classes="icon_button" IsVisible="{Binding IsClearSearchVisible}" Command="{Binding ClearSearchFilter}">
+            <Button Classes="icon_button" IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" Command="{Binding ClearSearchFilter}">
               <Path Width="16" Height="16" Margin="0,0,0,0" Data="{StaticResource Icons.Clear}" Fill="{DynamicResource Brush.FG1}"/>
             </Button>
           </TextBox.InnerRightContent>