michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: welcome page should use a shared singleton instance to manage and filter repositories (#117)

Browse source
This commit is contained in:
leo 2024-05-07 14:12:33 +08:00
parent 06ca29b2b2
commit 4af8cc18d2
5 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ViewModels/Launcher.cs
View file

@ -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();
}

2
src/ViewModels/LauncherPage.cs
View file

@ -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)

1
src/ViewModels/Repository.cs
View file

@ -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;

9
src/ViewModels/Welcome.cs
View file

@ -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;
}
}

2
src/Views/Welcome.axaml
View file

@ -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>