diff --git a/Convs/AboutVersionButtonContentConv.cs b/Convs/AboutVersionButtonContentConv.cs index bc1a279..fbaa41a 100644 --- a/Convs/AboutVersionButtonContentConv.cs +++ b/Convs/AboutVersionButtonContentConv.cs @@ -14,8 +14,5 @@ internal class AboutVersionButtonContentConv : IMultiValueConverter return VersionButtonContent + version; } - public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Convs/MainContentBoxForegroundConv.cs b/Convs/MainContentBoxForegroundConv.cs index 87ea598..320f3dc 100644 --- a/Convs/MainContentBoxForegroundConv.cs +++ b/Convs/MainContentBoxForegroundConv.cs @@ -11,35 +11,20 @@ internal class MainContentBoxForegroundConv : IMultiValueConverter public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { MainConst.SettingsMode? mode = values[0] as MainConst.SettingsMode?; - bool? isFocused = values[1] as bool?; - string? browserPath = values[2] as string; - string? upstreamUrl = values[3] as string; - string? extraArgs = values[4] as string; + string? browserPath = values[1] as string; + string? upstreamUrl = values[2] as string; + string? extraArgs = values[3] as string; - if (!(bool)isFocused!) + switch (mode) { - switch (mode) - { - case MainConst.SettingsMode.BrowserPathMode: - if (browserPath == MainConst.BrowserPathPlaceHolder) - return new SolidColorBrush(Color.FromRgb(191, 205, 219)); - break; - case MainConst.SettingsMode.UpstreamUrlMode: - if (upstreamUrl == MainConst.UpstreamUrlPlaceHolder) - return new SolidColorBrush(Color.FromRgb(191, 205, 219)); - break; - case MainConst.SettingsMode.ExtraArgsMode: - if (extraArgs == MainConst.ExtraArgsPlaceHolder) - return new SolidColorBrush(Color.FromRgb(191, 205, 219)); - break; - } + case MainConst.SettingsMode.BrowserPathMode when browserPath == MainConst.BrowserPathPlaceHolder: + case MainConst.SettingsMode.UpstreamUrlMode when upstreamUrl == MainConst.UpstreamUrlPlaceHolder: + case MainConst.SettingsMode.ExtraArgsMode when extraArgs == MainConst.ExtraArgsPlaceHolder: + return new SolidColorBrush(Color.FromRgb(191, 205, 219)); } return new SolidColorBrush(Color.FromRgb(0, 0, 0)); } - public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Convs/MainContentBoxTextConv.cs b/Convs/MainContentBoxTextConv.cs index f3c3e48..68fe4ab 100644 --- a/Convs/MainContentBoxTextConv.cs +++ b/Convs/MainContentBoxTextConv.cs @@ -15,41 +15,17 @@ internal class MainContentBoxTextConv : IMultiValueConverter string? upstreamUrl = values[3] as string; string? extraArgs = values[4] as string; - if (mode == MainConst.SettingsMode.BrowserPathMode) + return mode switch { - if ((bool)!isFocused! && string.IsNullOrEmpty(browserPath)) - return MainConst.BrowserPathPlaceHolder; - else if ((bool)isFocused! && browserPath == MainConst.BrowserPathPlaceHolder) - return string.Empty; - else - return browserPath!; - } - else if (mode == MainConst.SettingsMode.UpstreamUrlMode) - { - if ((bool)!isFocused! && string.IsNullOrEmpty(upstreamUrl)) - return MainConst.UpstreamUrlPlaceHolder; - else if ((bool)isFocused! && upstreamUrl == MainConst.UpstreamUrlPlaceHolder) - return string.Empty; - else - return upstreamUrl!; - } - else if (mode == MainConst.SettingsMode.ExtraArgsMode) - { - if ((bool)!isFocused! && string.IsNullOrEmpty(extraArgs)) - return MainConst.ExtraArgsPlaceHolder; - else if ((bool)isFocused! && extraArgs == MainConst.ExtraArgsPlaceHolder) - return string.Empty; - else - return extraArgs!; - } - else - { - throw new UnreachableException(); - } + MainConst.SettingsMode.BrowserPathMode => !isFocused.GetValueOrDefault() && string.IsNullOrEmpty(browserPath) ? MainConst.BrowserPathPlaceHolder : + isFocused.GetValueOrDefault() && browserPath == MainConst.BrowserPathPlaceHolder ? string.Empty : browserPath!, + MainConst.SettingsMode.UpstreamUrlMode => !isFocused.GetValueOrDefault() && string.IsNullOrEmpty(upstreamUrl) ? MainConst.UpstreamUrlPlaceHolder : + isFocused.GetValueOrDefault() && upstreamUrl == MainConst.UpstreamUrlPlaceHolder ? string.Empty : upstreamUrl!, + MainConst.SettingsMode.ExtraArgsMode => !isFocused.GetValueOrDefault() && string.IsNullOrEmpty(extraArgs) ? MainConst.ExtraArgsPlaceHolder : + isFocused.GetValueOrDefault() && extraArgs == MainConst.ExtraArgsPlaceHolder ? string.Empty : extraArgs!, + _ => throw new UnreachableException(), + }; } - public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture) - { - throw new NotImplementedException(); - } + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Convs/MainFunctionButtonContentConv.cs b/Convs/MainFunctionButtonContentConv.cs index 4ec2881..629bd5c 100644 --- a/Convs/MainFunctionButtonContentConv.cs +++ b/Convs/MainFunctionButtonContentConv.cs @@ -12,18 +12,14 @@ internal class MainFunctionButtonContentConv : IValueConverter { MainConst.SettingsMode? mode = value as MainConst.SettingsMode?; - if (mode == MainConst.SettingsMode.BrowserPathMode) - return MainConst.FunctionButtonBrowserPathContent; - else if (mode == MainConst.SettingsMode.UpstreamUrlMode) - return MainConst.FunctionButtonUpstreamUrlContent; - else if (mode == MainConst.SettingsMode.ExtraArgsMode) - return MainConst.FunctionButtonExtraArgsContent; - - throw new UnreachableException(); + return mode switch + { + MainConst.SettingsMode.BrowserPathMode => MainConst.FunctionButtonBrowserPathContent, + MainConst.SettingsMode.UpstreamUrlMode => MainConst.FunctionButtonUpstreamUrlContent, + MainConst.SettingsMode.ExtraArgsMode => MainConst.FunctionButtonExtraArgsContent, + _ => throw new UnreachableException() + }; } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Convs/MainStartCealButtonIsEnabledConv.cs b/Convs/MainStartCealButtonIsEnabledConv.cs index 81052d2..680abf0 100644 --- a/Convs/MainStartCealButtonIsEnabledConv.cs +++ b/Convs/MainStartCealButtonIsEnabledConv.cs @@ -13,14 +13,8 @@ internal class MainStartCealButtonIsEnabledConv : IMultiValueConverter string? browserPath = values[0] as string; string? extraArgs = values[1] as string; - if (File.Exists(browserPath) && Path.GetFileName(browserPath).ToLower().EndsWith(".exe") && (MainConst.ExtraArgsRegex().IsMatch(extraArgs!) || extraArgs == MainConst.ExtraArgsPlaceHolder)) - return true; - - return false; + return File.Exists(browserPath) && Path.GetFileName(browserPath).ToLower().EndsWith(".exe") && (MainConst.ExtraArgsRegex().IsMatch(extraArgs!) || extraArgs == MainConst.ExtraArgsPlaceHolder); } - public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Convs/MainSwitchModeButtonContentConv.cs b/Convs/MainSwitchModeButtonContentConv.cs index be8e201..6b3f45b 100644 --- a/Convs/MainSwitchModeButtonContentConv.cs +++ b/Convs/MainSwitchModeButtonContentConv.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.Globalization; using System.Windows.Data; using Sheas_Cealer.Consts; @@ -12,18 +11,14 @@ internal class MainSwitchModeButtonContentConv : IValueConverter { MainConst.SettingsMode? mode = value as MainConst.SettingsMode?; - if (mode == MainConst.SettingsMode.BrowserPathMode) - return MainConst.SwitchModeButtonBrowserPathContent; - else if (mode == MainConst.SettingsMode.UpstreamUrlMode) - return MainConst.SwitchModeButtonUpstreamUrlContent; - else if (mode == MainConst.SettingsMode.ExtraArgsMode) - return MainConst.SwitchModeButtonExtraArgsContent; - - throw new UnreachableException(); + return mode switch + { + MainConst.SettingsMode.BrowserPathMode => MainConst.SwitchModeButtonBrowserPathContent, + MainConst.SettingsMode.UpstreamUrlMode => MainConst.SwitchModeButtonUpstreamUrlContent, + MainConst.SettingsMode.ExtraArgsMode => MainConst.SwitchModeButtonExtraArgsContent, + _ => throw new NotImplementedException() + }; } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Convs/MainUpdateHostButtonIsEnabledConv.cs b/Convs/MainUpdateHostButtonIsEnabledConv.cs index 21a820d..367304f 100644 --- a/Convs/MainUpdateHostButtonIsEnabledConv.cs +++ b/Convs/MainUpdateHostButtonIsEnabledConv.cs @@ -11,14 +11,8 @@ internal class MainUpdateHostButtonIsEnabledConv : IValueConverter { string? upstreamUrl = value as string; - if (MainConst.UpstreamUrlRegex().IsMatch(upstreamUrl!)) - return true; - - return false; + return MainConst.UpstreamUrlRegex().IsMatch(upstreamUrl!); } - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); } \ No newline at end of file diff --git a/Preses/MainPres.cs b/Preses/MainPres.cs index 2c64e83..b413a87 100644 --- a/Preses/MainPres.cs +++ b/Preses/MainPres.cs @@ -32,7 +32,7 @@ internal partial class MainPres : ObservableObject [ObservableProperty] private string browserPath; - private partial void OnBrowserPathChanged(string value) + partial void OnBrowserPathChanged(string value) { if (File.Exists(value) && Path.GetFileName(value).ToLower().EndsWith(".exe")) { @@ -43,7 +43,7 @@ internal partial class MainPres : ObservableObject [ObservableProperty] private string upstreamUrl; - private partial void OnUpstreamUrlChanged(string value) + partial void OnUpstreamUrlChanged(string value) { if (MainConst.UpstreamUrlRegex().IsMatch(value)) { @@ -54,7 +54,7 @@ internal partial class MainPres : ObservableObject [ObservableProperty] private string extraArgs; - private partial void OnExtraArgsChanged(string value) + partial void OnExtraArgsChanged(string value) { if (MainConst.ExtraArgsRegex().IsMatch(value)) { diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml index a8ed90e..b21c1a0 100644 --- a/Wins/MainWin.xaml +++ b/Wins/MainWin.xaml @@ -62,7 +62,6 @@ - diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs index 1aa3d46..b792ca8 100644 --- a/Wins/MainWin.xaml.cs +++ b/Wins/MainWin.xaml.cs @@ -37,11 +37,7 @@ public partial class MainWin : Window private void MainWin_DragEnter(object sender, DragEventArgs e) { - if (e.Data.GetDataPresent(DataFormats.FileDrop)) - e.Effects = DragDropEffects.Link; - else - e.Effects = DragDropEffects.None; - + e.Effects = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Link : DragDropEffects.None; e.Handled = true; } private void MainWin_Drop(object sender, DragEventArgs e) @@ -82,12 +78,13 @@ public partial class MainWin : Window } private void SwitchModeButton_Click(object sender, RoutedEventArgs e) { - if (MainPres!.Mode == MainConst.SettingsMode.BrowserPathMode) - MainPres!.Mode = MainConst.SettingsMode.UpstreamUrlMode; - else if (MainPres!.Mode == MainConst.SettingsMode.UpstreamUrlMode) - MainPres!.Mode = MainConst.SettingsMode.ExtraArgsMode; - else if (MainPres!.Mode == MainConst.SettingsMode.ExtraArgsMode) - MainPres!.Mode = MainConst.SettingsMode.BrowserPathMode; + MainPres!.Mode = MainPres!.Mode switch + { + MainConst.SettingsMode.BrowserPathMode => MainConst.SettingsMode.UpstreamUrlMode, + MainConst.SettingsMode.UpstreamUrlMode => MainConst.SettingsMode.ExtraArgsMode, + MainConst.SettingsMode.ExtraArgsMode => MainConst.SettingsMode.BrowserPathMode, + _ => throw new UnreachableException() + }; } private void StartCealButton_Click(object sender, RoutedEventArgs e)