fix: amll-ttml-db search rule

chores: rollback media app icon and name fetch algo; add new lyrics search type: best match
chores: Change fallback name for playback source
2026-01-13 03:34:55 +08:00 · 2025-11-18 20:38:27 -05:00 · 2025-11-18 19:07:37 -05:00 · 2025-11-18 09:21:13 -05:00 · 2025-11-18 08:50:26 -05:00 · 2025-11-17 22:16:08 -05:00
278 changed files with 5236 additions and 3544 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -407,3 +407,4 @@ FodyWeavers.xsd
 *.sln.iml
 /BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package)_TemporaryKey.pfx
 /BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LastFM.cs
+/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Discord.cs
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3
@@ -37,8 +37,8 @@
  <PropertyGroup>
    <ProjectGuid>6576cd19-ef92-4099-b37d-e2d8ebdb6bf5</ProjectGuid>
    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <AssetTargetFallback>net8.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <AssetTargetFallback>net10.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
    <DefaultLanguage>zh-CN</DefaultLanguage>
    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
    <EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
@@ -143,8 +143,8 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6584" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
  </ItemGroup>
  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.112.0" />
+	  Version="1.0.135.0" />

 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -53,8 +53,6 @@
            <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
            <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
            <converter:MillisecondsToFormattedTimeConverter x:Key="MillisecondsToFormattedTimeConverter" />
-            <converter:MediaSourceProviderToLogoUriConverter x:Key="MediaSourceProviderToLogoUriConverter" />
-            <converter:MediaSourceProviderToDisplayedNameConverter x:Key="MediaSourceProviderToDisplayedNameConverter" />
            <converter:FPSToTimeSpanConverter x:Key="FPSToTimeSpanConverter" />
            <converter:ShortcutToStringConverter x:Key="ShortcutToStringConverter" />
            <converter:BoolNegationToVisibilityConverter x:Key="BoolNegationToVisibilityConverter" />
@@ -69,6 +67,8 @@
            <converter:TrackToLyricsConverter x:Key="TrackToLyricsConverter" />
            <converter:IntToBoolConverter x:Key="IntToBoolConverter" />
            <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
+            <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
+            <converter:MillisecondsToSecondsConverter x:Key="MillisecondsToSecondsConverter" />

            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
            <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -1,9 +1,9 @@
 // 2025/6/23 by Zhe Fang

-using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
+using BetterLyrics.WinUI3.Services.DiscordService;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
@@ -18,14 +18,10 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
 using System;
-using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -73,10 +69,10 @@ namespace BetterLyrics.WinUI3

        protected override void OnLaunched(LaunchActivatedEventArgs args)
        {
-            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+            WindowHook.OpenOrShowWindow<LyricsWindow>();
            if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
            {
-                WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
+                WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
            }
        }

@@ -105,6 +101,7 @@ namespace BetterLyrics.WinUI3
                    .AddSingleton<ITranslateService, TranslateService>()
                    .AddSingleton<ILastFMService, LastFMService>()
                    .AddSingleton<IResourceService, ResourceService>()
+                    .AddSingleton<IDiscordService, DiscordService>()
                    // ViewModels
                    .AddSingleton<AppSettingsControlViewModel>()
                    .AddSingleton<PlaybackSettingsControlViewModel>()
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
 		<RootNamespace>BetterLyrics.WinUI3</RootNamespace>
 		<Platforms>x86;x64;ARM64</Platforms>
@@ -61,34 +61,38 @@
 		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
+		<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
 		<PackageReference Include="csharp-kana" Version="1.0.2" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
-		<PackageReference Include="DevWinUI.Controls" Version="9.4.2" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.5.0" />
+		<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
+		<PackageReference Include="F23.StringSimilarity" Version="7.0.0" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
 		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
 		<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.3-dev-02320" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-		<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+		<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
 		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.User32" Version="4.2.1" />
+		<PackageReference Include="Vanara.Windows.Shell" Version="4.2.1" />
 		<PackageReference Include="WinUIEx" Version="2.9.0" />
-		<PackageReference Include="z440.atl.core" Version="7.6.0" />
+		<PackageReference Include="z440.atl.core" Version="7.8.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\ColorThief.WinUI3\ColorThief.WinUI3.csproj" />
@@ -106,8 +110,13 @@
 	</ItemGroup>
 	<!--Disable Trimming for Specific Packages-->
 	<ItemGroup>
-		<TrimmerRootAssembly Include="TagLibSharp" />
 		<TrimmerRootAssembly Include="NAudio.Wasapi" />
+		<TrimmerRootAssembly Include="TagLibSharp" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.DwmApi" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.Gdi32" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.Shell32" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.User32" />
+		<TrimmerRootAssembly Include="Vanara.Windows.Shell" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Content Update="Assets\AIMP.png">
@@ -116,6 +125,9 @@
 	  <Content Update="Assets\AlbumArtPlaceholder.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\Alipay.jpg">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\AMLLPlayer.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -206,6 +218,9 @@
 	  <Content Update="Assets\Spotify.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\WeChatReward.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Wiki82.profile.xml">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -345,8 +360,5 @@
 		<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
 		<InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
 		<PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
-		<Version>2025.6.0</Version>
-		<AssemblyVersion>2025.6.18.0110</AssemblyVersion>
-		<FileVersion>2025.6.18.0110</FileVersion>
 	</PropertyGroup>
 </Project>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Collections/FullyObservableCollection.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Collections/FullyObservableCollection.cs
@@ -3,11 +3,8 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

