chore: 整理代码

Author: KiyanYang

src/DotVast.HashTool.WinUI/Activation/DefaultActivationHandler.cs

@@ -19,10 +19,10 @@ protected override bool CanHandleInternal(LaunchActivatedEventArgs args)
         return _navigationService.Frame?.Content is null;
     }
 
-    protected override async Task HandleInternalAsync(LaunchActivatedEventArgs args)
+    protected override Task HandleInternalAsync(LaunchActivatedEventArgs args)
     {
         _navigationService.NavigateTo(PageKey.HomePage, args.Arguments);
 
-        await Task.CompletedTask;
+        return Task.CompletedTask;
     }
 }

src/DotVast.HashTool.WinUI/Contracts/Services/Settings/IAppearanceSettingsService.cs

@@ -23,9 +23,4 @@ public interface IAppearanceSettingsService : IBaseObservableSettings
     /// 语言.
     /// </summary>
     AppLanguage Language { get; set; }
-
-    /// <summary>
-    /// 所有支持的语言.
-    /// </summary>
-    AppLanguage[] Languages { get; }
 }

src/DotVast.HashTool.WinUI/Services/CheckUpdateService.cs

@@ -28,10 +28,10 @@ public CheckUpdateService(
         _preferencesSettingsService = preferencesSettingsService;
     }
 
-    public async Task StartupAsync()
+    public Task StartupAsync()
     {
         _ = CheckForUpdateOnStartupAsync();
-        await Task.CompletedTask;
+        return Task.CompletedTask;
     }
 
     public async Task<GitHubRelease?> GetLatestGitHubReleaseAsync(bool includePreRelease = false)

src/DotVast.HashTool.WinUI/Services/HashTaskService.cs

@@ -9,12 +9,12 @@ internal sealed class HashTaskService : IHashTaskService
 {
     public ObservableCollection<HashTask> HashTasks { get; } = new();
 
-    public async Task StartupAsync()
+    public Task StartupAsync()
     {
         foreach (var item in HashTasks.Where(x => x.State == HashTaskState.Waiting))
         {
             _ = item.StartAsync();
         }
-        await Task.CompletedTask;
+        return Task.CompletedTask;
     }
 }

src/DotVast.HashTool.WinUI/Services/Settings/AppearanceSettingsService.cs

@@ -19,24 +19,18 @@ public override async Task InitializeAsync()
         _isAlwaysOnTop = Load(nameof(IsAlwaysOnTop), DefaultAppearanceSettings.IsAlwaysOnTop);
         _theme = Load(nameof(Theme), DefaultAppearanceSettings.Theme);
 
-        Language = string.IsNullOrWhiteSpace(WGAL.PrimaryLanguageOverride)
-            ? AppLanguage.System
-            : WGAL.PrimaryLanguageOverride.ToAppLanguage();
-
-        await InitializeTheme();
-        await Task.CompletedTask;
+        await InitializeThemeAsync();
     }
 
-    public override async Task StartupAsync()
+    public override Task StartupAsync()
     {
         SetIsAlwaysOnTop();
-        SetLanguage();
 
         Debug.Assert((App.MainWindow.Content as FrameworkElement)?.RequestedTheme == Theme.ToElementTheme());
         Debug.Assert(App.MainWindow.IsAlwaysOnTop == IsAlwaysOnTop);
         Debug.Assert(WGAL.PrimaryLanguageOverride == Language.ToTag());
 
-        await Task.CompletedTask;
+        return Task.CompletedTask;
     }
 
     #region HashFontFamilyName
@@ -78,7 +72,7 @@ private void SetTheme()
 
         TitleBarContextMenuHelper.UpdateTitleBarContextMenu(Theme);
     }
-    private async Task InitializeTheme()
+    private async Task InitializeThemeAsync()
     {
         if (App.MainWindow.Content is FrameworkElement rootElement)
         {
@@ -92,10 +86,8 @@ private async Task InitializeTheme()
     #endregion Theme
 
     #region Language
-    public AppLanguage[] Languages { get; } = Enum.GetValues<AppLanguage>();
-
     [ObservableProperty]
-    private AppLanguage _language;
+    private AppLanguage _language = WGAL.PrimaryLanguageOverride.ToAppLanguage();
 
     partial void OnLanguageChanged(AppLanguage value) =>
         SetLanguage();

src/DotVast.HashTool.WinUI/Services/Settings/PreferencesSettingsService.cs

@@ -13,31 +13,32 @@ public PreferencesSettingsService(IHashService hashService)
         _hashService = hashService;
     }
 
-    public override async Task InitializeAsync()
+    public override Task InitializeAsync()
     {
-        await InitializeHashSettings();
+        InitializeHashSettings();
         _fileExplorerContextMenusEnabled = Load(nameof(FileExplorerContextMenusEnabled), DefaultPreferencesSettings.FileExplorerContextMenusEnabled);
         _includePreRelease = Load(nameof(IncludePreRelease), DefaultPreferencesSettings.IncludePreRelease);
         _checkForUpdatesOnStartup = Load(nameof(CheckForUpdatesOnStartup), DefaultPreferencesSettings.CheckForUpdatesOnStartup);
         _startingWhenCreateHashTask = Load(nameof(StartingWhenCreateHashTask), DefaultPreferencesSettings.StartingWhenCreateHashTask);
+
+        return Task.CompletedTask;
     }
 
-    public override async Task StartupAsync()
+    public override Task StartupAsync()
     {
-        await Task.CompletedTask;
+        return Task.CompletedTask;
     }
 
     #region HashSettings
     public IReadOnlyList<HashSetting> HashSettings { get; private set; } = Array.Empty<HashSetting>();
 
-    private async Task InitializeHashSettings()
+    private void InitializeHashSettings()
     {
         var hashSettingsFromLocalSettings = _hashService.HashKinds.Select(kind =>
                 Load(SettingsContainerName.DataOptions_Hashes, kind.ToString(), default(HashSetting)))
             .OfType<HashSetting>()
             .ToArray();
         HashSettings = _hashService.GetMergedHashSettings(hashSettingsFromLocalSettings).ToArray();
-        await Task.CompletedTask;
     }
 
     public void SaveHashSetting(HashSetting hashSetting, bool forContextMenu = false)

src/DotVast.HashTool.WinUI/ViewModels/SettingsViewModel.cs

@@ -30,7 +30,7 @@ partial void OnIsAlwaysOnTopChanged(bool value) =>
 
     #region Language
 
-    public AppLanguage[] AppLanguages => _appearanceSettingsService.Languages;
+    public AppLanguage[] AppLanguages { get; } = Enum.GetValues<AppLanguage>();
 
     [ObservableProperty]
     private AppLanguage _appLanguage;