diff --git a/BetterGenshinImpact/App.xaml.cs b/BetterGenshinImpact/App.xaml.cs index 219fa95f..b0812ecd 100644 --- a/BetterGenshinImpact/App.xaml.cs +++ b/BetterGenshinImpact/App.xaml.cs @@ -90,6 +90,7 @@ public partial class App : Application services.AddView(); services.AddView(); services.AddView(); + services.AddView(); // My Services services.AddSingleton(); diff --git a/BetterGenshinImpact/View/Controls/WpfUi/FaFontIconStyle.xaml b/BetterGenshinImpact/View/Controls/WpfUi/FaFontIconStyle.xaml index 02758c17..ab939485 100644 --- a/BetterGenshinImpact/View/Controls/WpfUi/FaFontIconStyle.xaml +++ b/BetterGenshinImpact/View/Controls/WpfUi/FaFontIconStyle.xaml @@ -12,4 +12,8 @@ + + \ No newline at end of file diff --git a/BetterGenshinImpact/View/MainWindow.xaml b/BetterGenshinImpact/View/MainWindow.xaml index eed65722..80de1a99 100644 --- a/BetterGenshinImpact/View/MainWindow.xaml +++ b/BetterGenshinImpact/View/MainWindow.xaml @@ -87,7 +87,15 @@ - + + + + + - - \ No newline at end of file diff --git a/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml new file mode 100644 index 00000000..a765ee26 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BetterGenshinImpact/View/Pages/DispatcherPage.xaml.cs b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml.cs similarity index 54% rename from BetterGenshinImpact/View/Pages/DispatcherPage.xaml.cs rename to BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml.cs index 4ad45428..80206bc2 100644 --- a/BetterGenshinImpact/View/Pages/DispatcherPage.xaml.cs +++ b/BetterGenshinImpact/View/Pages/OneDragonFlowPage.xaml.cs @@ -2,11 +2,11 @@ namespace BetterGenshinImpact.View.Pages; -public partial class DispatcherPage +public partial class OneDragonFlowPage { - public DispatcherPageViewModel ViewModel { get; } + public OneDragonFlowViewModel ViewModel { get; } - public DispatcherPage(DispatcherPageViewModel viewModel) + public OneDragonFlowPage(OneDragonFlowViewModel viewModel) { DataContext = ViewModel = viewModel; InitializeComponent(); diff --git a/BetterGenshinImpact/ViewModel/Pages/DispatcherPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs similarity index 54% rename from BetterGenshinImpact/ViewModel/Pages/DispatcherPageViewModel.cs rename to BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs index 12174681..f8407b50 100644 --- a/BetterGenshinImpact/ViewModel/Pages/DispatcherPageViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs @@ -6,13 +6,13 @@ using Wpf.Ui.Controls; namespace BetterGenshinImpact.ViewModel.Pages; -public partial class DispatcherPageViewModel : ObservableObject, INavigationAware, IViewModel +public partial class OneDragonFlowViewModel : ObservableObject, INavigationAware, IViewModel { - private readonly ILogger _logger = App.GetLogger(); + private readonly ILogger _logger = App.GetLogger(); private ISnackbarService _snackbarService; - public DispatcherPageViewModel(ISnackbarService snackbarService) + public OneDragonFlowViewModel(ISnackbarService snackbarService) { _snackbarService = snackbarService; } @@ -24,9 +24,4 @@ public partial class DispatcherPageViewModel : ObservableObject, INavigationAwar public void OnNavigatedFrom() { } - - [RelayCommand] - public void OnStartRecord() - { - } }