1
0

fix: Modify some issue

This commit is contained in:
Ca2didi 2025-03-29 21:31:43 +08:00
parent f687dc33a2
commit 6ddbf87221
6 changed files with 22 additions and 29 deletions

View File

@ -11,7 +11,6 @@
<ItemGroup>
<Folder Include="Models\" />
<AvaloniaResource Include="Assets\**" />
<Folder Include="Theme\" />
</ItemGroup>
<ItemGroup>

View File

@ -0,0 +1,17 @@
using System;
using System.Reactive;
using ReactiveUI;
namespace Flawless.Client.ViewModels;
public class HomeViewModel : ViewModelBase, IRoutableViewModel
{
public string? UrlPathSegment { get; } = Guid.NewGuid().ToString();
public IScreen HostScreen { get; }
public HomeViewModel(IScreen hostScreen)
{
HostScreen = hostScreen;
}
}

View File

@ -1,21 +0,0 @@
using System;
using System.Reactive;
using ReactiveUI;
namespace Flawless.Client.ViewModels;
public class MainViewModel : ViewModelBase, IScreen, IRoutableViewModel
{
public string? UrlPathSegment { get; } = Guid.NewGuid().ToString();
public IScreen HostScreen { get; }
public RoutingState Router { get; } = new RoutingState();
public ReactiveCommand<Unit, IRoutableViewModel> GoBackCommand => Router.NavigateBack;
public MainViewModel(IScreen hostScreen)
{
HostScreen = hostScreen;
}
}

View File

@ -1,9 +1,7 @@
using System;
using System.Reactive;
using System.Reactive.Linq;
using Flawless.Client.Service;
using ReactiveUI;
using ReactiveUI.SourceGenerators;
namespace Flawless.Client.ViewModels;
@ -26,7 +24,7 @@ public partial class MainWindowViewModel : ViewModelBase, IScreen
else
{
Console.WriteLine("Require login again");
Router.NavigateAndReset.Execute(new ServerConnectViewModel(this));
Router.NavigateAndReset.Execute(new HomeViewModel(this));
}
});
#pragma warning restore VSTHRD110

View File

@ -5,6 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="1280" d:DesignHeight="768"
x:Class="Flawless.Client.Views.MainView">
<Label Content="Greet!"/>
x:Class="Flawless.Client.Views.HomeView">
</UserControl>

View File

@ -6,9 +6,9 @@ using Ursa.ReactiveUIExtension;
namespace Flawless.Client.Views;
public partial class MainView : ReactiveUrsaView<MainViewModel>
public partial class HomeView : ReactiveUrsaView<HomeViewModel>
{
public MainView()
public HomeView()
{
InitializeComponent();
}