diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs index 1f42b91..7b4b661 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Constants +namespace BetterLyrics.WinUI3.Constants { public class PlayerName { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs index 0614ccd..53ef8c3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs @@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; using BetterLyrics.WinUI3.Serialization; using BetterLyrics.WinUI3.Services.LiveStatesService; -using BetterLyrics.WinUI3.Services.ResourceService; using BetterLyrics.WinUI3.Services.SettingsService; using BetterLyrics.WinUI3.ViewModels; using BetterLyrics.WinUI3.Views; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml.cs index bc99e76..cbc8d7c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml.cs @@ -1,22 +1,10 @@ using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Services.MediaSessionsService; 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 System.Threading.Tasks; -using System.Windows.Input; using Windows.ApplicationModel.DataTransfer; -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/Enums/LyricsSearchProvider.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchProvider.cs index 4f19ad7..d6ce300 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchProvider.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchProvider.cs @@ -1,7 +1,5 @@ // 2025/6/23 by Zhe Fang -using BetterLyrics.WinUI3.Helper; - namespace BetterLyrics.WinUI3.Enums { public enum LyricsSearchProvider diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs index e49f098..e0c83a3 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BetterLyrics.WinUI3.Enums +namespace BetterLyrics.WinUI3.Enums { public enum LyricsSearchType { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs index eea2c84..e83f9b5 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs @@ -1,7 +1,4 @@ using BetterLyrics.WinUI3.Enums; -using System; -using System.Collections.Generic; -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 a725858..8cbc374 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs @@ -1,8 +1,6 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Extensions { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/StringExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/StringExtensions.cs index 689cfb1..d3d0c77 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/StringExtensions.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/StringExtensions.cs @@ -1,9 +1,5 @@ using BetterLyrics.WinUI3.Enums; -using NTextCat.Commons; -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; namespace BetterLyrics.WinUI3.Extensions { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs index c200bfa..a4a9fbf 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.Models.Settings; using BetterLyrics.WinUI3.Serialization; using System; using System.IO; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MetadataComparer.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MetadataComparer.cs index b5f6eef..2c72d02 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MetadataComparer.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MetadataComparer.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using System.Text.RegularExpressions; namespace BetterLyrics.WinUI3.Helper diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs index 1c43e47..db02f6b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs @@ -1,7 +1,6 @@ using BetterLyrics.WinUI3.Services.ResourceService; using CommunityToolkit.Mvvm.DependencyInjection; using System; -using System.Linq; namespace BetterLyrics.WinUI3.Helper { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs index 8023ee4..7bda92b 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs @@ -1,5 +1,4 @@ using BetterLyrics.WinUI3.Constants; -using Lyricify.Lyrics.Providers; using System.Collections.Generic; using System.Text.RegularExpressions; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/STATaskHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/STATaskHelper.cs index e212e46..bfb97fe 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/STATaskHelper.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/STATaskHelper.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/AppHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/AppHook.cs index 5866d76..cf78d06 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/AppHook.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/AppHook.cs @@ -1,14 +1,9 @@ -using DevWinUI; -using Microsoft.UI.Xaml.Media.Imaging; +using Microsoft.UI.Xaml.Media.Imaging; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; using System.Drawing; using System.Drawing.Imaging; using System.IO; using System.Linq; -using System.Text; using System.Threading.Tasks; using Vanara.PInvoke; using Vanara.Windows.Shell; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs index 3873403..c9accda 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs @@ -14,7 +14,6 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using Vanara.PInvoke; -using Vanara.Windows.Shell; using Windows.ApplicationModel.Core; using Windows.Foundation; using WinRT.Interop; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs index 1353d69..3821b13 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs @@ -1,17 +1,11 @@ // 2025/6/23 by Zhe Fang using BetterLyrics.WinUI3.Collections; -using BetterLyrics.WinUI3.Constants; using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Hooks; -using BetterLyrics.WinUI3.ViewModels; using CommunityToolkit.Mvvm.ComponentModel; -using CommunityToolkit.Mvvm.DependencyInjection; -using Microsoft.UI.Xaml.Media.Imaging; using System; using System.Linq; -using System.Threading.Tasks; namespace BetterLyrics.WinUI3.Models { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs index 703a395..a08a74e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Text.RegularExpressions; namespace BetterLyrics.WinUI3.Parsers.LyricsParser diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs index 5aafe5c..0b9ec3e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs @@ -1,8 +1,6 @@ using BetterLyrics.WinUI3.Models; -using System; using System.Collections.Generic; using System.Linq; -using System.Text; namespace BetterLyrics.WinUI3.Parsers.LyricsParser { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs index 93f7151..542a713 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs @@ -1,9 +1,7 @@ using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; -using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Xml.Linq; namespace BetterLyrics.WinUI3.Parsers.LyricsParser diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs index e47c8af..6c55354 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs @@ -5,12 +5,8 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; using Lyricify.Lyrics.Parsers; -using System; using System.Collections.Generic; -using System.Drawing; using System.Linq; -using System.Text.RegularExpressions; -using System.Xml.Linq; namespace BetterLyrics.WinUI3.Parsers.LyricsParser { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Providers/AppleMusic.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Providers/AppleMusic.cs index 4d4a34a..4a66b84 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Providers/AppleMusic.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Providers/AppleMusic.cs @@ -1,7 +1,6 @@ using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; using BetterLyrics.WinUI3.Models; -using Lyricify.Lyrics.Providers.Web.QQMusic; using System; using System.Net; using System.Net.Http; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs index 0ec04a8..a12a582 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs @@ -18,10 +18,8 @@ using System.IO; using System.Linq; using System.Net.Http; using System.Text.Json; -using System.Text.Json.Nodes; using System.Threading; using System.Threading.Tasks; -using System.Windows.Documents; namespace BetterLyrics.WinUI3.Services.LyricsSearchService { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs index b58ba07..86a3cb9 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs @@ -23,9 +23,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging.Messages; using CommunityToolkit.WinUI; -using DevWinUI; using EvtSource; -using Lyricify.Lyrics.Providers; using Microsoft.Extensions.Logging; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml.Controls; @@ -34,7 +32,6 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; using System.Text.Json; -using System.Threading; using System.Threading.Tasks; using Vanara.Windows.Shell; using Windows.Media.Control; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/RaindropEffect.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/RaindropEffect.cs index 75ded82..4a8c180 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/RaindropEffect.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/RaindropEffect.cs @@ -1,8 +1,5 @@ using ComputeSharp; using ComputeSharp.D2D1; -using System; -using System.Collections.Generic; -using System.Text; namespace BetterLyrics.WinUI3.Shaders { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/SnowEffect.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/SnowEffect.cs index 1956fec..9fb5e3c 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/SnowEffect.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Shaders/SnowEffect.cs @@ -1,6 +1,5 @@ using ComputeSharp; using ComputeSharp.D2D1; -using static Vanara.PInvoke.Ole32.PROPERTYKEY.System; namespace BetterLyrics.WinUI3.Shaders { diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs index a16dd82..238816e 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs @@ -1,9 +1,7 @@ using BetterLyrics.WinUI3.Enums; using BetterLyrics.WinUI3.Extensions; using BetterLyrics.WinUI3.Helper; -using BetterLyrics.WinUI3.Shaders; using CommunityToolkit.WinUI; -using ComputeSharp.D2D1.WinUI; using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Brushes; using Microsoft.Graphics.Canvas.Effects; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs index 5034524..2cce1ee 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs @@ -16,7 +16,6 @@ using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Geometry; using Microsoft.Graphics.Canvas.Text; using Microsoft.UI; -using Microsoft.UI.Dispatching; using Microsoft.UI.Text; using Microsoft.UI.Xaml; using System; diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs index 0a85078..c3cf5d4 100644 --- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs +++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs @@ -118,8 +118,8 @@ namespace BetterLyrics.WinUI3.ViewModels ((SongInfo?)_mediaSessionsService.CurrentSongInfo?.Clone() ?? new()) .WithTitle(MappedSongSearchQuery.MappedTitle) .WithArtist(MappedSongSearchQuery.MappedArtist.SplitByCommonSplitter()) - .WithAlbum(MappedSongSearchQuery.MappedAlbum), - !_settingsService.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, + .WithAlbum(MappedSongSearchQuery.MappedAlbum), + !_settingsService.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, token); return result; }, token)];