-namespace BetterLyrics.WinUI3.Extensions
+namespace BetterLyrics.WinUI3.Collections
 {
    // https://stackoverflow.com/a/32013610/11048731
    public class FullyObservableCollection<T> : ObservableCollection<T>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class AmllTTmlDB
    {
-        private const string BaseUrl = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/";
-        public const string QueryPrefix = $"{BaseUrl}raw-lyrics/";
-        public const string Index = $"{BaseUrl}metadata/raw-lyrics-index.jsonl";
+        public const string BaseUrl = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main";
+        public const string QueryPrefix = "raw-lyrics";
+        public const string IndexSuffix = "metadata/raw-lyrics-index.jsonl";
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class App
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class AppleMusic
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/DiscordTemplate
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/DiscordTemplate
@@ -0,0 +1,7 @@
+namespace BetterLyrics.WinUI3.Constants
+{
+    class Discord
+    {
+        public const string AppID = "Your Discord app ID here";
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/ExtendedGenreFiled.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/ExtendedGenreFiled.cs
@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Constants
+{
+    public class ExtendedGenreFiled
+    {
+        public const string NetEaseCloudMusicTrackID = "NCM-";
+        public const string FileName = "FILENAME-";
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class LXMusic
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs
@@ -1,18 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class Link
    {
+        public const string MicrosoftStoreUrl = "https://apps.microsoft.com/detail/9p1wcd1p597r";
        public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics";
        public const string ShareHubUrl = $"{GitHubUrl}/blob/dev/ShareHub/index.md";
-        public const string WikiUrl = $"{GitHubUrl}/wiki";
-        public const string AppleMusicCfgUrl = $"{WikiUrl}/%5BEN%5D-Lyrics-provider-configuration#apple-music";
-        public const string FAQUrl = $"{GitHubUrl}/blob/dev/FAQ/index.md";
+        public const string TermsOfServiceUrl = $"{GitHubUrl}/blob/dev/TermsofService.md";
+        public const string PrivacyPolicy = $"{GitHubUrl}/blob/dev/PrivacyPolicy.md";
+        public const string WikiUrl = "https://jayfunc.blog/work/betterlyrics";
+        public const string AppleMusicCfgUrl = $"{WikiUrl}#lyrics-sources-configuration";
+        public const string FAQUrl = $"{WikiUrl}#faq";
        public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
        public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";
        public const string TelegramUrl = "https://t.me/+svhSLZ7awPsxNGY1";
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class PlayerID
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Constants
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Constants
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
    public static class iTunes
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml
@@ -50,10 +50,12 @@

                            <dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
                                <StackPanel Spacing="6">
-                                    <TextBlock x:Uid="SetingsPageInstructions" />
                                    <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
                                        <HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.GitHubUrl}" />
                                        <HyperlinkButton Content="Wiki" NavigateUri="{x:Bind const:Link.WikiUrl}" />
+                                        <HyperlinkButton Content="FAQ" NavigateUri="{x:Bind const:Link.FAQUrl}" />
+                                        <HyperlinkButton x:Uid="PrivacyPolicy" NavigateUri="{x:Bind const:Link.PrivacyPolicy}" />
+                                        <HyperlinkButton x:Uid="TermsOfService" NavigateUri="{x:Bind const:Link.TermsOfServiceUrl}" />
                                    </StackPanel>
                                </StackPanel>

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml.cs
@@ -1,19 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml
@@ -5,9 +5,9 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
    xmlns:local="using:BetterLyrics.WinUI3.Controls"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:dev="using:DevWinUI"
    xmlns:ui="using:CommunityToolkit.WinUI"
    mc:Ignorable="d">

@@ -42,7 +42,6 @@
                    <dev:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
                        <local:ExtendedSlider
                            Default="12"
-                            
                            Maximum="100"
                            Minimum="0"
                            Unit="%"
@@ -52,7 +51,6 @@
                    <dev:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
                        <local:ExtendedSlider
                            Default="12"
-                            
                            Maximum="64"
                            Minimum="0"
                            Value="{x:Bind AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=TwoWay}" />
@@ -99,6 +97,9 @@
                            <dev:SettingsCard x:Uid="SettingsPageShowArtists">
                                <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowArtists, Mode=TwoWay}" />
                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageShowAlbum">
+                                <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowAlbum, Mode=TwoWay}" />
+                            </dev:SettingsCard>
                        </dev:SettingsExpander.Items>
                    </dev:SettingsExpander>

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
 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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml
@@ -71,6 +71,10 @@
                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
                    </dev:SettingsCard>

+                    <dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D8;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
                    <dev:SettingsCard x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, Mode=TwoWay}" />
                    </dev:SettingsCard>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml.cs
@@ -1,23 +1,7 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs
@@ -1,18 +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 BetterLyrics.WinUI3.Models;
 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.Models;

 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs
@@ -1,19 +1,8 @@
 using BetterLyrics.WinUI3.Events;
-using Microsoft.UI.Input;
 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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs
@@ -1,20 +1,8 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.Settings;
 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.Collections.ObjectModel;
-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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml
@@ -109,7 +109,7 @@
                                    Value="{x:Bind LyricsBackgroundSettings.FluidOverlayOpacity, Mode=TwoWay}" />
                            </dev:SettingsCard>

-                            <dev:SettingsCard x:Uid="SettingsPagePaletteGeneratorType">
+                            <dev:SettingsCard x:Uid="SettingsPagePaletteGeneratorType" IsEnabled="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
                                <ComboBox SelectedIndex="{x:Bind LyricsBackgroundSettings.PaletteGeneratorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                    <ComboBoxItem x:Uid="SettingsPageMedianCut" />
                                    <ComboBoxItem x:Uid="SettingsPageOctTree" />
@@ -126,20 +126,45 @@
                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=TwoWay}" />
                        <dev:SettingsExpander.Items>
-                            <dev:SettingsCard x:Uid="SettingsPageAmount">
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
                                <uc:ExtendedSlider
-                                    Maximum="100"
-                                    Minimum="10"
+                                    Maximum="10"
+                                    Minimum="0"
                                    ResetButtonVisibility="Collapsed"
                                    Value="{x:Bind LyricsBackgroundSettings.SnowFlakeOverlayAmount, Mode=TwoWay}" />
                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageSpeed" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Maximum="10"
+                                    Minimum="1"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsBackgroundSettings.SnowFlakeOverlaySpeed, Mode=TwoWay}" />
+                            </dev:SettingsCard>
                        </dev:SettingsExpander.Items>
                    </dev:SettingsExpander>

-                    <dev:SettingsCard x:Uid="SettingsPageSpectrumLayer" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE659;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                    <dev:SettingsCard x:Uid="SettingsPageFogLayer" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA91;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsFogOverlayEnabled, Mode=TwoWay}" />
                    </dev:SettingsCard>

+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageSpectrumLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF61F;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+
+                            <dev:SettingsCard x:Uid="SettingsPageSpectrumLayerPlacement" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsBackgroundSettings.SpectrumPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageSpectrumPlacementTop" />
+                                    <ComboBoxItem x:Uid="SettingsPageSpectrumPlacementBottom" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
                </StackPanel>
            </Grid>
        </ScrollViewer>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
 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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 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.Collections.ObjectModel;
-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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
@@ -69,6 +69,17 @@

                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}" TextWrapping="Wrap" />
+                                <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap">
+                                    <Paragraph>
+                                        <Run x:Uid="ArtistsSplitHint" />
+                                        <Run Text=";" />
+                                        <Run Text="," />
+                                        <Run Text="/" />
+                                        <Run Text="；" />
+                                        <Run Text="、" />
+                                        <Run Text="，" />
+                                    </Paragraph>
+                                </RichTextBlock>
                                <Button
                                    VerticalAlignment="Center"
                                    Command="{x:Bind ViewModel.ResetMappedArtistCommand}"
@@ -126,21 +137,67 @@
                        <DataTemplate x:DataType="models:LyricsSearchResult">
                            <ListViewItem IsEnabled="{x:Bind IsFound}">
                                <StackPanel Padding="3,6" Opacity="{x:Bind IsFound, Converter={StaticResource BoolToPartialOpacityConverter}}">
