リファクタリング

Author: xm-i

RemoteLogViewer.Core/ViewModels/Settings/WorkspaceSettingsPageViewModel.cs

@@ -28,14 +28,14 @@ public WorkspaceSettingsPageViewModel(WorkspaceService workspaceService, ILogger
 		this.SelectedPath.Value = workspaceService.WorkspacePath ?? string.Empty;
 		this.SkipPersist.Value = workspaceService.IsPersist;
 		this._workspaceService = workspaceService;
-		this.ConfirmCommand.Subscribe(_ => this.OnConfirm());
+		_ = this.ConfirmCommand.Subscribe(_ => this.OnConfirm());
 	}
 
 	/// <summary>確定処理。</summary>
 	private void OnConfirm() {
 		var path = this.SelectedPath.Value.Trim();
 		if (string.IsNullOrWhiteSpace(path) || !Directory.Exists(path)) {
-			this.ErrorMessage.Value = "有効なフォルダを選択してください。";
+			this.ErrorMessage.Value = "Select a folder.";
 			return;
 		}
 		this.ErrorMessage.Value = null;

RemoteLogViewer.WinUI/App.xaml.cs

@@ -47,6 +47,9 @@ protected override void OnLaunched(LaunchActivatedEventArgs args) {
 		var logger = LoggerFactory.CreateLogger<App>();
 		WinUI3ProviderInitializer.SetDefaultObservableSystem(ex => logger.LogWarning(ex, "Exception"));
 		Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+		AppDomain.CurrentDomain.UnhandledException += (s, e) => {
+			logger.LogError(e.ExceptionObject as Exception, "UnhandledException");
+		};
 
 		var workspaceService = Ioc.Default.GetRequiredService<WorkspaceService>();
 		if (string.IsNullOrWhiteSpace(workspaceService.WorkspacePath)) {

RemoteLogViewer.WinUI/Views/Info/AboutPage.xaml

@@ -2,7 +2,6 @@
     x:Class="RemoteLogViewer.WinUI.Views.Info.AboutPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:RemoteLogViewer.Views.Info"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">

RemoteLogViewer.WinUI/Views/Info/LicensePage.xaml

@@ -2,7 +2,6 @@
     x:Class="RemoteLogViewer.WinUI.Views.Info.LicensePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:RemoteLogViewer.Views.Info"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:vm="using:RemoteLogViewer.Core.ViewModels.Info"

RemoteLogViewer.WinUI/Views/Settings/WorkspaceSettingsPage.xaml

@@ -13,7 +13,7 @@
 			<TextBox x:Name="PathTextBox" Text="{x:Bind ViewModel.SelectedPath.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="340" IsReadOnly="True" />
 			<Button Content="Browse..." Margin="8,0,0,0" Click="Browse_Click" />
 		</StackPanel>
-		<CheckBox x:Name="SkipCheckBox" IsChecked="{x:Bind ViewModel.SkipPersist.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="次回以降この確認を省略" Margin="0,12,0,0" Grid.Row="2" />
+		<CheckBox x:Name="SkipCheckBox" IsChecked="{x:Bind ViewModel.SkipPersist.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="Do not show this again." Margin="0,12,0,0" Grid.Row="2" />
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,20,0,0" Grid.Row="3">
 			<Button Content="Apply and exit" Click="Ok_Click" />
 		</StackPanel>

RemoteLogViewer.WinUI/Views/WorkspaceSelectionWindow.xaml

@@ -13,7 +13,7 @@
 			<TextBox x:Name="PathTextBox" Text="{x:Bind ViewModel.SelectedPath.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="340" IsReadOnly="True" />
 			<Button Content="Browse..." Margin="8,0,0,0" Click="Browse_Click" />
 		</StackPanel>
-		<CheckBox x:Name="SkipCheckBox" IsChecked="{x:Bind ViewModel.SkipPersist.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="次回以降この確認を省略" Margin="0,12,0,0" Grid.Row="2" />
+		<CheckBox x:Name="SkipCheckBox" IsChecked="{x:Bind ViewModel.SkipPersist.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="Do not show this again." Margin="0,12,0,0" Grid.Row="2" />
 		<Grid Grid.Row="3"/>
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,20,0,0" Grid.Row="4">
 			<Button Content="OK" Width="96" Click="Ok_Click" />