From 6ddbf87221d69b944a7e0c575bc590deafb8745e Mon Sep 17 00:00:00 2001
From: Ca2didi <cardidi@live.cn>
Date: Sat, 29 Mar 2025 21:31:43 +0800
Subject: [PATCH] fix: Modify some issue

---
 Flawless.Client/Flawless.Client.csproj        |  1 -
 Flawless.Client/ViewModels/HomeViewModel.cs   | 17 +++++++++++++++
 Flawless.Client/ViewModels/MainViewModel.cs   | 21 -------------------
 .../ViewModels/MainWindowViewModel.cs         |  4 +---
 .../Views/{MainView.axaml => HomeView.axaml}  |  4 ++--
 .../{MainView.axaml.cs => HomeView.axaml.cs}  |  4 ++--
 6 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 Flawless.Client/ViewModels/HomeViewModel.cs
 delete mode 100644 Flawless.Client/ViewModels/MainViewModel.cs
 rename Flawless.Client/Views/{MainView.axaml => HomeView.axaml} (84%)
 rename Flawless.Client/Views/{MainView.axaml.cs => HomeView.axaml.cs} (71%)

diff --git a/Flawless.Client/Flawless.Client.csproj b/Flawless.Client/Flawless.Client.csproj
index 78f5a8a..c0060cc 100644
--- a/Flawless.Client/Flawless.Client.csproj
+++ b/Flawless.Client/Flawless.Client.csproj
@@ -11,7 +11,6 @@
     <ItemGroup>
         <Folder Include="Models\" />
         <AvaloniaResource Include="Assets\**" />
-        <Folder Include="Theme\" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Flawless.Client/ViewModels/HomeViewModel.cs b/Flawless.Client/ViewModels/HomeViewModel.cs
new file mode 100644
index 0000000..f05351c
--- /dev/null
+++ b/Flawless.Client/ViewModels/HomeViewModel.cs
@@ -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;
+    }
+}
\ No newline at end of file
diff --git a/Flawless.Client/ViewModels/MainViewModel.cs b/Flawless.Client/ViewModels/MainViewModel.cs
deleted file mode 100644
index 6f452ea..0000000
--- a/Flawless.Client/ViewModels/MainViewModel.cs
+++ /dev/null
@@ -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;
-    }
-}
\ No newline at end of file
diff --git a/Flawless.Client/ViewModels/MainWindowViewModel.cs b/Flawless.Client/ViewModels/MainWindowViewModel.cs
index 7d995ac..69fcf85 100644
--- a/Flawless.Client/ViewModels/MainWindowViewModel.cs
+++ b/Flawless.Client/ViewModels/MainWindowViewModel.cs
@@ -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
diff --git a/Flawless.Client/Views/MainView.axaml b/Flawless.Client/Views/HomeView.axaml
similarity index 84%
rename from Flawless.Client/Views/MainView.axaml
rename to Flawless.Client/Views/HomeView.axaml
index 9d5972e..07c80d6 100644
--- a/Flawless.Client/Views/MainView.axaml
+++ b/Flawless.Client/Views/HomeView.axaml
@@ -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>
diff --git a/Flawless.Client/Views/MainView.axaml.cs b/Flawless.Client/Views/HomeView.axaml.cs
similarity index 71%
rename from Flawless.Client/Views/MainView.axaml.cs
rename to Flawless.Client/Views/HomeView.axaml.cs
index f318930..e7049db 100644
--- a/Flawless.Client/Views/MainView.axaml.cs
+++ b/Flawless.Client/Views/HomeView.axaml.cs
@@ -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();
     }