-                                    <TextBlock Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" Text="{x:Bind Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
-                                    <TextBlock
-                                        Text="{x:Bind Title}"
-                                        TextWrapping="Wrap"
-                                        Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                    <TextBlock
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{x:Bind Artist}"
-                                        TextWrapping="Wrap"
-                                        Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                    <TextBlock
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{x:Bind Album}"
-                                        TextWrapping="Wrap"
-                                        Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                    <HyperlinkButton
+                                        Padding="0"
+                                        Content="{x:Bind Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}"
+                                        NavigateUri="{x:Bind Reference, FallbackValue=about:blank}" />
+                                    <!--  Title  -->
+                                    <Grid ColumnSpacing="12" Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock x:Uid="LyricsSearchControlTitle" Grid.Column="0" />
+                                        <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                            <Paragraph>
+                                                <Run Text="{x:Bind Title, TargetNullValue=N/A, Mode=OneWay}" />
+                                            </Paragraph>
+                                        </RichTextBlock>
+                                    </Grid>
+                                    <!--  Artist  -->
+                                    <Grid ColumnSpacing="12" Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock x:Uid="LyricsSearchControlArtist" Grid.Column="0" />
+                                        <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                            <Paragraph>
+                                                <Run Text="{x:Bind DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
+                                            </Paragraph>
+                                        </RichTextBlock>
+                                    </Grid>
+                                    <!--  Album  -->
+                                    <Grid ColumnSpacing="12" Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock x:Uid="LyricsSearchControlAlbum" Grid.Column="0" />
+                                        <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                            <Paragraph>
+                                                <Run Text="{x:Bind Album, TargetNullValue=N/A, Mode=OneWay}" />
+                                            </Paragraph>
+                                        </RichTextBlock>
+                                    </Grid>
+                                    <!--  Duration  -->
+                                    <StackPanel
+                                        Orientation="Horizontal"
+                                        Spacing="6"
+                                        Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}">
+                                        <TextBlock x:Uid="LyricsSearchControlDurauion" />
+                                        <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind Duration}" />
+                                        <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="s" />
+                                    </StackPanel>
+                                    <!--  Match percentage  -->
+                                    <StackPanel
+                                        Orientation="Horizontal"
+                                        Spacing="6"
+                                        Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}">
+                                        <TextBlock x:Uid="LyricsPageMatchPercentage" />
+                                        <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind MatchPercentage}" />
+                                    </StackPanel>
+                                    <!--  NOT FOUND  -->
                                    <TextBlock
                                        x:Uid="LyricsSearchControlNotFound"
                                        VerticalAlignment="Center"
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs
@@ -1,21 +1,7 @@
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-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 Ude.Core;
-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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml.cs
@@ -1,20 +1,6 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 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.Collections.ObjectModel;
-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.
--- 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.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.ResourceService;
@@ -10,22 +9,12 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 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 NTextCat.Commons;
-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 Windows.Storage;
-using WinRT.Interop;
-using static Vanara.PInvoke.ComCtl32;

 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml
@@ -11,66 +11,74 @@
    xmlns:ui="using:CommunityToolkit.WinUI"
    mc:Ignorable="d">

-    <Grid
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
-        CornerRadius="12">
-        <FontIcon
-            Margin="20"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="{StaticResource IconFontFamily}"
-            Glyph="&#xE8AB;" />
-        <Button
-            Margin="12"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Click="Button_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  Glyph=&#xE73C;}"
-            Style="{StaticResource GhostButtonStyle}">
-            <Button.KeyboardAccelerators>
-                <KeyboardAccelerator Key="Escape" />
-            </Button.KeyboardAccelerators>
-        </Button>
+    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid x:Name="ShadowCastGrid" />
+        <Border
+            x:Name="ShadowRect"
+            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+            CornerRadius="12"
+            Loaded="ShadowRect_Loaded"
+            Translation="0,0,64">
+            <Border.Shadow>
+                <ThemeShadow x:Name="Shadow" />
+            </Border.Shadow>
+        </Border>
+        <Grid Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}" CornerRadius="12">
+            <TextBlock
+                x:Uid="SystemTraySwitch"
+                Margin="20"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top" />
+            <Button
+                Margin="12"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Click="Button_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      Glyph=&#xE73C;}"
+                Style="{StaticResource GhostButtonStyle}">
+                <Button.KeyboardAccelerators>
+                    <KeyboardAccelerator Key="Escape" />
+                </Button.KeyboardAccelerators>
+            </Button>

-        <ListView
-            Margin="48,56"
-            ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-            SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid
-                        Margin="0,10"
-                        Padding="5"
-                        AllowFocusOnInteraction="True"
-                        CornerRadius="4"
-                        Tapped="Grid_Tapped">
-                        <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
+            <ListView
+                Margin="48,56"
+                ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Grid
+                            Margin="0,10"
+                            Padding="5"
+                            AllowFocusOnInteraction="True"
+                            CornerRadius="4"
+                            Tapped="Grid_Tapped">
+                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>

-        <StackPanel
-            Margin="20"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Bottom"
-            Orientation="Horizontal"
-            Spacing="6">
-            <FontIcon
-                Margin="0,1,0,0"
-                FontFamily="{StaticResource IconFontFamily}"
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                Glyph="&#xE946;" />
-            <TextBlock x:Uid="LyricsWindowSwitchWindowHelp" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-        </StackPanel>
+            <StackPanel
+                Margin="20"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Bottom"
+                Orientation="Horizontal"
+                Spacing="6">
+                <HyperlinkButton Click="SettingsHypelinkButton_Click">
+                    <HyperlinkButton.Content>
+                        <TextBlock x:Uid="LyricsWindowSwitchWindowHelp" />
+                    </HyperlinkButton.Content>
+                </HyperlinkButton>
+            </StackPanel>
+        </Grid>
    </Grid>

+
 </UserControl>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs
@@ -1,22 +1,11 @@
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 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 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.
@@ -45,10 +34,21 @@ namespace BetterLyrics.WinUI3.Controls

        private async Task HideAsync()
        {
-            var lyricsWindowSwitchWindow = WindowHelper.GetWindowByWindowType<LyricsWindowSwitchWindow>();
+            var lyricsWindowSwitchWindow = WindowHook.GetWindow<LyricsWindowSwitchWindow>();
            lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
            await Task.Delay(300);
-            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
+            WindowHook.HideWindow<LyricsWindowSwitchWindow>();
+        }
+
+        private void ShadowRect_Loaded(object sender, RoutedEventArgs e)
+        {
+            Shadow.Receivers.Add(ShadowCastGrid);
+        }
+
+        private async void SettingsHypelinkButton_Click(object sender, RoutedEventArgs e)
+        {
+            await HideAsync();
+            WindowHook.OpenOrShowWindow<SettingsWindow>();
        }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
@@ -3,18 +3,7 @@ using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 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;
 using Windows.System;

 // To learn more about WinUI, the WinUI project structure,
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml
@@ -21,8 +21,72 @@
            <ColumnDefinition Width="*" />
            <ColumnDefinition Width="*" />
        </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
-            <ScrollViewer Margin="0,72,0,0" Style="{StaticResource SettingsScrollViewerStyle}">
+
+        <Grid Grid.Column="0" RowSpacing="18">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <interactivity:Interaction.Behaviors>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
+                    ComparisonCondition="NotEqual"
+                    Value="0">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="0">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                </interactivity:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+
+            <!--  播放源列表  -->
+            <ListView
+                x:Name="MediaSourceProvidersListView"
+                Grid.Row="0"
+                AllowDrop="True"
+                CanDragItems="True"
+                CanReorderItems="True"
+                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
+                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
+                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                ScrollViewer.HorizontalScrollMode="Enabled"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollMode="Disabled"
+                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ItemsStackPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <ToolTipService.ToolTip>
+                                <ToolTip Content="{Binding Provider, Mode=OneWay}" />
+                            </ToolTipService.ToolTip>
+                            <FontIcon
+                                FontFamily="Segoe UI Symbol"
+                                FontSize="12"
+                                Glyph="&#x283F;" />
+                            <Grid
+                                Width="16"
+                                Height="16"
+                                CornerRadius="4">
+                                <ImageIcon Source="{Binding LogoPath}" />
+                            </Grid>
+                            <TextBlock
+                                MaxWidth="200"
+                                Text="{Binding DisplayName, Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+
+            <ScrollViewer Grid.Row="1" Style="{StaticResource SettingsScrollViewerStyle}">
                <Grid Style="{StaticResource SettingsGridStyle}">
                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">

@@ -34,6 +98,31 @@
                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLastFMTrackEnabled, Mode=TwoWay}" />
                        </dev:SettingsCard>

