diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs index 5c8a80a..eabb8c7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs @@ -18,7 +18,6 @@ using BetterLyrics.WinUI3.Services.TransliterationService; using BetterLyrics.WinUI3.ViewModels; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.DependencyInjection; -using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -26,7 +25,6 @@ using Microsoft.UI.Xaml; using Microsoft.Windows.AppLifecycle; // 关键：App生命周期管理 using Serilog; using System; -using System.IO; using System.Linq; using System.Text; using System.Threading; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs index 19f868e..5905b52 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs @@ -1,8 +1,6 @@ using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media; -using System.Threading.Tasks; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs index dd41999..5441b44 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Views; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs index f513b1b..fa0f849 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs @@ -5,9 +5,9 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Logic; using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Renderer; -using BetterLyrics.WinUI3.Services.LastFMService; using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.Services.SettingsService; using CommunityToolkit.Mvvm.DependencyInjection; @@ -25,8 +25,6 @@ using System.Threading.Tasks; using Windows.Foundation; using Windows.Storage.Streams; using Windows.UI; -using System.Numerics; -using BetterLyrics.WinUI3.Models.Lyrics; namespace BetterLyrics.WinUI3.Controls { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs index 38a7daa..cadf33b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Services.SettingsService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs index 310a518..516d84b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs @@ -1,12 +1,8 @@ -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Threading.Tasks; -using Windows.System; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs index ebdb910..4fedb37 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs @@ -1,20 +1,14 @@ using BetterLyrics.WinUI3.Enums; +using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Settings; -using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.ViewModels; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.DependencyInjection; -using CommunityToolkit.Mvvm.Messaging; -using CommunityToolkit.Mvvm.Messaging.Messages; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media.Imaging; using System; using System.Numerics; -using BetterLyrics.WinUI3.Extensions; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PatronControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PatronControl.xaml.cs index ef96296..8e006d5 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PatronControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PatronControl.xaml.cs @@ -1,17 +1,5 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlayQueue.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlayQueue.xaml.cs index a219ae8..7f5cfee 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlayQueue.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlayQueue.xaml.cs @@ -6,18 +6,9 @@ using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using System; -using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -41,7 +32,7 @@ namespace BetterLyrics.WinUI3.Controls var targetItem = ViewModel.SMTCService.TrackPlayingQueue .ElementAtOrDefault(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex); if (targetItem == null) return; - + PlayingQueueListView.ScrollIntoView(targetItem); } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs index d4c0018..5069261 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.LocalizationService; using BetterLyrics.WinUI3.Views; @@ -143,7 +142,7 @@ namespace BetterLyrics.WinUI3.Controls { ProgressBar.Visibility = visibility; } - + private void CheckPathForWarning() { string? path = PathBox.Text?.Trim(); diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml.cs index 883c19c..788bc45 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml.cs @@ -1,20 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.DependencyInjection; -using BetterLyrics.WinUI3.Enums; +using Microsoft.UI.Xaml.Controls; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs index da4de11..943f584 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DoubleToDecimalConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DoubleToDecimalConverter.cs index 1afa2cc..91d0c1a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DoubleToDecimalConverter.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DoubleToDecimalConverter.cs @@ -1,7 +1,5 @@ using Microsoft.UI.Xaml.Data; using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Converter { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs index 9f77e6f..82fc679 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs @@ -2,9 +2,7 @@ using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Media.Imaging; using System; -using System.Collections.Generic; using System.IO; -using System.Text; namespace BetterLyrics.WinUI3.Converter { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/UriStringToDecodedAbsoluteUri.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/UriStringToDecodedAbsoluteUri.cs index 1f2ad98..9435d32 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/UriStringToDecodedAbsoluteUri.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/UriStringToDecodedAbsoluteUri.cs @@ -1,8 +1,6 @@ using BetterLyrics.WinUI3.Extensions; using Microsoft.UI.Xaml.Data; using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Converter { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs index e9d40a7..d775029 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Enums +namespace BetterLyrics.WinUI3.Enums { public enum AutoScanInterval { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs index 00aa951..7345193 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Enums +namespace BetterLyrics.WinUI3.Enums { public enum StatsRange { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs index de14bad..52ad60f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs @@ -1,5 +1,4 @@ -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Settings; +using BetterLyrics.WinUI3.Models.Settings; using System; using System.Collections.Generic; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs index 0cd080a..011748b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs @@ -3,7 +3,6 @@ using BetterLyrics.WinUI3.Models.Lyrics; using System; using System.Collections.Generic; using System.Linq; -using System.Text; namespace BetterLyrics.WinUI3.Extensions { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs index 09e91e4..5a826c6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs @@ -1,6 +1,4 @@ using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Helper; -using System; namespace BetterLyrics.WinUI3.Extensions { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs index 0c4d4a1..6c604e1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.LocalizationService; using BetterLyrics.WinUI3.Views; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs index 1842b98..5b76ed6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs @@ -4,7 +4,6 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Hooks; using Microsoft.UI; using Microsoft.UI.Xaml; -using SkiaSharp; using System; using System.Collections.Generic; using System.Drawing.Imaging; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs index 20dbc6c..ead8a61 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs @@ -3,7 +3,6 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Serialization; using System; using System.Collections.Generic; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs index 26c8587..41e8604 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs @@ -1,9 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Collections.ObjectModel; -using BetterLyrics.WinUI3.Models; +using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; public static class FolderTreeBuilder { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs index a6ba732..c486bfa 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs @@ -3,7 +3,6 @@ using BetterLyrics.WinUI3.Services.LocalizationService; using CommunityToolkit.Mvvm.DependencyInjection; using NTextCat; using System.Collections.Generic; -using System.ComponentModel.Design; using System.Globalization; using System.Linq; using Windows.Globalization; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WebDavProbeHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WebDavProbeHelper.cs index b609525..daf2744 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WebDavProbeHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WebDavProbeHelper.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; using System.Net; using System.Net.Http; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Helper diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs index 0348a75..c89a335 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs @@ -7,7 +7,6 @@ using FlaUI.Core.EventHandlers; using FlaUI.UIA3; using Microsoft.UI.Dispatching; using System; -using System.Diagnostics; using System.Drawing; using System.Threading; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs index 413cc90..d7cfa7f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs @@ -1,7 +1,6 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Views; using CommunityToolkit.WinUI; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs index bfbca72..ec8937e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs @@ -1,9 +1,7 @@ -using ATL; -using BetterLyrics.WinUI3.Helper; +using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using DevWinUI; -using Microsoft.UI.Xaml; using System; using System.Collections.Generic; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs index d82ee8d..3c8e342 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Models.Settings; using Microsoft.Graphics.Canvas.UI.Xaml; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs index a3861be..8f8cfd0 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/LyricsCacheDbContext.cs @@ -1,7 +1,4 @@ using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Models.DbContext { @@ -9,6 +6,6 @@ namespace BetterLyrics.WinUI3.Models.DbContext { public LyricsCacheDbContext(DbContextOptions options) : base(options) { } - public DbSet LyricsCache { get; set; } + public DbSet LyricsCache { get; set; } } } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs index 244c259..d3414e1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/PlayHistoryDbContext.cs @@ -1,8 +1,5 @@ using BetterLyrics.WinUI3.Models.Entities; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Models.DbContext { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs index bc86c59..0258f2a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DbContext/SongSearchMapDbContext.cs @@ -1,7 +1,4 @@ using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Models.DbContext { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs index b67461a..ff80b22 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Entities/LyricsCacheItem.cs @@ -1,8 +1,6 @@ using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Extensions; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.EntityFrameworkCore; -using NTextCat.Commons; using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FolderNode.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FolderNode.cs index 7a36b16..6082e37 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FolderNode.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FolderNode.cs @@ -1,9 +1,6 @@ using BetterLyrics.WinUI3.Enums; using CommunityToolkit.Mvvm.ComponentModel; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Text; namespace BetterLyrics.WinUI3.Models { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs index f2a6e36..d622c88 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsChar.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models.Lyrics +namespace BetterLyrics.WinUI3.Models.Lyrics { public class LyricsChar { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs index 41d37c4..c961138 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsChar.cs @@ -1,8 +1,5 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; -using System; -using System.Collections.Generic; -using System.Text; using Windows.Foundation; namespace BetterLyrics.WinUI3.Models.Lyrics diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs index ab45cfa..ba86cc7 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs @@ -5,12 +5,9 @@ using Microsoft.Graphics.Canvas.Geometry; using Microsoft.Graphics.Canvas.Text; using Microsoft.Graphics.Canvas.UI.Xaml; using Microsoft.UI; -using System; using System.Collections.Generic; using System.Linq; using System.Numerics; -using System.Windows.Documents; -using Windows.Foundation; using Windows.UI; namespace BetterLyrics.WinUI3.Models.Lyrics diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs index 33c563f..f1ff38c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MediaFolder.cs @@ -6,7 +6,6 @@ using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.UI.Xaml.Controls; using System; using System.Text.Json.Serialization; -using System.Threading; namespace BetterLyrics.WinUI3.Models.Settings { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs index 5c0eb89..213084f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Enums; using CommunityToolkit.Mvvm.ComponentModel; -using System; using System.Collections.ObjectModel; namespace BetterLyrics.WinUI3.Models.Settings diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs index fc4737a..39c6584 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/SongsTabInfo.cs @@ -1,6 +1,5 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.ViewModels; -using CommunityToolkit.Mvvm.ComponentModel; namespace BetterLyrics.WinUI3.Models.Settings { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs index 197fe2f..177cf21 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs @@ -1,7 +1,6 @@ // 2025/6/23 by Zhe Fang using CommunityToolkit.Mvvm.ComponentModel; -using NTextCat.Commons; using System; namespace BetterLyrics.WinUI3.Models diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/ArtistPlayCount.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/ArtistPlayCount.cs index 89407ab..ba533ce 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/ArtistPlayCount.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/ArtistPlayCount.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models.Stats +namespace BetterLyrics.WinUI3.Models.Stats { public class ArtistPlayCount { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/HourlyStatBar.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/HourlyStatBar.cs index 22435a4..7b215bc 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/HourlyStatBar.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/HourlyStatBar.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models.Stats +namespace BetterLyrics.WinUI3.Models.Stats { public class HourlyStatBar { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/PlayerStats.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/PlayerStats.cs index a2eeb07..742c3b5 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/PlayerStats.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/PlayerStats.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models.Stats +namespace BetterLyrics.WinUI3.Models.Stats { public class PlayerStats { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/SongPlayCount.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/SongPlayCount.cs index 30e3966..3b0dbe4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/SongPlayCount.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/SongPlayCount.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Models.Stats +namespace BetterLyrics.WinUI3.Models.Stats { public class SongPlayCount { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs index c73b0f7..41a4a25 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs @@ -1,5 +1,4 @@ -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Lyrics; +using BetterLyrics.WinUI3.Models.Lyrics; using System.Collections.Generic; using System.Linq; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs index 33044e6..e9e42ff 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Models.Lyrics; using System.Collections.Generic; using System.Linq; -using System.Text.RegularExpressions; using System.Xml.Linq; namespace BetterLyrics.WinUI3.Parsers.LyricsParser diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs index 48f4e3a..05a5aba 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/PlayingLineRenderer.cs @@ -8,7 +8,6 @@ using Microsoft.Graphics.Canvas.Effects; using Microsoft.Graphics.Canvas.Text; using Microsoft.Graphics.Canvas.UI.Xaml; using System; -using System.Linq; using System.Numerics; using Windows.Foundation; using Windows.UI; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs index 3e41cc3..8c6440f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs @@ -4,7 +4,6 @@ using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.DbContext; using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; -using BetterLyrics.WinUI3.Services.FileSystemService.Providers; using BetterLyrics.WinUI3.Services.LocalizationService; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.ViewModels; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs index d390e1f..37ea444 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs @@ -1,7 +1,5 @@ -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Entities; +using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; -using BetterLyrics.WinUI3.Services.FileSystemService.Providers; using System; using System.Collections.Generic; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs index 4963e53..483999b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; using FluentFTP; @@ -7,7 +6,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Net; // 用于 WebUtility.UrlDecode -using System.Text; // ★ 修复 Encoding 报错的关键 using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs index 8df48bc..004682f 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs index 41f9a3a..3f2b9e4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; using SMBLibrary; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs index 605e0b0..9dccef1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Settings; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs index 6df9ce2..324e9ee 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.AlbumArtUpdater.cs @@ -10,7 +10,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media.Imaging; using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs index a7dcacc..6e07066 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.LyricsUpdater.cs @@ -4,9 +4,7 @@ using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Lyrics; using BetterLyrics.WinUI3.Parsers.LyricsParser; using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.WinUI; using Microsoft.Extensions.Logging; -using Microsoft.UI.Dispatching; using System.Threading; using System.Threading.Tasks; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.cs index 114ed14..4f94e58 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/GSMTCService/GSMTCService.cs @@ -3,7 +3,6 @@ using BetterLyrics.WinUI3.Collections; using BetterLyrics.WinUI3.Constants; using BetterLyrics.WinUI3.Enums; -using BetterLyrics.WinUI3.Events; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; @@ -29,7 +28,6 @@ using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using System; -using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; using System.Text.Json; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/ILyricsCacheService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/ILyricsCacheService.cs index d3bf65c..d4e5495 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/ILyricsCacheService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/ILyricsCacheService.cs @@ -1,8 +1,5 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Models; -using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.LyricsCacheService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs index fae8ba7..da0e998 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsCacheService/LyricsCacheService.cs @@ -3,9 +3,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.DbContext; using Microsoft.EntityFrameworkCore; -using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.LyricsCacheService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs index 59552a8..d3f019d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs @@ -14,7 +14,6 @@ using BetterLyrics.WinUI3.Services.SongSearchMapService; using Lyricify.Lyrics.Helpers; using Lyricify.Lyrics.Searchers; using Microsoft.Extensions.Logging; -using NTextCat.Commons; using System; using System.Collections.Generic; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs index 567b582..ccddda4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/IPlayHistoryService.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Models.Stats; using System; using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.PlayHistoryService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs index a02cf7b..82d3fd3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlayHistoryService/PlayHistoryService.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Models.DbContext; using BetterLyrics.WinUI3.Models.Entities; using BetterLyrics.WinUI3.Models.Stats; -using BetterLyrics.WinUI3.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; @@ -199,11 +198,11 @@ namespace BetterLyrics.WinUI3.Services.PlayHistoryService ("Summer", "Calvin Harris", "Motion"), }; - var playerIds = new[] - { - PlayerId.Spotify, PlayerId.Spotify, PlayerId.Spotify, - PlayerId.MusicBee, PlayerId.MusicBee, - PlayerId.QQMusic, + var playerIds = new[] + { + PlayerId.Spotify, PlayerId.Spotify, PlayerId.Spotify, + PlayerId.MusicBee, PlayerId.MusicBee, + PlayerId.QQMusic, PlayerId.NetEaseCloudMusic, PlayerId.AppleMusic, }; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/ISMTCService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/ISMTCService.cs index cae3782..bc1a847 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/ISMTCService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/ISMTCService.cs @@ -1,8 +1,5 @@ using BetterLyrics.WinUI3.Models; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.SMTCService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs index f21c67f..4d9785c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SMTCService/SMTCService.cs @@ -4,20 +4,16 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Entities; -using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.FileSystemService; -using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml.Controls; using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.IO; using System.Linq; -using System.Text; using System.Threading.Tasks; using Windows.ApplicationModel; using Windows.Media; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs index 86788ab..d389941 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs @@ -4,7 +4,6 @@ using BetterLyrics.WinUI3.Collections; using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Services.LocalizationService; @@ -12,10 +11,8 @@ using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.WinUI; using Microsoft.UI.Dispatching; using System; -using System.Globalization; using System.IO; using System.Linq; -using Windows.ApplicationModel.Resources; using Windows.Globalization; namespace BetterLyrics.WinUI3.Services.SettingsService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/ISongSearchMapService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/ISongSearchMapService.cs index d96ce13..f108d0d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/ISongSearchMapService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SongSearchMapService/ISongSearchMapService.cs @@ -1,7 +1,4 @@ using BetterLyrics.WinUI3.Models; -using System; -using System.Collections.Generic; -using System.Text; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Services.SongSearchMapService diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs index 3c162e0..3c73c7a 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TransliterationService/TransliterationService.cs @@ -1,5 +1,4 @@ -using BetterLyrics.WinUI3.Models; -using BetterLyrics.WinUI3.Models.Http; +using BetterLyrics.WinUI3.Models.Http; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Services.SettingsService; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs index 4b79b0d..f1257f6 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs @@ -13,7 +13,6 @@ using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using System.Collections.ObjectModel; -using System.Linq; using System.Threading.Tasks; namespace BetterLyrics.WinUI3.ViewModels diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs index f25ea73..b180025 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.FileSystemService; using BetterLyrics.WinUI3.Services.LocalizationService; @@ -10,7 +9,6 @@ using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Views; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using CommunityToolkit.WinUI.Animations; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using System; @@ -18,7 +16,6 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using static Vanara.PInvoke.Shell32; namespace BetterLyrics.WinUI3.ViewModels { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs index 6e3cef1..e3fd3ca 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs @@ -22,16 +22,10 @@ using Microsoft.UI.Xaml.Controls; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; -using Windows.ApplicationModel; -using Windows.Media; -using Windows.Media.Core; -using Windows.Media.Playback; using Windows.Storage; -using Windows.Storage.Streams; namespace BetterLyrics.WinUI3.ViewModels { @@ -370,9 +364,9 @@ namespace BetterLyrics.WinUI3.ViewModels [RelayCommand] private void ToggleSongListViewSelectionMode() { - SongListViewSelectionMode = - SongListViewSelectionMode == ListViewSelectionMode.Single ? - ListViewSelectionMode.Multiple : + SongListViewSelectionMode = + SongListViewSelectionMode == ListViewSelectionMode.Single ? + ListViewSelectionMode.Multiple : ListViewSelectionMode.Single; } diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlayQueueViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlayQueueViewModel.cs index 412dac0..a36fec1 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlayQueueViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlayQueueViewModel.cs @@ -1,11 +1,7 @@ -using BetterLyrics.WinUI3.Controls; -using BetterLyrics.WinUI3.Models.Settings; +using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Services.SMTCService; using CommunityToolkit.Mvvm.ComponentModel; -using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.ViewModels { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs index aec5795..29caeb9 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs @@ -1,9 +1,7 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; -using BetterLyrics.WinUI3.Services.LastFMService; using BetterLyrics.WinUI3.Services.GSMTCService; - +using BetterLyrics.WinUI3.Services.LastFMService; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.Services.TranslationService; using BetterLyrics.WinUI3.Services.TransliterationService; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs index 2216c3d..6c83623 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/StatsDashboardControlViewModel.cs @@ -12,21 +12,13 @@ using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using CommunityToolkit.WinUI; using LiveChartsCore; -using LiveChartsCore.Kernel; -using LiveChartsCore.Kernel.Sketches; using LiveChartsCore.SkiaSharpView; -using LiveChartsCore.SkiaSharpView.Painting; -using LiveChartsCore.Themes; using Microsoft.UI.Dispatching; -using Microsoft.UI.Xaml; -using SkiaSharp; -using SkiaSharp.Views.Windows; using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; -using System.Xml.Linq; namespace BetterLyrics.WinUI3.ViewModels { @@ -73,8 +65,8 @@ namespace BetterLyrics.WinUI3.ViewModels [ObservableProperty] public partial ObservableCollection TopSongs { get; set; } = new(); public StatsDashboardControlViewModel( - IPlayHistoryService playHistoryService, - ILocalizationService localizationService, + IPlayHistoryService playHistoryService, + ILocalizationService localizationService, IAlbumArtSearchService albumArtSearchService, IGSMTCService gsmtcService) { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs index 0264983..ce7929d 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Controls; using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.ViewModels; @@ -14,7 +13,6 @@ using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media.Imaging; using System.Threading.Tasks; -using static Vanara.PInvoke.AdvApi32; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs index 7b848b9..2ab739e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/NowPlayingWindow.xaml.cs @@ -4,7 +4,6 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Models.Settings; using BetterLyrics.WinUI3.Services.GSMTCService; using BetterLyrics.WinUI3.Services.SettingsService;