diff --git a/RustTools/Activation/DefaultActivationHandler.cs b/RustTools/Activation/DefaultActivationHandler.cs index 1e961c3..86bb48a 100644 --- a/RustTools/Activation/DefaultActivationHandler.cs +++ b/RustTools/Activation/DefaultActivationHandler.cs @@ -22,7 +22,7 @@ public class DefaultActivationHandler : ActivationHandler(); services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + //services.AddTransient(); + //services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/RustTools/RustTools.csproj b/RustTools/RustTools.csproj index eb8a2dc..eab26c2 100644 --- a/RustTools/RustTools.csproj +++ b/RustTools/RustTools.csproj @@ -19,7 +19,10 @@ zh-cn + + + @@ -49,6 +52,15 @@ True \ + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + MSBuild:Compile diff --git a/RustTools/Services/PageService.cs b/RustTools/Services/PageService.cs index d260aeb..7cc087c 100644 --- a/RustTools/Services/PageService.cs +++ b/RustTools/Services/PageService.cs @@ -14,8 +14,13 @@ public class PageService : IPageService public PageService() { - Configure(); + //Configure(); + Configure(); + Configure(); + Configure(); + Configure(); + Configure(); } diff --git a/RustTools/ViewModels/MainViewModel.cs b/RustTools/ViewModels/MainViewModel.cs deleted file mode 100644 index 75b8376..0000000 --- a/RustTools/ViewModels/MainViewModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using CommunityToolkit.Mvvm.ComponentModel; - -namespace RustTools.ViewModels; - -public partial class MainViewModel : ObservableRecipient -{ - public MainViewModel() - { - } -} diff --git a/RustTools/Views/MainPage.xaml b/RustTools/Views/Concern.xaml similarity index 56% rename from RustTools/Views/MainPage.xaml rename to RustTools/Views/Concern.xaml index 7af8683..8237210 100644 --- a/RustTools/Views/MainPage.xaml +++ b/RustTools/Views/Concern.xaml @@ -1,13 +1,15 @@ - + + mc:Ignorable="d" + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - - + diff --git a/RustTools/Views/Concern.xaml.cs b/RustTools/Views/Concern.xaml.cs new file mode 100644 index 0000000..2fc4f8d --- /dev/null +++ b/RustTools/Views/Concern.xaml.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using RustTools.ViewModels; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace RustTools.Views; +/// +/// An empty page that can be used on its own or navigated to within a Frame. +/// +public sealed partial class Concern : Page +{ + public ConcernViewModel ConcernViewModel { get; set; } + public Concern() + { + ConcernViewModel = App.GetService(); + InitializeComponent(); + } +} diff --git a/RustTools/Views/HomePage.xaml.cs b/RustTools/Views/HomePage.xaml.cs index 5e1b944..a0645c4 100644 --- a/RustTools/Views/HomePage.xaml.cs +++ b/RustTools/Views/HomePage.xaml.cs @@ -15,7 +15,7 @@ public sealed partial class HomePage : Page public HomePage() { - ViewModel=App.GetService(); + ViewModel= App.GetService(); InitializeComponent(); } } diff --git a/RustTools/Views/MainPage.xaml.cs b/RustTools/Views/MainPage.xaml.cs deleted file mode 100644 index c0acf2b..0000000 --- a/RustTools/Views/MainPage.xaml.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.UI.Xaml.Controls; - -using RustTools.ViewModels; - -namespace RustTools.Views; - -public sealed partial class MainPage : Page -{ - public MainViewModel ViewModel - { - get; - } - - public MainPage() - { - ViewModel = App.GetService(); - InitializeComponent(); - } -} diff --git a/RustTools/Views/RankingPage.xaml b/RustTools/Views/RankingPage.xaml new file mode 100644 index 0000000..7cba7f8 --- /dev/null +++ b/RustTools/Views/RankingPage.xaml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/RustTools/Views/RankingPage.xaml.cs b/RustTools/Views/RankingPage.xaml.cs new file mode 100644 index 0000000..c432aac --- /dev/null +++ b/RustTools/Views/RankingPage.xaml.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using RustTools.ViewModels; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace RustTools.Views; +public sealed partial class RankingPage : Page +{ + public RankingViewModel ViewModel + { + get; set; + } + public RankingPage() + { + ViewModel=App.GetService(); + InitializeComponent(); + } +} diff --git a/RustTools/Views/ShellPage.xaml b/RustTools/Views/ShellPage.xaml index 7cf0da0..156cbd0 100644 --- a/RustTools/Views/ShellPage.xaml +++ b/RustTools/Views/ShellPage.xaml @@ -47,15 +47,15 @@ Icon="Home" /> diff --git a/RustTools/Views/UserPage.xaml b/RustTools/Views/UserPage.xaml new file mode 100644 index 0000000..bb09bfa --- /dev/null +++ b/RustTools/Views/UserPage.xaml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/RustTools/Views/UserPage.xaml.cs b/RustTools/Views/UserPage.xaml.cs new file mode 100644 index 0000000..4f204d1 --- /dev/null +++ b/RustTools/Views/UserPage.xaml.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using RustTools.ViewModels; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace RustTools.Views; + +/// +/// An empty page that can be used on its own or navigated to within a Frame. +/// +public sealed partial class UserPage : Page +{ + public UserViewModel UserViewModel { get; set; } + public UserPage() + { + UserViewModel=App.GetService(); + InitializeComponent(); + } +}