+                        <dev:SettingsCard x:Uid="SettingsPageDiscordPresence">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsDiscordPresenceEnabled, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
+                        <!--  LX music server  -->
+                        <dev:SettingsCard x:Uid="SettingsPageLXMusicServer" Visibility="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLXMusic, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBox
+                                    x:Uid="SettingsPageLXMusicServerInput"
+                                    Grid.Column="0"
+                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    x:Uid="SettingsPageServerTestButton"
+                                    Grid.Column="1"
+                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
+                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+                            </Grid>
+                        </dev:SettingsCard>
+
                        <!--  时间轴相关配置  -->
                        <dev:SettingsExpander x:Uid="SettingsPageLyricsTimeline" IsExpanded="True">
                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsTimelineSyncEnabled, Mode=TwoWay}" />
@@ -93,6 +182,13 @@

                        <!--  歌词源配置  -->
                        <TextBlock x:Uid="SettingsPageLyricsSearchProvidersConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <dev:SettingsCard x:Uid="SettingsPageLyricsSearchType">
+                            <ComboBox SelectedIndex="{x:Bind ViewModel.SelectedMediaSourceProvider.LyricsSearchType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                <ComboBoxItem x:Uid="SettingsPageLyricsSearchSequential" />
+                                <ComboBoxItem x:Uid="SettingsPageLyricsSearchBestMatch" />
+                            </ComboBox>
+                        </dev:SettingsCard>
+
                        <ListView
                            x:Name="LyricsSearchProvidersListView"
                            AllowDrop="True"
@@ -127,55 +223,6 @@
                </Grid>
            </ScrollViewer>

-            <!--  播放源列表  -->
-            <ListView
-                x:Name="MediaSourceProvidersListView"
-                VerticalAlignment="Top"
-                AllowDrop="True"
-                CanDragItems="True"
-                CanReorderItems="True"
-                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
-                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                ScrollViewer.HorizontalScrollMode="Enabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollMode="Disabled"
-                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <ItemsStackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <FontIcon
-                                FontFamily="Segoe UI Symbol"
-                                FontSize="12"
-                                Glyph="&#x283F;" />
-                            <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
-                            <TextBlock
-                                MaxWidth="200"
-                                Text="{Binding Provider, Converter={StaticResource MediaSourceProviderToDisplayedNameConverter}, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-            <interactivity:Interaction.Behaviors>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="NotEqual"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                </interactivity:DataTriggerBehavior>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="Equal"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                </interactivity:DataTriggerBehavior>
-            </interactivity:Interaction.Behaviors>
        </Grid>

        <StackPanel
@@ -210,17 +257,97 @@

                        <!--  Provider info  -->
                        <TextBlock x:Uid="SettingsPageRealtimeStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <dev:SettingsCard x:Uid="LyricsPageLyricsProviderPrefix">
-                            <HyperlinkButton
-                                Content="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}"
-                                IsEnabled="False"
-                                NavigateUri="{x:Bind ViewModel.OriginalLyricsRef, Mode=OneWay}" />
+                        <dev:SettingsCard ContentAlignment="Left">
+                            <StackPanel Spacing="6">
+                                <!--  Playback source  -->
+                                <Grid ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock x:Uid="SettingsPagePlaybackSource" Grid.Column="0" />
+                                    <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                        <Paragraph>
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentMediaSourceProviderInfo.DisplayName, Mode=OneWay}" />
+                                        </Paragraph>
+                                    </RichTextBlock>
+                                </Grid>
+                                <!--  Playback source ID  -->
+                                <Grid ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock x:Uid="SettingsPagePlaybackSourceID" Grid.Column="0" />
+                                    <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                        <Paragraph>
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.PlayerId, TargetNullValue=N/A, Mode=OneWay}" />
+                                        </Paragraph>
+                                    </RichTextBlock>
+                                </Grid>
+                                <!--  Song title  -->
+                                <Grid ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock x:Uid="LyricsSearchControlTitle" Grid.Column="0" />
+                                    <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                        <Paragraph>
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Title, TargetNullValue=N/A, Mode=OneWay}" />
+                                        </Paragraph>
+                                    </RichTextBlock>
+                                </Grid>
+                                <!--  Song artists  -->
+                                <Grid ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock x:Uid="LyricsSearchControlArtist" Grid.Column="0" />
+                                    <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                        <Paragraph>
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
+                                        </Paragraph>
+                                    </RichTextBlock>
+                                </Grid>
+                                <!--  Song album  -->
+                                <Grid ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock x:Uid="LyricsSearchControlAlbum" Grid.Column="0" />
+                                    <RichTextBlock Grid.Column="1" Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                        <Paragraph>
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Album, TargetNullValue=N/A, Mode=OneWay}" />
+                                        </Paragraph>
+                                    </RichTextBlock>
+                                </Grid>
+                                <!--  Lyrics source  -->
+                                <StackPanel Orientation="Horizontal" Spacing="12">
+                                    <TextBlock x:Uid="LyricsPageLyricsProviderPrefix" />
+                                    <HyperlinkButton
+                                        Padding="0"
+                                        Content="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}"
+                                        IsEnabled="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.IsFound, Mode=OneWay}"
+                                        NavigateUri="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, Mode=OneWay}" />
+                                </StackPanel>
+                                <!--  Translation source  -->
+                                <StackPanel Orientation="Horizontal" Spacing="12">
+                                    <TextBlock x:Uid="LyricsPageTranslationProviderPrefix" />
+                                    <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.MediaSessionsService.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                                </StackPanel>
+                                <!--  Match percentage  -->
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <TextBlock x:Uid="LyricsPageMatchPercentage" />
+                                    <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.MatchPercentage, Mode=OneWay}" />
+                                </StackPanel>
+                            </StackPanel>
                        </dev:SettingsCard>
-                        <dev:SettingsCard x:Uid="LyricsPageTranslationProviderPrefix">
-                            <HyperlinkButton
-                                Content="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}"
-                                IsEnabled="False"
-                                NavigateUri="{x:Bind ViewModel.TranslatedLyricsRef, Mode=OneWay}" />
+
+                        <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
                        </dev:SettingsCard>

                        <!--  Lyrics translation  -->
@@ -241,12 +368,7 @@
                                </dev:SettingsCard>
                                <dev:SettingsCard x:Uid="SettingsPageTranslationConfig" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
                                    <dev:SettingsCard.Description>
-                                        <HyperlinkButton Margin="0,6,0,0" NavigateUri="https://github.com/LibreTranslate/LibreTranslate">
-                                            <TextBlock
-                                                x:Uid="SettingsPageTranslationInfoLink"
-                                                FontSize="14"
-                                                TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                        <HyperlinkButton Content="https://github.com/LibreTranslate/LibreTranslate" NavigateUri="https://github.com/LibreTranslate/LibreTranslate" />
                                    </dev:SettingsCard.Description>
                                    <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=TwoWay}" />
                                </dev:SettingsCard>
@@ -320,19 +442,25 @@
                            </dev:SettingsExpander.Items>
                        </dev:SettingsExpander>

-                        <!--  LX music server  -->
-                        <TextBlock x:Uid="SettingsPageLXMusicServer" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <dev:SettingsCard x:Uid="SettingsPageServerAddress">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
+                        <!--  amll-ttml-db  -->
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="amll-ttml-db" />
+                        <dev:SettingsCard x:Uid="SettingsPageAmllTtmlDbBaseUrl">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                <TextBox
-                                    x:Uid="SettingsPageLXMusicServerInput"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}" />
+                                    Grid.Column="0"
+                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.AmllTtmlDbBaseUrl, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
                                <Button
-                                    x:Uid="SettingsPageServerTestButton"
-                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-                            </StackPanel>
+                                    Grid.Column="1"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE8FB;}"
+                                    Style="{StaticResource GhostButtonStyle}" />
+                            </Grid>
                        </dev:SettingsCard>

                        <!--  Apple Music token  -->
