fix: Some warnings

HMBSbige · Aug 17, 2021 · a0db7cc · a0db7cc
1 parent d53700e
commit a0db7cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/NatTypeTester/MainWindow.xaml.cs b/NatTypeTester/MainWindow.xaml.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using ModernWpf;
 using ModernWpf.Controls;
 using NatTypeTester.ViewModels;
 using ReactiveUI;
@@ -13,13 +12,10 @@ namespace NatTypeTester
 {
 	public partial class MainWindow : ISingletonDependency
 	{
-		public IServiceProvider ServiceProvider { get; set; } = null!;
-
-		public MainWindow(MainWindowViewModel viewModel)
+		public MainWindow(MainWindowViewModel viewModel, IServiceProvider serviceProvider)
 		{
 			InitializeComponent();
 			ViewModel = viewModel;
-			ThemeManager.Current.ApplicationTheme = default;
 
 			this.WhenActivated(d =>
 			{
@@ -43,7 +39,7 @@ public MainWindow(MainWindowViewModel viewModel)
 				{
 					if (args.EventArgs.IsSettingsSelected)
 					{
-						ViewModel.Router.Navigate.Execute(ServiceProvider.GetRequiredService<SettingViewModel>());
+						ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<SettingViewModel>());
 						return;
 					}
 
@@ -56,12 +52,12 @@ public MainWindow(MainWindowViewModel viewModel)
 					{
 						case @"1":
 						{
-							ViewModel.Router.Navigate.Execute(ServiceProvider.GetRequiredService<RFC5780ViewModel>());
+							ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<RFC5780ViewModel>());
 							break;
 						}
 						case @"2":
 						{
-							ViewModel.Router.Navigate.Execute(ServiceProvider.GetRequiredService<RFC3489ViewModel>());
+							ViewModel.Router.Navigate.Execute(serviceProvider.GetRequiredService<RFC3489ViewModel>());
 							break;
 						}
 					}

diff --git a/NatTypeTester/Views/RFC3489View.xaml.cs b/NatTypeTester/Views/RFC3489View.xaml.cs
@@ -53,7 +53,7 @@ public RFC3489View(RFC3489ViewModel viewModel)
 						.Subscribe(_ => TestButton.Command.Execute(default))
 						.DisposeWith(d);
 
-				ViewModel.TestClassicNatType.ThrownExceptions.Subscribe(async ex => await ex.HandleExceptionWithContentDialogAsync()).DisposeWith(d);
+				ViewModel.TestClassicNatType.ThrownExceptions.Subscribe(ex => _ = ex.HandleExceptionWithContentDialogAsync()).DisposeWith(d);
 			});
 		}
 	}

diff --git a/NatTypeTester/Views/RFC5780View.xaml.cs b/NatTypeTester/Views/RFC5780View.xaml.cs
@@ -67,7 +67,7 @@ public RFC5780View(RFC5780ViewModel viewModel)
 						.Subscribe(_ => DiscoveryButton.Command.Execute(default))
 						.DisposeWith(d);
 
-				ViewModel.DiscoveryNatType.ThrownExceptions.Subscribe(async ex => await ex.HandleExceptionWithContentDialogAsync()).DisposeWith(d);
+				ViewModel.DiscoveryNatType.ThrownExceptions.Subscribe(ex => _ = ex.HandleExceptionWithContentDialogAsync()).DisposeWith(d);
 			});
 		}
 	}