@@ -342,20 +470,31 @@
                            Description="Use at your own risk"
                            Foreground="{ThemeResource SystemFillColorCautionBrush}"
                            Header="WARNING">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                <TextBox
-                                    MaxWidth="250"
+                                    Grid.Column="0"
                                    PlaceholderText="media-user-token"
                                    Text="{x:Bind ViewModel.AppleMusicMediaUserToken, Mode=TwoWay}"
                                    TextWrapping="Wrap" />
-                                <HyperlinkButton Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE897;}" NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
+                                <HyperlinkButton
+                                    Grid.Column="1"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE897;}"
+                                    NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
                                <Button
+                                    Grid.Column="2"
                                    Command="{x:Bind ViewModel.SaveAppleMusicMediaUserTokenCommand}"
                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                          FontSize=12,
                                                          Glyph=&#xE8FB;}"
                                    Style="{StaticResource GhostButtonStyle}" />
-                            </StackPanel>
+                            </Grid>
                        </dev:SettingsCard>

                    </StackPanel>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml.cs
@@ -1,19 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-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.
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs
@@ -1,21 +1,11 @@
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Input;
 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;
 using Windows.UI.Core;

 // To learn more about WinUI, the WinUI project structure,
@@ -99,7 +89,7 @@ namespace BetterLyrics.WinUI3.Controls

        private void CheckButton_Click(object sender, RoutedEventArgs e)
        {
-            bool registered = GlobalHotKeyHelper.IsHotKeyRegistered(Shortcut);
+            bool registered = GlobalHotKeyHook.IsHotKeyRegistered(Shortcut);
            if (registered)
            {
                DevWinUI.Growl.Success(_resourceService.GetLocalizedString("SettingsPageShortcutRegSuccessInfo"));
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs
@@ -3,10 +3,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs
@@ -1,13 +1,9 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class BoolNegationToOpacityConverter: IValueConverter
+    public partial class BoolNegationToOpacityConverter : IValueConverter
    {
        public object Convert(object value, Type targetType, object parameter, string language)
        {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
@@ -2,11 +2,7 @@
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs
@@ -1,8 +1,8 @@
 // 2025/6/23 by Zhe Fang

-using System;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
+using System;
 using Windows.UI;

 namespace BetterLyrics.WinUI3.Converter
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs
@@ -1,5 +1,5 @@
-using System;
-using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Data;
+using System;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs
@@ -1,11 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Globalization;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang

-using System;
 using Microsoft.UI.Xaml.Data;
+using System;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang

-using System;
 using Microsoft.UI.Xaml.Data;
+using System;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToDoubleConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToDoubleConverter.cs
@@ -0,0 +1,22 @@
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public class IntToDoubleConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is int intValue)
+            {
+                return (double)intValue;
+            }
+            return 0.0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs
@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Globalization;

 namespace BetterLyrics.WinUI3.Converter
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs
@@ -1,52 +0,0 @@
-using BetterLyrics.WinUI3.Constants;
-using BetterLyrics.WinUI3.Helper;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public class MediaSourceProviderToDisplayedNameConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is string provider)
-            {
-                return provider switch
-                {
-                    PlayerID.Spotify => PlayerName.Spotify,
-                    PlayerID.AppleMusic => PlayerName.AppleMusic,
-                    PlayerID.iTunes => PlayerName.iTunes,
-                    PlayerID.KugouMusic => PlayerName.KugouMusic,
-                    PlayerID.NetEaseCloudMusic => PlayerName.NetEaseCloudMusic,
-                    PlayerID.QQMusic => PlayerName.QQMusic,
-                    PlayerID.LXMusic => PlayerName.LXMusic,
-                    PlayerID.LXMusicPortable => PlayerName.LXMusicPortable,
-                    PlayerID.MediaPlayerWindows11 => PlayerName.MediaPlayerWindows11,
-                    PlayerID.AIMP => PlayerName.AIMP,
-                    PlayerID.Foobar2000 => PlayerName.Foobar2000,
-                    PlayerID.MusicBee => PlayerName.MusicBee,
-                    PlayerID.PotPlayer => PlayerName.PotPlayer,
-                    PlayerID.Chrome => PlayerName.Chrome,
-                    PlayerID.Edge => PlayerName.Edge,
-                    PlayerID.BetterLyrics => PlayerName.BetterLyrics,
-                    PlayerID.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
-                    PlayerID.SaltPlayerForWindows => PlayerName.SaltPlayerForWindows,
-                    PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
-                    PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
-                    PlayerID.Listen1 => PlayerName.Listen1,
-                    _ => provider,
-                };
-            }
-            return value?.ToString() ?? "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs
@@ -1,49 +0,0 @@
-using BetterLyrics.WinUI3.Constants;
-using BetterLyrics.WinUI3.Helper;
-using Microsoft.UI.Xaml.Data;
-using System;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public class MediaSourceProviderToLogoUriConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is string provider)
-            {
-                return provider switch
-                {
-                    PlayerID.Spotify => PathHelper.SpotifyLogoPath,
-                    PlayerID.AppleMusic => PathHelper.AppleMusicLogoPath,
-                    PlayerID.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
-                    PlayerID.iTunes  => PathHelper.iTunesLogoPath,
-                    PlayerID.KugouMusic => PathHelper.KugouMusicLogoPath,
-                    PlayerID.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
-                    PlayerID.QQMusic => PathHelper.QQMusicLogoPath,
-                    PlayerID.LXMusic => PathHelper.LXMusicLogoPath,
-                    PlayerID.LXMusicPortable => PathHelper.LXMusicLogoPath,
-                    PlayerID.MediaPlayerWindows11 => PathHelper.MediaPlayerWindows11LogoPath,
-                    PlayerID.AIMP => PathHelper.AIMPLogoPath,
-                    PlayerID.Foobar2000 => PathHelper.Foobar2000LogoPath,
-                    PlayerID.MusicBee => PathHelper.MusicBeeLogoPath,
-                    PlayerID.PotPlayer => PathHelper.PotPlayerLogoPath,
-                    PlayerID.Chrome => PathHelper.ChromeLogoPath,
-                    PlayerID.Edge => PathHelper.EdgeLogoPath,
-                    PlayerID.BetterLyrics => PathHelper.LogoPath,
-                    PlayerID.BetterLyricsDebug => PathHelper.LogoPath,
-                    PlayerID.SaltPlayerForWindows => PathHelper.SaltPlayerForWindowsLogoPath,
-                    PlayerID.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
-                    PlayerID.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
-                    PlayerID.Listen1 => PathHelper.Listen1LogoPath,
-                    _ => PathHelper.UnknownPlayerLogoPath,
-                };
-            }
-            return PathHelper.UnknownPlayerLogoPath;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToSecondsConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToSecondsConverter.cs
@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public class MillisecondsToSecondsConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is int intValue)
+            {
+                return intValue / 1000.0;
+            }
+            else if (value is double doubleValue)
+            {
+                return doubleValue / 1000.0;
+            }
+            return 0.0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs
@@ -1,10 +1,6 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs
@@ -1,9 +1,6 @@
 using Microsoft.UI.Xaml.Data;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
@@ -1,11 +1,7 @@
 using ATL;
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Extensions;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Converter
 {
@@ -15,7 +11,7 @@ namespace BetterLyrics.WinUI3.Converter
        {
            if (value is Track track)
            {
-                return track.GetLyrics();
+                return track.GetRawLyrics();
            }
            return "";
        }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum AlbumArtSearchProvider
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs
@@ -1,28 +1,8 @@
-using BetterLyrics.WinUI3.Helper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum ChineseRomanization
    {
        Pinyin,
        Jyutping,
    }
-
-    public static class ChineseRomanizationExtensions
-    {
-        public static string ToPhoneticCode(this ChineseRomanization chineseRomanization)
-        {
-            return chineseRomanization switch
-            {
-                ChineseRomanization.Pinyin => PhoneticHelper.PinyinCode,
-                ChineseRomanization.Jyutping => PhoneticHelper.JyutpingCode,
-                _ => throw new ArgumentOutOfRangeException(nameof(chineseRomanization))
-            };
-        }
-    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum CommonSongProperty
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Enums
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs
@@ -1,11 +1,5 @@
 // 2025/6/23 by Zhe Fang

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
    public enum Language
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum LineMaskType
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs
@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang

-using System;
 using Microsoft.UI.Text;
+using System;
 using Windows.UI.Text;

 namespace BetterLyrics.WinUI3.Enums
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFormat.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFormat.cs
@@ -11,72 +11,4 @@ namespace BetterLyrics.WinUI3.Enums
        Krc,
        NotSpecified,
    }
-
-    public static class LyricsFormatExtensions
-    {
-        public static LyricsFormat? DetectFormat(this string content)
-        {
-            if (string.IsNullOrWhiteSpace(content))
-                return null;
-
-            // TTML: 检查 <tt ... xmlns="http://www.w3.org/ns/ttml"
-            if (System.Text.RegularExpressions.Regex.IsMatch(
-                    content,
-                    @"<tt\b[^>]*\bxmlns\s*=\s*[""']http://www\.w3\.org/ns/ttml[""']",
-                    System.Text.RegularExpressions.RegexOptions.IgnoreCase))
-            {
-                return LyricsFormat.Ttml;
-            }
-            // KRC: 检测主内容格式 [start,duration]<offset,duration,0>字...
-            else if (System.Text.RegularExpressions.Regex.IsMatch(
-                         content,
-                         @"^\[\d+,\d+\](<\d+,\d+,0>.+)+",
-                         System.Text.RegularExpressions.RegexOptions.Multiline))
-            {
-                return LyricsFormat.Krc;
-            }
-            // QRC: 检测主内容格式 [start,duration]字(offset,duration)
-            else if (System.Text.RegularExpressions.Regex.IsMatch(
-                         content,
-                         @"^\[\d+,\d+\].*?\(\d+,\d+\)",
-                         System.Text.RegularExpressions.RegexOptions.Multiline))
-            {
-                return LyricsFormat.Qrc;
-            }
-            // 标准LRC和增强型LRC
-            else if (System.Text.RegularExpressions.Regex.IsMatch(content, @"\[\d{1,2}:\d{2}") ||
-                     System.Text.RegularExpressions.Regex.IsMatch(content, @"<\d{1,2}:\d{2}\.\d{2,3}>"))
-            {
-                return LyricsFormat.Lrc;
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        public static string ToFileExtension(this LyricsFormat format)
-        {
-            return format switch
-            {
-                LyricsFormat.Lrc => ".lrc",
-                LyricsFormat.Qrc => ".qrc",
-                LyricsFormat.Krc => ".krc",
-                LyricsFormat.Eslrc => ".eslrc",
-                LyricsFormat.Ttml => ".ttml",
-                _ => ".*",
-            };
-        }
-
-        public static LyricsSearchProvider? ToLyricsSearchProvider(this LyricsFormat format)
-        {
-            return format switch
-            {
-                LyricsFormat.Lrc => LyricsSearchProvider.LocalLrcFile,
-                LyricsFormat.Eslrc => LyricsSearchProvider.LocalEslrcFile,
-                LyricsFormat.Ttml => LyricsSearchProvider.LocalTtmlFile,
-                _ => null,
-            };
-        }
-    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum LyricsLayoutOrientation
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchProvider.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchProvider.cs
@@ -17,70 +17,4 @@ namespace BetterLyrics.WinUI3.Enums
        LocalTtmlFile,
        AppleMusic,
    }
-
-    public static class LyricsSearchProviderExtensions
-    {
-        public static string GetCacheDirectory(this LyricsSearchProvider provider)
-        {
-            return provider switch
-            {
-                LyricsSearchProvider.LrcLib => PathHelper.LrcLibLyricsCacheDirectory,
-                LyricsSearchProvider.QQ => PathHelper.QQLyricsCacheDirectory,
-                LyricsSearchProvider.Netease => PathHelper.NeteaseLyricsCacheDirectory,
-                LyricsSearchProvider.Kugou => PathHelper.KugouLyricsCacheDirectory,
-                LyricsSearchProvider.AmllTtmlDb => PathHelper.AmllTtmlDbLyricsCacheDirectory,
-                LyricsSearchProvider.AppleMusic => PathHelper.AppleMusicCacheDirectory,
-                _ => throw new System.ArgumentOutOfRangeException(nameof(provider)),
-            };
-        }
-
-        public static LyricsFormat GetLyricsFormat(this LyricsSearchProvider provider)
-        {
-            return provider switch
-            {
-                LyricsSearchProvider.LrcLib => LyricsFormat.Lrc,
-                LyricsSearchProvider.QQ => LyricsFormat.Qrc,
-                LyricsSearchProvider.Kugou => LyricsFormat.Krc,
-                LyricsSearchProvider.Netease => LyricsFormat.Lrc,
-                LyricsSearchProvider.AmllTtmlDb => LyricsFormat.Ttml,
-                LyricsSearchProvider.AppleMusic => LyricsFormat.Ttml,
-                LyricsSearchProvider.LocalLrcFile => LyricsFormat.Lrc,
-                LyricsSearchProvider.LocalEslrcFile => LyricsFormat.Eslrc,
-                LyricsSearchProvider.LocalTtmlFile => LyricsFormat.Ttml,
-                _ => LyricsFormat.NotSpecified,
-            };
-        }
-
-        public static bool IsLocal(this LyricsSearchProvider provider)
-        {
-            return provider
-                is LyricsSearchProvider.LocalMusicFile
-                    or LyricsSearchProvider.LocalLrcFile
-                    or LyricsSearchProvider.LocalEslrcFile
-                    or LyricsSearchProvider.LocalTtmlFile;
-        }
-
-        public static bool IsRemote(this LyricsSearchProvider provider)
-        {
-            return !provider.IsLocal();
-        }
-
-        public static TranslationSearchProvider? ToTranslationSearchProvider(this LyricsSearchProvider? provider)
-        {
-            return provider switch
-            {
-                LyricsSearchProvider.LrcLib => TranslationSearchProvider.LrcLib,
-                LyricsSearchProvider.QQ => TranslationSearchProvider.QQ,
-                LyricsSearchProvider.Kugou => TranslationSearchProvider.Kugou,
-                LyricsSearchProvider.Netease => TranslationSearchProvider.Netease,
-                LyricsSearchProvider.AmllTtmlDb => TranslationSearchProvider.AmllTtmlDb,
-                LyricsSearchProvider.AppleMusic => TranslationSearchProvider.AppleMusic,
-                LyricsSearchProvider.LocalMusicFile => TranslationSearchProvider.LocalMusicFile,
-                LyricsSearchProvider.LocalLrcFile => TranslationSearchProvider.LocalLrcFile,
-                LyricsSearchProvider.LocalEslrcFile => TranslationSearchProvider.LocalEslrcFile,
-                LyricsSearchProvider.LocalTtmlFile => TranslationSearchProvider.LocalTtmlFile,
-                _ => null,
-            };
-        }
-    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsSearchType
+    {
+        Sequential,
+        BestMatch
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum PaletteGeneratorType
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum PlaybackOrder
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum SettingsStoreType
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum ShortcutID
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SpectrumPlacement.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SpectrumPlacement.cs
@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum SpectrumPlacement
+    {
+        Top,
+        Bottom,
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
-    public  enum TitleBarArea
+    public enum TitleBarArea
    {
        None,
        Top,
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
    public enum TranslationSearchProvider
    {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs
@@ -1,16 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
 using Windows.UI;

 namespace BetterLyrics.WinUI3.Events
 {
-    public class AlbumArtChangedEventArgs(byte[]? bytes, SoftwareBitmap? albumArtSwBitmap, List<Color> albumArtLightAccentColors, List<Color> albumArtDarkAccentColors) : EventArgs
+    public class AlbumArtChangedEventArgs(SoftwareBitmap? albumArtSwBitmap, List<Color> albumArtLightAccentColors, List<Color> albumArtDarkAccentColors) : EventArgs
    {
-        public byte[]? Bytes { get; set; } = bytes;
        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
        public List<Color> AlbumArtLightAccentColors { get; set; } = albumArtLightAccentColors;
        public List<Color> AlbumArtDarkAccentColors { get; set; } = albumArtDarkAccentColors;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Events
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/IsPlayingChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/IsPlayingChangedEventArgs.cs
@@ -1,11 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class IsPlayingChangedEventArgs(bool isPlaying) : EventArgs
-    {
-        public bool IsPlaying { get; set; } = isPlaying;
-    }
-}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Events
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs
@@ -1,9 +1,5 @@
 using Hqub.Lastfm.Entities;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Events
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs
@@ -1,11 +1,7 @@
 // 2025/6/23 by Zhe Fang

 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Events
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LyricsChangedEventArgs.cs
@@ -1,9 +1,5 @@
 using BetterLyrics.WinUI3.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Events
 {
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs
@@ -1,13 +1,10 @@
 using BetterLyrics.WinUI3.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;

 namespace BetterLyrics.WinUI3.Events
 {
-    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds):EventArgs
+    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds) : EventArgs
    {
        public List<MediaSourceProviderInfo> MediaSourceProviersInfo { get; set; } = sessionIds;
    }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs
@@ -1,12 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using BetterLyrics.WinUI3.Models;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class SongInfoChangedEventArgs(SongInfo? songInfo) : EventArgs
-    {
-        public SongInfo? SongInfo { get; set; } = songInfo;
-    }
-}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/TimelineChangedEventArgs.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/TimelineChangedEventArgs.cs
@@ -1,12 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class TimelineChangedEventArgs(TimeSpan position, TimeSpan end) : EventArgs()
-    {
-        public TimeSpan Position { get; set; } = position;
-        public TimeSpan End { get; set; } = end;
-    }
-}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/AppWindowExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/AppWindowExtensions.cs
@@ -0,0 +1,18 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Windowing;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class AppWindowExtensions
+    {
+        extension(AppWindow appWindow)
+        {
+            public void SetIcons()
+            {
+                appWindow.SetIcon(PathHelper.LogoPath);
+                appWindow.SetTaskbarIcon(PathHelper.LogoPath);
+                appWindow.SetTitleBarIcon(PathHelper.LogoPath);
+            }
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/CanvasTextLayoutExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/CanvasTextLayoutExtensions.cs
@@ -0,0 +1,22 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.Graphics.Canvas.Text;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class CanvasTextLayoutExtensions
+    {
+        extension(CanvasTextLayout? canvasTextLayout)
+        {
+            public void SetFontFamily(string? text, string cjk, string latin)
+            {
+                if (canvasTextLayout == null) return;
+                if (text == null) return;
+
+                for (int i = 0; i < text.Length; i++)
+                {
+                    canvasTextLayout.SetFontFamily(i, 1, LanguageHelper.IsCJK(text[i]) ? cjk : latin);
+                }
+            }
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/ChineseRomanizationExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/ChineseRomanizationExtensions.cs
@@ -0,0 +1,19 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using System;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class ChineseRomanizationExtensions
+    {
+        extension(ChineseRomanization chineseRomanization)
+        {
+            public string ToPhoneticCode() => chineseRomanization switch
+            {
+                ChineseRomanization.Pinyin => PhoneticHelper.PinyinCode,
+                ChineseRomanization.Jyutping => PhoneticHelper.JyutpingCode,
+                _ => throw new ArgumentOutOfRangeException(nameof(chineseRomanization))
+            };
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/ColorExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/ColorExtensions.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Numerics;
+using Windows.UI;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class ColorExtensions
+    {
+        extension(Color color)
+        {
+            public Color WithAlpha(byte alpha)
+            {
+                return Color.FromArgb(alpha, color.R, color.G, color.B);
+            }
+
+            public Color WithOpacity(float opacity)
+            {
+                return Color.FromArgb((byte)(opacity * 255), color.R, color.G, color.B);
+            }
+
+            public Color WithBrightness(double brightness)
+            {
+                // 确保亮度因子在合理范围内
+                brightness = Math.Max(0, Math.Min(1, brightness));
+
+                var hsl = CommunityToolkit.WinUI.Helpers.ColorHelper.ToHsl(color);
+                double h = hsl.H;
+                double s = hsl.S;
+
+                return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
+            }
+
+            public Vector3 ToVector3RGB()
+            {
+                return new Vector3((float)color.R / 0xff, (float)color.G / 0xff, (float)color.B / 0xff);
+            }
+
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/DisposableObjectExtension.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/DisposableObjectExtension.cs
@@ -0,0 +1,53 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class DisposableObjectExtension
+    {
+        extension(IDisposable? obj)
+        {
+            // Credit/Copyright to https://gist.github.com/tcartwright/dab50ebaff7c59f05013de0fb349cabd
+            public bool IsDisposed()
+            {
+                /*
+                 TIM C: This hacky code is because MSFT does not provide a standard way to interrogate if an object is disposed or not. 
+                    I wrote this based upon streams, but it should work for many other types of MSFT objects (maybe).
+                */
+                if (obj == null) { return true; }
+
+                var objType = obj.GetType();
+                //var foo = new System.IO.BufferedStream();
+
+                // the _disposed pattern should catch a lot of msft objects.... hopefully
+                var isDisposedField = objType.GetField("_disposed", BindingFlags.NonPublic | BindingFlags.Instance) ??
+                    objType.GetField("disposed", BindingFlags.NonPublic | BindingFlags.Instance);
+
+                if (isDisposedField != null) { return Convert.ToBoolean(isDisposedField.GetValue(obj)); }
+
+                isDisposedField = objType.GetField("_isOpen", BindingFlags.NonPublic | BindingFlags.Instance);
+
+                if (isDisposedField != null) { return !Convert.ToBoolean(isDisposedField.GetValue(obj)); }
+
+                // Windows.Graphics.Imaging.SoftwareBitmap
+                isDisposedField = objType.GetField("_objRef_global__System_IDisposable", BindingFlags.NonPublic | BindingFlags.Instance);
+                if (isDisposedField != null) { return !Convert.ToBoolean(isDisposedField.GetValue(obj)); }
+
+                // System.IO.FileStream
+                var strategyField = objType.GetField("_strategy", BindingFlags.NonPublic | BindingFlags.Instance);
+                if (strategyField != null)
+                {
+                    var strategy = strategyField.GetValue(obj);
+                    var isClosedField = strategy.GetType().GetProperty("IsClosed", BindingFlags.NonPublic | BindingFlags.Instance);
+                    if (isClosedField != null) { return Convert.ToBoolean(isClosedField.GetValue(strategy)); }
+                }
+
+                // other streams that use this pattern to determine if they are disposed
+                if (obj is Stream stream) { return !stream.CanRead && !stream.CanWrite; }
+
+                return false;
+            }
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/EnumExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/EnumExtensions.cs
@@ -0,0 +1,18 @@
+using System;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class EnumExtensions
+    {
+        extension<T>(T value) where T : struct, Enum
+        {
+            public T GetNext()
+            {
+                T[] values = Enum.GetValues<T>();
+                int currentIndex = Array.IndexOf(values, value);
+                int nextIndex = (currentIndex + 1) % values.Length;
+                return values[nextIndex];
+            }
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/EnumerableExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/EnumerableExtensions.cs
@@ -0,0 +1,25 @@
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class EnumerableExtensions
+    {
+        extension<T>(IEnumerable<T> items)
+        {
+            public ObservableCollection<GroupInfoList> GetGroupedBy(Func<T, object> groupKeySelector, Func<object, object>? orderSelector = null)
+            {
+                var query = from item in items
+                            group item by groupKeySelector(item) into g
+                            orderby g.Key
+                            select new GroupInfoList(g.Cast<object>(), orderSelector) { Key = g.Key };
+
+                return new ObservableCollection<GroupInfoList>(query);
+            }
+
+        }
+    }
+}
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs
@@ -0,0 +1,37 @@
+using BetterLyrics.WinUI3.Enums;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class LyricsFormatExtensions
+    {
+        extension(LyricsFormat format)
+        {
+            public string ToFileExtension()
+            {
+                return format switch
+                {
+                    LyricsFormat.Lrc => ".lrc",
+                    LyricsFormat.Qrc => ".qrc",
+                    LyricsFormat.Krc => ".krc",
+                    LyricsFormat.Eslrc => ".eslrc",
+                    LyricsFormat.Ttml => ".ttml",
+                    _ => ".*",
+                };
+            }
+
+            public LyricsSearchProvider? ToLyricsSearchProvider()
+            {
+                return format switch
+                {
+                    LyricsFormat.Lrc => LyricsSearchProvider.LocalLrcFile,
+                    LyricsFormat.Eslrc => LyricsSearchProvider.LocalEslrcFile,
+                    LyricsFormat.Ttml => LyricsSearchProvider.LocalTtmlFile,
+                    _ => null,
+                };
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zhe Fang	7e6ce08c56	fix: amll-ttml-db search rule	2025-11-18 20:38:27 -05:00
Zhe Fang	28f75fa751	chores: rollback media app icon and name fetch algo; add new lyrics search type: best match	2025-11-18 19:07:37 -05:00
Zhe Fang	051a7af21a	chores: Change fallback name for playback source	2025-11-18 09:21:13 -05:00
Zhe Fang	c8b8853561	chores: Fix taskbarlist status and progress	2025-11-18 08:50:26 -05:00
Zhe Fang	baab2bcc7a	chores: bump version code	2025-11-17 22:16:08 -05:00
Zhe Fang	9a3e4adc0c	chores: Fix thread issue	2025-11-17 21:02:11 -05:00
Zhe Fang	8d909da139	chores: Add spliter hint for search control	2025-11-17 19:56:07 -05:00
Zhe Fang	d97f5fec37	chores	2025-11-17 19:22:24 -05:00
Zhe Fang	9a12b06b7e	chores: Add fog layer	2025-11-17 17:23:28 -05:00
Zhe Fang	3fca90ca72	chores: Change static media session icon matching to dynamic	2025-11-17 16:10:24 -05:00
Zhe Fang	220e940bbb	chores: Import SnowEffect from shadertoy	2025-11-16 20:26:31 -05:00
Zhe Fang	dc627bd1ef	chores: Cleanup	2025-11-16 18:02:53 -05:00
Zhe Fang	3c852a9d2f	chores: Move `LyricsWindowStatusExtensions` to `Extensions` folder	2025-11-16 17:58:42 -05:00
Zhe Fang	ecff788c6c	chores	2025-11-16 17:54:37 -05:00
Zhe Fang	c471f128c1	chores: Add new rule for locally search lyrics (only compare file name)	2025-11-16 08:04:22 -05:00
Zhe Fang	4a389d5e33	chores: Improve	2025-11-15 08:30:06 -05:00
Zhe Fang	ae1fa1c54d	chores: update docs	2025-11-14 15:21:00 -05:00
Zhe Fang	738a4a0bec	chores: update docs	2025-11-14 15:20:10 -05:00
Zhe Fang	37ae278a11	chores: update docs	2025-11-14 15:16:10 -05:00
Zhe Fang	45094bde31	chores: Add discord presence and update docs	2025-11-14 15:15:49 -05:00
Zhe Fang	81b6ebbdf6	chores: update dep	2025-11-14 12:02:20 -05:00
Zhe Fang	8cb8a026ad	chores: Fix	2025-11-14 11:11:24 -05:00
Zhe Fang	4eeaf9aeec	Fix #104	2025-11-14 10:17:20 -05:00
Zhe Fang	f7f5e127a0	feat: Provie settings to enable or disable word by word effect by force	2025-11-13 19:51:55 -05:00
Zhe Fang	b44a29997b	chores: Add spectrum placement settings	2025-11-13 19:13:40 -05:00
Zhe Fang	f19888223e	chores: Add status in ShareHub	2025-11-13 13:02:21 -05:00
Zhe Fang	a612e9c6cb	chores: Update content in ShareHub	2025-11-13 12:45:08 -05:00
Zhe Fang	e6a035f8e1	chores: Change IsCJK algo	2025-11-13 07:42:01 -05:00
Zhe Fang	d7c56e6b42	chores: bump version code	2025-11-12 20:25:10 -05:00
Zhe Fang	54ec48e365	chores: fix	2025-11-12 20:01:01 -05:00
Zhe Fang	35fa2b6b57	chores: Fix album text related issue	2025-11-12 19:51:04 -05:00
Zhe Fang	4926fe55a3	chores: - Add album text in lyrics render - Improve song info update and draw algo - Upgrade to .NET 10	2025-11-12 19:15:19 -05:00
Zhe Fang	008c80c886	fix: Set CJK and latin font family individually	2025-11-12 16:20:14 -05:00
Zhe Fang	7b2abfbe15	fix: Show correct translation for Netease Cloud Muic lyrics source	2025-11-12 15:48:14 -05:00
Zhe Fang	f81a661a0b	chores: remove lyrics x animation to improve performance	2025-11-12 13:59:44 -05:00
Zhe Fang	31f6ce704d	chores: improve work area algo	2025-11-12 09:45:39 -05:00
Zhe Fang	44a1f0a809	fix: Lyrics window did not go back to the correct position when automatically showing back for docked mode	2025-11-12 08:37:57 -05:00
Zhe Fang	607cbbe908	chores: update readme	2025-11-11 16:26:38 -05:00
Zhe Fang	e237be5d8a	chores: update readme	2025-11-11 16:24:59 -05:00
Zhe Fang	253336903d	chores: update readme.md	2025-11-11 16:23:33 -05:00
Zhe Fang	580c16155a	Merge branch 'dev' of https://github.com/jayfunc/BetterLyrics into dev	2025-11-11 14:28:50 -05:00
Zhe Fang	8ab483d244	chores: update README.md links	2025-11-11 14:28:48 -05:00