chores: bump to 1.1.167.0

feat: support lyrics scrolling and clicking

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj

@@ -143,7 +143,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.128.0" />
+	  Version="1.1.167.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -69,6 +69,11 @@
             <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
             <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
             <converter:MillisecondsToSecondsConverter x:Key="MillisecondsToSecondsConverter" />
+            <converter:PictureInfosToImageSourceConverter x:Key="PictureInfosToImageSourceConverter" />
+            <converter:LyricsFontWeightToFontWeightConverter x:Key="LyricsFontWeightToFontWeightConverter" />
+            <converter:TextAlignmentTypeToHorizontalAlignmentConverter x:Key="TextAlignmentTypeToHorizontalAlignmentConverter" />
+            <converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
+            <converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs

@@ -13,7 +13,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Services.TranslateService;
 using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
@@ -26,6 +25,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
+using WinUIEx;
 
 namespace BetterLyrics.WinUI3
 {
@@ -69,7 +69,11 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHook.OpenOrShowWindow<LyricsWindow>();
+            // 设置托盘
+            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
+            WindowHook.HideWindow<SystemTrayWindow>();
+
+            WindowHook.OpenOrShowWindow<NowPlayingWindow>();
             if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
             {
                 WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
@@ -110,13 +114,14 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<LyricsWindowSettingsControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchWindowViewModel>()
-                    .AddSingleton<LyricsWindowViewModel>()
+                    
+                    .AddSingleton<NowPlayingWindowViewModel>()
+                    .AddSingleton<NowPlayingPageViewModel>()
+
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
                     .AddSingleton<SettingsPageViewModel>()
-                    .AddSingleton<LyricsPageViewModel>()
                     .AddSingleton<MusicGalleryViewModel>()
-                    .AddSingleton<LyricsRendererViewModel>()
                     .AddSingleton<AboutControlViewModel>()
                     .BuildServiceProvider()
             );

BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj

@@ -23,24 +23,28 @@
 		<None Remove="Assets\Segoe Fluent Icons.ttf" />
 		<None Remove="Assets\Wiki82.profile.xml" />
 		<None Remove="Controls\AboutControl.xaml" />
-		<None Remove="Controls\AlbumArtLayoutSettingsControl.xaml" />
+		<None Remove="Controls\AlbumArtAreaEffectSettingsControl.xaml" />
 		<None Remove="Controls\AppSettingsControl.xaml" />
 		<None Remove="Controls\DemoWindowGrid.xaml" />
 		<None Remove="Controls\ExtendedSlider.xaml" />
 		<None Remove="Controls\FontFamilyAutoSuggestBox.xaml" />
+		<None Remove="Controls\ImageSwitcher.xaml" />
 		<None Remove="Controls\LyricsSearchControl.xaml" />
 		<None Remove="Controls\LyricsStyleSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
 		<None Remove="Controls\MediaSettingsControl.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
+		<None Remove="Controls\PropertyRow.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
+		<None Remove="Controls\WindowSettingsControl.xaml" />
 		<None Remove="Views\LyricsSearchWindow.xaml" />
 		<None Remove="Views\LyricsWindowSwitchWindow.xaml" />
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
 		<None Remove="Views\SettingsWindow.xaml" />
+		<None Remove="Views\SystemTrayWindow.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="Logo.ico" />
@@ -64,22 +68,22 @@
 		<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.5.0" />
-		<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.7.0" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
-		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
+		<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
+		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
 		<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="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.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
 		<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.Extensions.Logging" Version="10.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
 		<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
@@ -90,8 +94,9 @@
 		<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="VCollab.DiscordRichPresence" Version="1.7.0" />
 		<PackageReference Include="WinUIEx" Version="2.9.0" />
-		<PackageReference Include="z440.atl.core" Version="7.8.0" />
+		<PackageReference Include="z440.atl.core" Version="7.9.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\ColorThief.WinUI3\ColorThief.WinUI3.csproj" />
@@ -118,12 +123,27 @@
 		<TrimmerRootAssembly Include="Vanara.Windows.Shell" />
 	</ItemGroup>
 	<ItemGroup>
+	  <Content Update="Assets\AIMP.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <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>
+	  <Content Update="Assets\AppleMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\Chrome.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\Edge.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\FluidEffect.bin">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -136,24 +156,72 @@
 	  <Content Update="Assets\EmptyState.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\foobar2000.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\HyPlayer.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\iTunes.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\KugouMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\LastFM.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Leaf.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\Listen1.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Logo.ico">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Logo.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\LXMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\MediaPlayerWindows11.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\MoeKoeMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\MusicBee.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\NetEaseCloudMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Page.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\PlanetMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\PotPlayer.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\QQMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\Question.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	  <Content Update="Assets\SaltPlayerForWindows.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Segoe Fluent Icons.ttf">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\Spotify.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\WeChatReward.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -227,7 +295,7 @@
 	  </Page>
 	</ItemGroup>
 	<ItemGroup>
-	  <Page Update="Controls\AlbumArtLayoutSettingsControl.xaml">
+	  <Page Update="Controls\AlbumArtAreaStyleSettingsControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </Page>
 	</ItemGroup>
@@ -269,6 +337,36 @@
 	<ItemGroup>
 	  <Folder Include="TemplateSelector\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\SystemTrayWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\WindowSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\AlbumArtAreaEffectSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\ImageSwitcher.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\ShadowImage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\PropertyRow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\AboutControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/ExtendedGenreFiled.cs

@@ -3,6 +3,7 @@
     public class ExtendedGenreFiled
     {
         public const string NetEaseCloudMusicTrackID = "NCM-";
+        public const string QQMusicTrackID = "QQ-";
         public const string FileName = "FILENAME-";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs

@@ -2,16 +2,17 @@
 {
     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 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";
+        public const string MicrosoftStore = "https://apps.microsoft.com/detail/9p1wcd1p597r";
+
+        public const string GitHub = "https://github.com/jayfunc/BetterLyrics";
+        public const string ShareHub = $"{GitHub}/blob/dev/ShareHub/index.md";
+        public const string TermsOfService = $"{GitHub}/blob/dev/TermsofService.md";
+        public const string PrivacyPolicy = $"{GitHub}/blob/dev/PrivacyPolicy.md";
+        public const string UserGuide = $"{GitHub}/wiki/User-Guide";
+        public const string AppleMusicCfg = $"{UserGuide}#lyrics-source-configuration";
+
+        public const string QQGroup = "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 Discord = "https://discord.gg/5yAQPnyCKv";
+        public const string Telegram = "https://t.me/+svhSLZ7awPsxNGY1";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs

@@ -0,0 +1,29 @@
+namespace BetterLyrics.WinUI3.Constants
+{
+    public static class PlayerID
+    {
+        public const string LXMusic = "cn.toside.music.desktop";
+        public const string LXMusicPortable = "lx-music-desktop.exe";
+        public const string MediaPlayerWindows11 = "Microsoft.ZuneMusic_8wekyb3d8bbwe!Microsoft.ZuneMusic";
+        public const string AIMP = "AIMP.exe";
+        public const string Foobar2000 = "foobar2000.exe";
+        public const string MusicBee = "MusicBee.exe";
+        public const string PotPlayer = "PotPlayerMini64.exe";
+        public const string Spotify = "Spotify.exe";
+        public const string AppleMusic = "AppleInc.AppleMusicWin_nzyj5cx40ttqa!App";
+        public const string AppleMusicAlternative = "AppleMusic.exe";
+        public const string NetEaseCloudMusic = "cloudmusic.exe";
+        public const string KugouMusic = "kugou";
+        public const string QQMusic = "QQMusic.exe";
+        public const string iTunes = "49586DaveAntoine.MediaControllerforiTunes_9bzempp7dntjg!App";
+        public const string Chrome = "Chrome";
+        public const string Edge = "MSEdge";
+        public const string BetterLyrics = "37412.BetterLyrics_rd1g0rsrrtxw8!App";
+        public const string BetterLyricsDebug = "37412.BetterLyrics_c8mj3v9sysxb4!App";
+        public const string SaltPlayerForWindowsMS = "Sakawish.SaltPlayerforWindows_q65q631pyh094!SaltPlayerforWindows";
+        public const string SaltPlayerForWindowsSteam = "Salt Player for Windows.exe";
+        public const string MoeKoeMusic = "cn.MoeKoe.Music";
+        public const string MoeKoeMusicAlternative = "electron.app.MoeKoe Music";
+        public const string Listen1 = "com.listen1.listen1";
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs

@@ -0,0 +1,28 @@
+namespace BetterLyrics.WinUI3.Constants
+{
+    public class PlayerName
+    {
+        public const string LXMusic = "LX Music";
+        public const string LXMusicPortable = "LX Music (Portable)";
+        public const string MediaPlayerWindows11 = "Media Player";
+        public const string AIMP = "AIMP";
+        public const string Foobar2000 = "foobar2000";
+        public const string MusicBee = "MusicBee";
+        public const string PotPlayer = "PotPlayer";
+        public const string Spotify = "Spotify";
+        public const string AppleMusic = "Apple Music";
+        public const string AppleMusicAlternative = "Apple Music";
+        public const string NetEaseCloudMusic = "网易云音乐";
+        public const string KugouMusic = "酷狗音乐";
+        public const string QQMusic = "QQ 音乐";
+        public const string iTunes = "iTunes";
+        public const string Chrome = "Google Chrome";
+        public const string Edge = "Microsoft Edge";
+        public const string BetterLyrics = "BetterLyrics";
+        public const string BetterLyricsDebug = "BetterLyrics (Debug)";
+        public const string SaltPlayerForWindowsMS = "Salt Player for Windows (Microsoft Store)";
+        public const string SaltPlayerForWindowsSteam = "Salt Player for Windows (Steam)";
+        public const string MoeKoeMusic = "MoeKoe Music";
+        public const string Listen1 = "Listen 1";
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/SpecialHandlePlayerID.cs

@@ -1,10 +0,0 @@
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class SpecialHandlePlayerID
-    {
-        public const string LXMusic = "cn.toside.music.desktop";
-        public const string LXMusicPortable = "lx-music-desktop.exe";
-        public const string AppleMusic = "AppleInc.AppleMusicWin_nzyj5cx40ttqa!App";
-        public const string AppleMusicAlternative = "AppleMusic.exe";
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Time.cs

@@ -4,6 +4,7 @@ namespace BetterLyrics.WinUI3.Constants
 {
     public static class Time
     {
-        public static readonly TimeSpan DebounceTimeout = TimeSpan.FromMilliseconds(300);
+        public static readonly TimeSpan DebounceTimeout = TimeSpan.FromMilliseconds(250);
+        public static readonly TimeSpan AnimationDuration = TimeSpan.FromMilliseconds(350);
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml

@@ -51,11 +51,10 @@
                             <dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
                                 <StackPanel Spacing="6">
                                     <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 Content="GitHub" NavigateUri="{x:Bind const:Link.GitHub}" />
+                                        <HyperlinkButton x:Uid="UserGuide" NavigateUri="{x:Bind const:Link.UserGuide}" />
                                         <HyperlinkButton x:Uid="PrivacyPolicy" NavigateUri="{x:Bind const:Link.PrivacyPolicy}" />
-                                        <HyperlinkButton x:Uid="TermsOfService" NavigateUri="{x:Bind const:Link.TermsOfServiceUrl}" />
+                                        <HyperlinkButton x:Uid="TermsOfService" NavigateUri="{x:Bind const:Link.TermsOfService}" />
                                     </StackPanel>
                                 </StackPanel>
 
@@ -65,9 +64,9 @@
                                 <StackPanel Spacing="6">
                                     <TextBlock x:Uid="SetingsPageFeedback" />
                                     <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton x:Uid="SettingsPageQQGroup" NavigateUri="{x:Bind const:Link.QQGroupUrl}" />
-                                        <HyperlinkButton x:Uid="SettingsPageDiscord" NavigateUri="{x:Bind const:Link.DiscordUrl}" />
-                                        <HyperlinkButton x:Uid="SettingsPageTelegram" NavigateUri="{x:Bind const:Link.TelegramUrl}" />
+                                        <HyperlinkButton x:Uid="SettingsPageQQGroup" NavigateUri="{x:Bind const:Link.QQGroup}" />
+                                        <HyperlinkButton x:Uid="SettingsPageDiscord" NavigateUri="{x:Bind const:Link.Discord}" />
+                                        <HyperlinkButton x:Uid="SettingsPageTelegram" NavigateUri="{x:Bind const:Link.Telegram}" />
                                     </StackPanel>
                                 </StackPanel>
                             </dev:SettingsCard>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtAreaEffectSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="SettingsPageAlbumEffect" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <dev:SettingsCard x:Uid="SettingsPageImageSwitchType" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8EB;}">
+                        <ComboBox SelectedIndex="{x:Bind AlbumArtAreaEffectSettings.ImageSwitchType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageCrossfade" />
+                            <ComboBoxItem x:Uid="SettingsPageSlide" />
+                        </ComboBox>
+                    </dev:SettingsCard>
+
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaEffectSettingsControl.xaml.cs

@@ -0,0 +1,37 @@
+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.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.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class AlbumArtAreaEffectSettingsControl : UserControl
+{
+    public static readonly DependencyProperty AlbumArtAreaEffectSettingsProperty =
+    DependencyProperty.Register(nameof(AlbumArtAreaEffectSettings), typeof(AlbumArtAreaEffectSettings), typeof(AlbumArtAreaEffectSettingsControl), new PropertyMetadata(default));
+
+    public AlbumArtAreaEffectSettings AlbumArtAreaEffectSettings
+    {
+        get => (AlbumArtAreaEffectSettings)GetValue(AlbumArtAreaEffectSettingsProperty);
+        set => SetValue(AlbumArtAreaEffectSettingsProperty, value);
+    }
+
+    public AlbumArtAreaEffectSettingsControl()
+    {
+        InitializeComponent();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaStyleSettingsControl.xaml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtLayoutSettingsControl"
+    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtAreaStyleSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
@@ -16,29 +16,40 @@
             <Grid Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
+                    <TextBlock x:Uid="SettingsPageAlbumStyle" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <!--  整体对齐  -->
+                    <dev:SettingsCard x:Uid="SettingsPageAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
+                        <ComboBox SelectedIndex="{x:Bind AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageLeft" />
+                            <ComboBoxItem x:Uid="SettingsPageCenter" />
+                            <ComboBoxItem x:Uid="SettingsPageRight" />
+                        </ComboBox>
+                    </dev:SettingsCard>
+
                     <TextBlock x:Uid="SettingsPageAlbumArt" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
+                    <!--  专辑高度  -->
                     <dev:SettingsExpander
-                        x:Uid="SettingsPageAlbumArtSize"
+                        x:Uid="SettingsPageAlbumArtHeight"
                         HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE744;}"
+                                                 Glyph=&#xE784;}"
                         IsExpanded="True">
                         <dev:SettingsExpander.Items>
                             <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
-                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Mode=TwoWay}" />
+                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Mode=TwoWay}" />
                             </dev:SettingsCard>
-                            <dev:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                            <dev:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
                                 <local:ExtendedSlider
-                                    Frequency="2"
-                                    Maximum="800"
-                                    Minimum="10"
-                                    ResetButtonVisibility="Collapsed"
+                                    Maximum="512"
+                                    Minimum="0"
                                     Unit="px"
-                                    Value="{x:Bind AlbumArtLayoutSettings.AlbumArtSize, Mode=TwoWay}" />
+                                    Value="{x:Bind AlbumArtLayoutSettings.CoverImageHeight, Mode=TwoWay}" />
                             </dev:SettingsCard>
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
+                    <!--  专辑圆角  -->
                     <dev:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
                         <local:ExtendedSlider
                             Default="12"
@@ -48,6 +59,7 @@
                             Value="{x:Bind AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <!--  专辑阴影  -->
                     <dev:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
                         <local:ExtendedSlider
                             Default="12"
@@ -58,14 +70,6 @@
 
                     <TextBlock x:Uid="SettingsPageSongInfo" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                    <dev:SettingsCard x:Uid="SettingsPageSongInfoAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
-                        <ComboBox SelectedIndex="{x:Bind AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageSongInfoLeft" />
-                            <ComboBoxItem x:Uid="SettingsPageSongInfoCenter" />
-                            <ComboBoxItem x:Uid="SettingsPageSongInfoRight" />
-                        </ComboBox>
-                    </dev:SettingsCard>
-
                     <dev:SettingsExpander
                         x:Uid="SettingsPageLyricsFontSize"
                         HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -87,21 +91,15 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsExpander
-                        x:Uid="SettingsPageShowTitle"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xEF3D;}"
-                        IsExpanded="True">
+                    <dev:SettingsCard x:Uid="SettingsPageShowTitle" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEF3D;}">
                         <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=TwoWay}" />
-                        <dev:SettingsExpander.Items>
-                            <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>
+                    </dev:SettingsCard>
+                    <dev:SettingsCard x:Uid="SettingsPageShowArtists" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEF3D;}">
+                        <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.ShowArtists, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+                    <dev:SettingsCard x:Uid="SettingsPageShowAlbum" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEF3D;}">
+                        <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.ShowAlbum, Mode=TwoWay}" />
+                    </dev:SettingsCard>
 
                 </StackPanel>
             </Grid>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtAreaStyleSettingsControl.xaml.cs

@@ -7,18 +7,18 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace BetterLyrics.WinUI3.Controls
 {
-    public sealed partial class AlbumArtLayoutSettingsControl : UserControl
+    public sealed partial class AlbumArtAreaStyleSettingsControl : UserControl
     {
         public static readonly DependencyProperty AlbumArtLayoutSettingsProperty =
-            DependencyProperty.Register(nameof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettingsControl), new PropertyMetadata(default));
+            DependencyProperty.Register(nameof(AlbumArtLayoutSettings), typeof(AlbumArtAreaStyleSettings), typeof(AlbumArtAreaStyleSettingsControl), new PropertyMetadata(default));
 
-        public AlbumArtLayoutSettings AlbumArtLayoutSettings
+        public AlbumArtAreaStyleSettings AlbumArtLayoutSettings
         {
-            get => (AlbumArtLayoutSettings)GetValue(AlbumArtLayoutSettingsProperty);
+            get => (AlbumArtAreaStyleSettings)GetValue(AlbumArtLayoutSettingsProperty);
             set => SetValue(AlbumArtLayoutSettingsProperty, value);
         }
 
-        public AlbumArtLayoutSettingsControl()
+        public AlbumArtAreaStyleSettingsControl()
         {
             InitializeComponent();
         }

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>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml

@@ -6,25 +6,54 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:BetterLyrics.WinUI3.Models"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Grid>
         <StackPanel Orientation="Horizontal" Spacing="6">
+            <TextBlock
+                x:Name="SelectedLocalizedFontFamilyTextBlock"
+                VerticalAlignment="Center"
+                Foreground="{StaticResource TextFillColorSecondaryBrush}"
+                IsTextSelectionEnabled="True" />
             <AutoSuggestBox
                 x:Name="AutoSuggestBox"
-                Width="150"
+                MinWidth="180"
                 GotFocus="AutoSuggestBox_GotFocus"
                 LostFocus="AutoSuggestBox_LostFocus"
                 SuggestionChosen="AutoSuggestBox_SuggestionChosen"
                 Text="{x:Bind SelectedFontFamily, Mode=OneWay}"
-                TextChanged="AutoSuggestBox_TextChanged" />
+                TextChanged="AutoSuggestBox_TextChanged">
+                <!--<AutoSuggestBox.ItemTemplate>
+                    <DataTemplate x:DataType="models:ExtendedFontFamily">
+                        <StackPanel>
+                            <TextBlock Text="{x:Bind LocalizedFontFamily}" TextWrapping="Wrap" />
+                            <TextBlock
+                                FontSize="12"
+                                Foreground="{StaticResource TextFillColorSecondaryBrush}"
+                                Text="{x:Bind FontFamily}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </DataTemplate>
+                </AutoSuggestBox.ItemTemplate>-->
+            </AutoSuggestBox>
             <Button
                 Click="Button_Click"
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                       FontSize=12,
                                       Glyph=&#xE72C;}"
-                Style="{StaticResource GhostButtonStyle}" />
+                Style="{StaticResource GhostButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="SettingsPageRefreshDropdown" />
+                </ToolTipService.ToolTip>
+            </Button>
+            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE74A;}" Style="{StaticResource GhostButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="SettingsPageCollapseDropdown" />
+                </ToolTipService.ToolTip>
+            </Button>
+
         </StackPanel>
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/FontFamilyAutoSuggestBox.xaml.cs

@@ -1,8 +1,15 @@
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -11,11 +18,15 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class FontFamilyAutoSuggestBox : UserControl
     {
-        private List<string> SystemFontNames { get; set; } = [.. FontHelper.SystemFontFamilies];
+        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
+        //private List<ExtendedFontFamily> FontFamilies { get; set; } = [];
+        private List<string> FontFamilies { get; set; } = [];
 
         public FontFamilyAutoSuggestBox()
         {
             InitializeComponent();
+            RefreshFontFamilies();
         }
 
         public static readonly DependencyProperty SelectedFontFamilyProperty =
@@ -27,20 +38,47 @@ namespace BetterLyrics.WinUI3.Controls
             set => SetValue(SelectedFontFamilyProperty, value);
         }
 
+        private void RefreshFontFamilies()
+        {
+            //Task.Run(() =>
+            //{
+            //    var fontFamilies = FontHelper.SystemFontFamilies.Select(x => new ExtendedFontFamily()
+            //    {
+            //        FontFamily = x,
+            //        LocalizedFontFamily = FontHelper.GetLocalizedFontFamilyName(x, _settingsService.AppSettings.GeneralSettings.LanguageCode)
+            //    }).OrderBy(x => x.LocalizedFontFamily).ToList();
+            //    DispatcherQueue.TryEnqueue(() =>
+            //    {
+            //        FontFamilies = fontFamilies;
+            //    });
+            //});
+            FontFamilies = FontHelper.SystemFontFamilies.OrderBy(x => x).ToList();
+        }
 
         private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
         {
-            SelectedFontFamily = args.SelectedItem.ToString() ?? "";
+            if (args.SelectedItem is ExtendedFontFamily extendedFontFamily)
+            {
+                SelectedFontFamily = extendedFontFamily.FontFamily;
+            }
+            else
+            {
+                SelectedFontFamily = args.SelectedItem.ToString() ?? "";
+            }
         }
 
-        private void UpdateAutoSuggestBoxItemsSource()
+        private void UpdateAutoSuggestBoxItemsSource(string? query = null)
         {
+            query ??= AutoSuggestBox.Text;
+
+            //var suitableItems = new List<ExtendedFontFamily>();
             var suitableItems = new List<string>();
-            var splitText = AutoSuggestBox.Text.ToLower().Split(" ");
-            foreach (var fontFamily in SystemFontNames)
+            var splitText = query.ToLower().Split(" ");
+            foreach (var fontFamily in FontFamilies)
             {
-                var found = splitText.All((key) =>
+                bool found = splitText.All((key) =>
                 {
+                    //return fontFamily.FontFamily.ToLower().Contains(key) || fontFamily.LocalizedFontFamily.ToLower().Contains(key);
                     return fontFamily.ToLower().Contains(key);
                 });
                 if (found)
@@ -50,9 +88,15 @@ namespace BetterLyrics.WinUI3.Controls
             }
             if (suitableItems.Count == 0)
             {
+                //suitableItems.Add(new ExtendedFontFamily()
+                //{
+                //    FontFamily = "",
+                //    LocalizedFontFamily = "N/A"
+                //});
                 suitableItems.Add("N/A");
             }
-            AutoSuggestBox.ItemsSource = suitableItems.Order();
+            //AutoSuggestBox.ItemsSource = suitableItems.OrderBy(x => x.LocalizedFontFamily);
+            AutoSuggestBox.ItemsSource = suitableItems.OrderBy(x => x);
         }
 
         private void AutoSuggestBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
@@ -63,16 +107,18 @@ namespace BetterLyrics.WinUI3.Controls
             {
                 UpdateAutoSuggestBoxItemsSource();
             }
+
+            SelectedLocalizedFontFamilyTextBlock.Text = FontHelper.GetLocalizedFontFamilyName(SelectedFontFamily, _settingsService.AppSettings.GeneralSettings.LanguageCode);
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            SystemFontNames = [.. FontHelper.SystemFontFamilies];
+            RefreshFontFamilies();
         }
 
         private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
         {
-            UpdateAutoSuggestBoxItemsSource();
+            UpdateAutoSuggestBoxItemsSource("");
         }
 
         private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.ImageSwitcher"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:const="using:BetterLyrics.WinUI3.Constants"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.OpacityTransition>
+            <ScalarTransition Duration="{x:Bind const:Time.AnimationDuration}" />
+        </Grid.OpacityTransition>
+        <local:ShadowImage
+            x:Name="LastAlbumArtImage"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            CornerRadiusAmount="{x:Bind CornerRadiusAmount, Mode=OneWay}"
+            ShadowAmount="{x:Bind ShadowAmount, Mode=OneWay}" />
+        <local:ShadowImage
+            x:Name="AlbumArtImage"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            CornerRadiusAmount="{x:Bind CornerRadiusAmount, Mode=OneWay}"
+            ShadowAmount="{x:Bind ShadowAmount, Mode=OneWay}" />
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ImageSwitcher.xaml.cs

@@ -0,0 +1,145 @@
+using BetterLyrics.WinUI3.Enums;
+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.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class ImageSwitcher : UserControl
+{
+    public int CornerRadiusAmount
+    {
+        get { return (int)GetValue(CornerRadiusAmountProperty); }
+        set { SetValue(CornerRadiusAmountProperty, value); }
+    }
+
+    public static readonly DependencyProperty CornerRadiusAmountProperty =
+        DependencyProperty.Register(nameof(CornerRadiusAmount), typeof(int), typeof(ImageSwitcher), new PropertyMetadata(0));
+
+    public int ShadowAmount
+    {
+        get { return (int)GetValue(ShadowAmountProperty); }
+        set { SetValue(ShadowAmountProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShadowAmountProperty =
+        DependencyProperty.Register(nameof(ShadowAmount), typeof(int), typeof(ImageSwitcher), new PropertyMetadata(0));
+
+    public ImageSource? Source
+    {
+        get { return (ImageSource?)GetValue(SourceProperty); }
+        set { SetValue(SourceProperty, value); }
+    }
+
+    public static readonly DependencyProperty SourceProperty =
+        DependencyProperty.Register(nameof(Source), typeof(ImageSource), typeof(ImageSwitcher), new PropertyMetadata(null, OnDependencyPropertyChanged));
+
+    public ImageSwitchType SwitchType
+    {
+        get { return (ImageSwitchType)GetValue(SwitchTypeProperty); }
+        set { SetValue(SwitchTypeProperty, value); }
+    }
+
+    public static readonly DependencyProperty SwitchTypeProperty =
+        DependencyProperty.Register(nameof(SwitchType), typeof(ImageSwitchType), typeof(ImageSwitcher), new PropertyMetadata(ImageSwitchType.Crossfade));
+
+    public ImageSwitcher()
+    {
+        InitializeComponent();
+    }
+
+    private void UpdateSource()
+    {
+        switch (SwitchType)
+        {
+            case ImageSwitchType.Crossfade:
+                UpdateSourceCrossfade();
+                break;
+            case ImageSwitchType.Slide:
+                UpdateSourceSlide();
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void UpdateSourceCrossfade()
+    {
+        // Ϊ<><CEAA><EFBFBD><EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD>þ<EFBFBD>Դ
+        LastAlbumArtImage.Source = AlbumArtImage.Source;
+        // ʹ<><CAB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
+        LastAlbumArtImage.TranslationTransition = null;
+        LastAlbumArtImage.OpacityTransition = null;
+        LastAlbumArtImage.Translation = new();
+        LastAlbumArtImage.Opacity = 1;
+        LastAlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+
+        // ʹǰ<CAB9><C7B0>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
+        AlbumArtImage.TranslationTransition = null;
+        AlbumArtImage.OpacityTransition = null;
+        AlbumArtImage.Translation = new();
+        AlbumArtImage.Opacity = 0;
+        AlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+        // ֮<><D6AE>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ
+        AlbumArtImage.Source = Source;
+
+        // <20><><EFBFBD>浭<EFBFBD><E6B5AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        LastAlbumArtImage.Opacity = 0;
+        AlbumArtImage.Opacity = 1;
+    }
+
+    private void UpdateSourceSlide()
+    {
+        // Ϊ<><CEAA><EFBFBD><EFBFBD>ͼƬ<CDBC><C6AC><EFBFBD>þ<EFBFBD>Դ
+        LastAlbumArtImage.Source = AlbumArtImage.Source;
+        // ʹ<><CAB9><EFBFBD><EFBFBD>λ
+        LastAlbumArtImage.TranslationTransition = null;
+        LastAlbumArtImage.OpacityTransition = null;
+        LastAlbumArtImage.Translation = new();
+        LastAlbumArtImage.Opacity = 1;
+        LastAlbumArtImage.TranslationTransition = new Vector3Transition { Duration = Constants.Time.AnimationDuration };
+        LastAlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+
+        // ʹǰ<CAB9><C7B0>ͼƬ<CDBC><C6AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD>
+        AlbumArtImage.TranslationTransition = null;
+        AlbumArtImage.OpacityTransition = null;
+        AlbumArtImage.Translation = new(-(float)ActualWidth, 0, 0);
+        AlbumArtImage.Opacity = 0;
+        AlbumArtImage.TranslationTransition = new Vector3Transition { Duration = Constants.Time.AnimationDuration };
+        AlbumArtImage.OpacityTransition = new ScalarTransition { Duration = Constants.Time.AnimationDuration };
+        // ֮<><D6AE>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Դ
+        AlbumArtImage.Source = Source;
+
+        // <20><><EFBFBD><EFBFBD>
+        LastAlbumArtImage.Opacity = 0;
+        AlbumArtImage.Opacity = 1;
+        LastAlbumArtImage.Translation = new(-(float)ActualWidth, 0, 0);
+        AlbumArtImage.Translation = new();
+    }
+
+    private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ImageSwitcher imageSwitcher)
+        {
+            if (e.Property == SourceProperty)
+            {
+                imageSwitcher.UpdateSource();
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml

@@ -17,7 +17,7 @@
             <Grid Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <TextBlock x:Uid="SettingsPageBackgroundOverlay" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <dev:SettingsCard x:Uid="SettingsPageTheme" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE790;}">
                         <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind LyricsBackgroundSettings.LyricsBackgroundTheme, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
@@ -47,51 +47,6 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsExpander
-                        x:Uid="SettingsPageAlbumArtLayer"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE93C;}"
-                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=TwoWay}" />
-                        <dev:SettingsExpander.Items>
-
-                            <dev:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
-                                <uc:ExtendedSlider
-                                    Default="100"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Unit="%"
-                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlayOpacity, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                            <dev:SettingsCard x:Uid="SettingsPageSpeed" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
-                                <uc:ExtendedSlider
-                                    Default="50"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Unit="%"
-                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlaySpeed, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                            <dev:SettingsCard x:Uid="SettingsPageBlurAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
-                                <uc:ExtendedSlider
-                                    Default="100"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                            <dev:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
-                                <uc:ExtendedSlider
-                                    Default="0"
-                                    Maximum="10"
-                                    Minimum="0"
-                                    Value="{x:Bind LyricsBackgroundSettings.CoverAcrylicEffectAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                        </dev:SettingsExpander.Items>
-                    </dev:SettingsExpander>
-
                     <dev:SettingsExpander
                         x:Uid="SettingsPageFluidLayer"
                         HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -162,6 +117,21 @@
                                 </ComboBox>
                             </dev:SettingsCard>
 
+                            <dev:SettingsCard x:Uid="SettingsPageSpectrumLayerStyle" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsBackgroundSettings.SpectrumStyle, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageSpectrumStyleCurve" />
+                                    <ComboBoxItem x:Uid="SettingsPageSpectrumStyleBar" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="128"
+                                    Maximum="1024"
+                                    Minimum="1"
+                                    Value="{x:Bind LyricsBackgroundSettings.SpectrumCount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <UserControl
-    x:Class="BetterLyrics.WinUI3.Renderer.LyricsRenderer"
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsCanvas"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:canvas="using:Microsoft.Graphics.Canvas.UI.Xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:local="using:BetterLyrics.WinUI3.Renderer"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Unloaded="LyricsCanvas_Unloaded"
+    Unloaded="Canvas_Unloaded"
     mc:Ignorable="d">
 
     <Grid>
         <canvas:CanvasAnimatedControl
-            x:Name="LyricsCanvas"
-            CreateResources="LyricsCanvas_CreateResources"
-            Draw="LyricsCanvas_Draw"
-            Update="LyricsCanvas_Update" />
+            x:Name="Canvas"
+            CreateResources="Canvas_CreateResources"
+            Draw="Canvas_Draw"
+            Update="Canvas_Update" />
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs

@@ -0,0 +1,863 @@
+// 2025/6/23 by Zhe Fang
+
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Logic;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Renderer;
+using BetterLyrics.WinUI3.Services.LastFMService;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
+using BetterLyrics.WinUI3.Services.MediaSessionsService;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.Graphics.Canvas.UI.Xaml;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using Windows.Foundation;
+using Windows.UI;
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class LyricsCanvas : UserControl,
+        IRecipient<PropertyChangedMessage<int>>,
+        IRecipient<PropertyChangedMessage<AlbumArtThemeColors>>,
+        IRecipient<PropertyChangedMessage<TimeSpan>>,
+        IRecipient<PropertyChangedMessage<LyricsData?>>,
+        IRecipient<PropertyChangedMessage<LyricsWindowStatus>>,
+        IRecipient<PropertyChangedMessage<double>>,
+        IRecipient<PropertyChangedMessage<bool>>,
+        IRecipient<PropertyChangedMessage<TextAlignmentType>>,
+        IRecipient<PropertyChangedMessage<SongInfo?>>,
+        IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
+        IRecipient<PropertyChangedMessage<string>>
+    {
+        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
+        private readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
+        private readonly ILastFMService _lastFMService = Ioc.Default.GetRequiredService<ILastFMService>();
+
+        private readonly LyricsRenderer _lyricsRenderer = new();
+        private readonly FluidBackgroundRenderer _fluidRenderer = new();
+        private readonly PureColorBackgroundRenderer _pureColorRenderer = new();
+        private readonly SnowRenderer _snowRenderer = new();
+        private readonly FogRenderer _fogRenderer = new();
+        private readonly SpectrumRenderer _spectrumRenderer = new();
+
+        private readonly LyricsSynchronizer _synchronizer = new();
+        private readonly LyricsAnimator _animator = new();
+
+        private readonly SpectrumAnalyzer _spectrumAnalyzer = new();
+
+        private readonly ValueTransition<Color> _immersiveBgColorTransition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+        private readonly ValueTransition<double> _immersiveBgOpacityTransition = new(
+            initialValue: 1f,
+            durationSeconds: 0.3f
+        );
+        private readonly ValueTransition<Color> _accentColor1Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+        private readonly ValueTransition<Color> _accentColor2Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+        private readonly ValueTransition<Color> _accentColor3Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+        private readonly ValueTransition<Color> _accentColor4Transition = new(
+            initialValue: Colors.Transparent,
+            durationSeconds: 0.3f,
+            interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
+        );
+        private readonly ValueTransition<double> _canvasYScrollTransition = new(
+            initialValue: 0f,
+            durationSeconds: 0.3f,
+            easingType: EasingType.EaseInOutSine
+        );
+        private readonly ValueTransition<double> _mouseYScrollTransition = new(
+            initialValue: 0f,
+            durationSeconds: 0.3f,
+            easingType: EasingType.EaseInOutSine
+        );
+
+        private TimeSpan _songPositionWithOffset;
+        private TimeSpan _songPosition; // <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
+        private TimeSpan _totalPlayedTime; // <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ػ<EFBFBD><D8BB>ظ<EFBFBD><D8B8><EFBFBD><EFBFBD>ŵ<EFBFBD>ʱ<EFBFBD>䣩
+        private bool _isLastFMTracked = false;
+
+        private double _renderLyricsStartX = 0;
+        private double _renderLyricsStartY = 0;
+        private double _renderLyricsWidth = 0;
+        private double _renderLyricsHeight = 0;
+        private double _renderLyricsOpacity = 0;
+
+        private Point _mousePosition = new(0, 0);
+        private int _mouseHoverLineIndex = -1;
+        private bool _isMouseInLyricsArea = false;
+        private bool _isMousePressing = false;
+        private bool _isMouseScrolling = false;
+
+        private List<RenderLyricsLine>? _renderLyricsLines = null;
+
+        private bool _isLayoutChanged = true;
+        private bool _isMouseScrollingChanged = false;
+
+        private int _playingLineIndex;
+        private (int Start, int End) _visibleRange;
+        private double _canvasTargetScrollOffset;
+
+        public TimeSpan SongPosition => _songPosition;
+        public double CurrentCanvasYScroll => _canvasYScrollTransition.Value;
+        public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines);
+        public int CurrentHoveringLineIndex => _mouseHoverLineIndex;
+
+        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC> X <20><><EFBFBD><EFBFBD>
+        public double LyricsStartX
+        {
+            get { return (double)GetValue(LyricsStartXProperty); }
+            set { SetValue(LyricsStartXProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsStartXProperty =
+            DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+
+        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ Y <20><><EFBFBD><EFBFBD>
+        public double LyricsStartY
+        {
+            get { return (double)GetValue(LyricsStartYProperty); }
+            set { SetValue(LyricsStartYProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsStartYProperty =
+            DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+
+        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+        public double LyricsWidth
+        {
+            get { return (double)GetValue(LyricsWidthProperty); }
+            set { SetValue(LyricsWidthProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsWidthProperty =
+            DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+
+        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>
+        public double LyricsHeight
+        {
+            get { return (double)GetValue(LyricsHeightProperty); }
+            set { SetValue(LyricsHeightProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsHeightProperty =
+            DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+
+        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>
+        public double LyricsOpacity
+        {
+            get { return (double)GetValue(LyricsOpacityProperty); }
+            set { SetValue(LyricsOpacityProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsOpacityProperty =
+            DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+
+        /// <summary>
+        /// <20>û<EFBFBD><C3BB>ٿ<EFBFBD><D9BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ľ<EFBFBD><C4BE>루<EFBFBD><EBA3A8> 0 <20><>ʼ<EFBFBD>㣩
+        /// </summary>
+        public double MouseScrollOffset
+        {
+            get { return (double)GetValue(MouseScrollOffsetProperty); }
+            set { SetValue(MouseScrollOffsetProperty, value); }
+        }
+
+        public static readonly DependencyProperty MouseScrollOffsetProperty =
+            DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+
+        /// <summary>
+        /// <20>û<EFBFBD><C3BB><EFBFBD><EFBFBD>굱ǰ<EAB5B1><C7B0>λ<EFBFBD>ã<EFBFBD><C3A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD><DAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻǣ<CFBD>
+        /// </summary>
+        public Point MousePosition
+        {
+            get { return (Point)GetValue(MousePositionProperty); }
+            set { SetValue(MousePositionProperty, value); }
+        }
+
+        public static readonly DependencyProperty MousePositionProperty =
+            DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnLayoutPropChanged));
+
+        public bool IsMouseInLyricsArea
+        {
+            get { return (bool)GetValue(IsMouseInLyricsAreaProperty); }
+            set { SetValue(IsMouseInLyricsAreaProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsMouseInLyricsAreaProperty =
+            DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+
+        public bool IsMousePressing
+        {
+            get { return (bool)GetValue(IsMousePressingProperty); }
+            set { SetValue(IsMousePressingProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsMousePressingProperty =
+            DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+
+        public bool IsMouseScrolling
+        {
+            get { return (bool)GetValue(IsMouseScrollingProperty); }
+            set { SetValue(IsMouseScrollingProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsMouseScrollingProperty =
+            DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+
+        public LyricsCanvas()
+        {
+            InitializeComponent();
+
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<int>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<AlbumArtThemeColors>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<TimeSpan>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsData?>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsWindowStatus>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<double>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<bool>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<TextAlignmentType>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<SongInfo?>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<LyricsFontWeight>>(this);
+            WeakReferenceMessenger.Default.Register<PropertyChangedMessage<string>>(this);
+        }
+
+        private static void OnLayoutPropChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is LyricsCanvas canvas)
+            {
+                if (e.Property == LyricsStartXProperty)
+                {
+                    canvas._renderLyricsStartX = Convert.ToDouble(e.NewValue);
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == LyricsStartYProperty)
+                {
+                    canvas._renderLyricsStartY = Convert.ToDouble(e.NewValue);
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == LyricsWidthProperty)
+                {
+                    canvas._renderLyricsWidth = Convert.ToDouble(e.NewValue);
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == LyricsHeightProperty)
+                {
+                    canvas._renderLyricsHeight = Convert.ToDouble(e.NewValue);
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == LyricsOpacityProperty)
+                {
+                    canvas._renderLyricsOpacity = Convert.ToDouble(e.NewValue);
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == MouseScrollOffsetProperty)
+                {
+                    canvas._mouseYScrollTransition.StartTransition(Convert.ToDouble(e.NewValue));
+                }
+                else if (e.Property == MousePositionProperty)
+                {
+                    canvas._mousePosition = (Point)e.NewValue;
+                }
+                else if (e.Property == IsMouseInLyricsAreaProperty)
+                {
+                    canvas._isMouseInLyricsArea = (bool)e.NewValue;
+                }
+                else if (e.Property == IsMousePressingProperty)
+                {
+                    canvas._isMousePressing = (bool)e.NewValue;
+                }
+                else if (e.Property == IsMouseScrollingProperty)
+                {
+                    var value = (bool)e.NewValue;
+                    if (canvas._isMouseScrolling != value)
+                    {
+                        canvas._isMouseScrollingChanged = true;
+                    }
+                    canvas._isMouseScrolling = value;
+                }
+            }
+        }
+
+        // ====
+
+        private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventArgs args)
+        {
+            var bounds = new Rect(0, 0, sender.Size.Width, sender.Size.Height);
+
+            var status = _liveStatesService.LiveStates.LyricsWindowStatus;
+            var albumArtLayout = status.AlbumArtLayoutSettings;
+            var lyricsBg = status.LyricsBackgroundSettings;
+            var lyricsStyle = status.LyricsStyleSettings;
+            var lyricsEffect = status.LyricsEffectSettings;
+
+            double songDuration = _mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0;
+            bool isForceWordByWord = _settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect;
+
+            var lyricsThemeColors = _mediaSessionsService.AlbumArtThemeColors;
+
+            Color overlayColor;
+            double finalOpacity;
+
+            if (status.IsAdaptToEnvironment)
+            {
+                // <20><><EFBFBD><EFBFBD>Ӧɫ
+                overlayColor = _immersiveBgColorTransition.Value;
+                finalOpacity = _immersiveBgOpacityTransition.Value * lyricsBg.PureColorOverlayOpacity / 100.0;
+            }
+            else
+            {
+                // ר<><D7A8>ɫ
+                overlayColor = _accentColor1Transition.Value;
+                finalOpacity = lyricsBg.PureColorOverlayOpacity / 100.0;
+            }
+
+            _pureColorRenderer.Draw(
+                args.DrawingSession,
+                bounds,
+                overlayColor,
+                finalOpacity,
+                lyricsBg.IsPureColorOverlayEnabled
+            );
+
+            _fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity;
+            _fluidRenderer.IsEnabled = lyricsBg.IsFluidOverlayEnabled;
+            _fluidRenderer.Draw(sender, args.DrawingSession);
+
+            _snowRenderer.Draw(sender, args.DrawingSession);
+
+            _fogRenderer.Draw(sender, args.DrawingSession);
+
+            _lyricsRenderer.Draw(
+                control: sender,
+                ds: args.DrawingSession,
+                lines: _renderLyricsLines,
+                playingLineIndex: _playingLineIndex,
+                mouseHoverLineIndex: _mouseHoverLineIndex,
+                isMousePressing: _isMousePressing,
+                startVisibleIndex: _visibleRange.Start,
+                endVisibleIndex: _visibleRange.End,
+                lyricsX: _renderLyricsStartX,
+                lyricsY: _renderLyricsStartY,
+                lyricsWidth: _renderLyricsWidth,
+                lyricsHeight: _renderLyricsHeight,
+                userScrollOffset: _mouseYScrollTransition.Value,
+                lyricsOpacity: _renderLyricsOpacity,
+                playingLineTopOffsetFactor: lyricsStyle.PlayingLineTopOffset / 100.0,
+                windowStatus: status,
+                strokeColor: lyricsThemeColors.StrokeFontColor,
+                bgColor: lyricsThemeColors.BgFontColor,
+                fgColor: lyricsThemeColors.FgFontColor,
+                getPlaybackState: (lineIndex) =>
+                {
+                    if (_renderLyricsLines == null) return new LinePlaybackState();
+
+                    var line = _renderLyricsLines.ElementAtOrDefault(lineIndex);
+                    if (line == null) return new LinePlaybackState();
+
+                    var nextLine = _renderLyricsLines.ElementAtOrDefault(lineIndex + 1);
+
+                    return _synchronizer.GetLinePlayingProgress(
+                        _songPositionWithOffset.TotalMilliseconds,
+                        line,
+                        nextLine,
+                        songDuration,
+                        isForceWordByWord
+                    );
+                }
+            );
+
+            if (_spectrumAnalyzer.IsCapturing)
+            {
+                _spectrumRenderer.Draw(
+                    resourceCreator: sender,
+                    ds: args.DrawingSession,
+                    spectrumData: _spectrumAnalyzer?.SmoothSpectrum,
+                    barCount: _spectrumAnalyzer?.BarCount ?? 1,
+                    isEnabled: lyricsBg.IsSpectrumOverlayEnabled,
+                    placement: lyricsBg.SpectrumPlacement,
+                    style: lyricsBg.SpectrumStyle,
+                    canvasWidth: sender.Size.Width,
+                    canvasHeight: sender.Size.Height,
+                    fillColor: lyricsThemeColors.BgFontColor
+                );
+            }
+
+#if DEBUG
+            args.DrawingSession.DrawText(
+                    $"Lyrics render start pos: ({(int)_renderLyricsStartX}, {(int)_renderLyricsStartY})\n" +
+                    $"Lyrics render size: [{(int)_renderLyricsWidth} x {(int)_renderLyricsHeight}]\n" +
+                    $"Lyrics actual height: {LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines)}\n" +
+                    $"Playing line (idx): {_playingLineIndex}\n" +
+                    $"Mouse hovering line (idx): {_mouseHoverLineIndex}\n" +
+                    $"Visible lines range (idx): [{_visibleRange.Start}, {_visibleRange.End}]\n" +
+                    $"Total line count: {LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines).End + 1}\n" +
+                    $"Played: {_songPosition} / {TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0)}\n" +
+                    $"Y offset: {_canvasYScrollTransition.Value}\n" +
+                    $"User scroll offset: {_mouseYScrollTransition.Value}",
+                new Vector2(0, 0), Colors.Red);
+#endif
+
+        }
+
+        private void Canvas_Update(ICanvasAnimatedControl sender, CanvasAnimatedUpdateEventArgs args)
+        {
+            var lyricsBg = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings;
+            var lyricsStyle = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings;
+            var lyricsEffect = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings;
+            var albumArtThemeColors = _mediaSessionsService.AlbumArtThemeColors;
+            var lyricsData = _mediaSessionsService.CurrentLyricsData;
+
+            TimeSpan elapsedTime = args.Timing.ElapsedTime;
+
+            _accentColor1Transition.Update(elapsedTime);
+            _accentColor2Transition.Update(elapsedTime);
+            _accentColor3Transition.Update(elapsedTime);
+            _accentColor4Transition.Update(elapsedTime);
+
+            _immersiveBgOpacityTransition.Update(elapsedTime);
+            _immersiveBgColorTransition.Update(elapsedTime);
+
+            UpdatePlaybackState(elapsedTime);
+
+            TriggerRelayout();
+
+            #region UpdatePlayingLineIndex
+
+            int newPlayingIndex = _synchronizer.GetCurrentLineIndex(_songPositionWithOffset.TotalMilliseconds, lyricsData);
+            bool isPlayingLineChanged = newPlayingIndex != _playingLineIndex;
+            _playingLineIndex = newPlayingIndex;
+
+            #endregion
+
+            #region UpdateTargetScrollOffset
+
+            if (isPlayingLineChanged || _isLayoutChanged)
+            {
+                var targetScroll = LyricsLayoutManager.CalculateTargetScrollOffset(_renderLyricsLines, _playingLineIndex);
+                if (targetScroll.HasValue) _canvasTargetScrollOffset = targetScroll.Value;
+
+                _canvasYScrollTransition.SetEasingType(lyricsEffect.LyricsScrollEasingType);
+                _canvasYScrollTransition.SetDuration(lyricsEffect.LyricsScrollDuration / 1000.0);
+                _canvasYScrollTransition.StartTransition(_canvasTargetScrollOffset, _isLayoutChanged);
+            }
+            _canvasYScrollTransition.Update(elapsedTime);
+
+            #endregion
+
+            _mouseYScrollTransition.Update(elapsedTime);
+
+            _mouseHoverLineIndex = LyricsLayoutManager.FindMouseHoverLineIndex(
+                _renderLyricsLines,
+                _isMouseInLyricsArea,
+                _mousePosition,
+                _canvasYScrollTransition.Value + _mouseYScrollTransition.Value,
+                _renderLyricsStartY,
+                _renderLyricsHeight,
+                lyricsStyle.PlayingLineTopOffset / 100.0
+            );
+
+            _visibleRange = LyricsLayoutManager.CalculateVisibleRange(
+                _renderLyricsLines,
+                _canvasYScrollTransition.Value + _mouseYScrollTransition.Value, // <20><>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>
+                _renderLyricsStartY,
+                _renderLyricsHeight,
+                sender.Size.Height,
+                lyricsStyle.PlayingLineTopOffset / 100.0
+            );
+
+            var maxRange = LyricsLayoutManager.CalculateMaxRange(_renderLyricsLines);
+
+            _animator.UpdateLines(
+                _renderLyricsLines,
+                _isMouseScrolling ? maxRange.Start : _visibleRange.Start,
+                _isMouseScrolling ? maxRange.End : _visibleRange.End,
+                _playingLineIndex,
+                sender.Size.Height,
+                _canvasTargetScrollOffset,
+                lyricsStyle.PlayingLineTopOffset / 100.0,
+                _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings,
+                _canvasYScrollTransition,
+                albumArtThemeColors.BgFontColor,
+                albumArtThemeColors.FgFontColor,
+                elapsedTime,
+                _isMouseScrolling,
+                _isLayoutChanged,
+                isPlayingLineChanged,
+                _isMouseScrollingChanged
+            );
+
+            _isMouseScrollingChanged = false;
+
+            _lyricsRenderer.CalculateLyrics3DMatrix(
+                lyricsEffect: lyricsEffect,
+                lyricsX: _renderLyricsStartX,
+                lyricsY: _renderLyricsStartY,
+                lyricsWidth: _renderLyricsWidth,
+                canvasHeight: sender.Size.Height
+            );
+
+            _isLayoutChanged = false;
+
+            if (_fluidRenderer.IsEnabled)
+            {
+                _fluidRenderer.UpdateColors(
+                    _accentColor1Transition.Value,
+                    _accentColor2Transition.Value,
+                    _accentColor3Transition.Value,
+                    _accentColor4Transition.Value
+                );
+                _fluidRenderer.Update(elapsedTime);
+            }
+
+            _snowRenderer.IsEnabled = lyricsBg.IsSnowFlakeOverlayEnabled;
+            _snowRenderer.Amount = lyricsBg.SnowFlakeOverlayAmount / 100f;
+            _snowRenderer.Speed = lyricsBg.SnowFlakeOverlaySpeed;
+            _snowRenderer.Update(elapsedTime.TotalSeconds);
+
+            _fogRenderer.IsEnabled = lyricsBg.IsFogOverlayEnabled;
+            _fogRenderer.Update(elapsedTime.TotalSeconds);
+
+            if (lyricsBg.IsSpectrumOverlayEnabled && !_spectrumAnalyzer.IsCapturing)
+            {
+                _spectrumAnalyzer.BarCount = lyricsBg.SpectrumCount;
+                _spectrumAnalyzer.StartCapture();
+            }
+            else if (!lyricsBg.IsSpectrumOverlayEnabled && _spectrumAnalyzer.IsCapturing)
+            {
+                _spectrumAnalyzer.StopCapture();
+            }
+            if (_spectrumAnalyzer.IsCapturing)
+            {
+                _spectrumAnalyzer.UpdateSmoothSpectrum();
+            }
+        }
+
+        private void Canvas_Unloaded(object sender, RoutedEventArgs e)
+        {
+            Canvas.RemoveFromVisualTree();
+            Canvas = null;
+
+            _fluidRenderer.Dispose();
+            _snowRenderer.Dispose();
+            _fogRenderer.Dispose();
+            _spectrumRenderer.Dispose();
+            DisposeAnalyzer();
+        }
+
+        private async void Canvas_CreateResources(CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
+        {
+            args.TrackAsyncAction(_fluidRenderer.LoadResourcesAsync().AsAsyncAction());
+            _snowRenderer.LoadResources();
+            _fogRenderer.LoadResources();
+
+            _isLayoutChanged = true;
+            TriggerRelayout();
+        }
+
+        // ====
+
+        private void DisposeAnalyzer()
+        {
+            if (_spectrumAnalyzer.IsCapturing)
+            {
+                _spectrumAnalyzer.StopCapture();
+            }
+            _spectrumAnalyzer.Dispose();
+        }
+
+        private void TriggerRelayout()
+        {
+            if (_renderLyricsLines == null || !_isLayoutChanged) return;
+
+            LyricsLayoutManager.MeasureAndArrange(
+                resourceCreator: Canvas,
+                lines: _renderLyricsLines,
+                status: _liveStatesService.LiveStates.LyricsWindowStatus,
+                appSettings: _settingsService.AppSettings,
+                canvasWidth: Canvas.Size.Width,
+                canvasHeight: Canvas.Size.Height,
+                lyricsWidth: _renderLyricsWidth,
+                lyricsHeight: _renderLyricsHeight
+            );
+        }
+
+        private void UpdatePlaybackState(TimeSpan elapsedTime)
+        {
+            if (_mediaSessionsService.CurrentIsPlaying)
+            {
+                _songPosition += elapsedTime;
+                _totalPlayedTime += elapsedTime;
+                _songPositionWithOffset = _songPosition + TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
+                CheckAndScrobbleLastFM();
+            }
+        }
+
+        private void CheckAndScrobbleLastFM()
+        {
+            bool isEnabled = _mediaSessionsService.CurrentMediaSourceProviderInfo?.IsLastFMTrackEnabled ?? false;
+            if (!isEnabled || _isLastFMTracked) return;
+
+            var songInfo = _mediaSessionsService.CurrentSongInfo;
+            if (songInfo == null || songInfo.Duration <= 0) return;
+
+            if (_totalPlayedTime.TotalSeconds >= songInfo.Duration * 0.5)
+            {
+                _isLastFMTracked = true;
+                _lastFMService.TrackAsync(songInfo);
+            }
+        }
+
+        private void ResetPlaybackState()
+        {
+            _songPosition = TimeSpan.Zero;
+            _totalPlayedTime = TimeSpan.Zero;
+            _isLastFMTracked = false;
+        }
+
+        public void Receive(PropertyChangedMessage<AlbumArtThemeColors> message)
+        {
+            if (message.Sender is IMediaSessionsService)
+            {
+                if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtThemeColors))
+                {
+                    var lyricsThemeColors = message.NewValue;
+                    _immersiveBgColorTransition.StartTransition(lyricsThemeColors.EnvColor);
+                    _accentColor1Transition.StartTransition(lyricsThemeColors.AccentColor1);
+                    _accentColor2Transition.StartTransition(lyricsThemeColors.AccentColor2);
+                    _accentColor3Transition.StartTransition(lyricsThemeColors.AccentColor3);
+                    _accentColor4Transition.StartTransition(lyricsThemeColors.AccentColor4);
+
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<TimeSpan> message)
+        {
+            if (message.Sender is IMediaSessionsService)
+            {
+                if (message.PropertyName == nameof(IMediaSessionsService.CurrentPosition))
+                {
+                    var realPosition = message.NewValue;
+
+                    var diff = Math.Abs(_songPosition.TotalMilliseconds - realPosition.TotalMilliseconds);
+                    var timelineSyncThreshold = _mediaSessionsService.CurrentMediaSourceProviderInfo?.TimelineSyncThreshold ?? 0;
+
+                    // ƫ<><C6AB> or seek
+                    if (diff >= timelineSyncThreshold)
+                    {
+                        _songPosition = realPosition;
+
+                        // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˿<EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LastFM ͳ<><CDB3>״̬
+                        if (_songPosition.TotalSeconds <= 1)
+                        {
+                            _totalPlayedTime = TimeSpan.Zero;
+                            _isLastFMTracked = false;
+                        }
+                    }
+
+                    // <20>϶<EFBFBD><CFB6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD><EFBFBD><EFBFBD>
+                    if (diff >= timelineSyncThreshold + 5000)
+                    {
+                        _isLayoutChanged = true;
+                    }
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<LyricsData?> message)
+        {
+            if (message.Sender is IMediaSessionsService)
+            {
+                if (message.PropertyName == nameof(IMediaSessionsService.CurrentLyricsData))
+                {
+                    _renderLyricsLines = null;
+                    if (_mediaSessionsService.CurrentLyricsData is LyricsData lyricsData)
+                    {
+                        _renderLyricsLines = lyricsData.LyricsLines.Select(x => new RenderLyricsLine()
+                        {
+                            LyricsSyllables = x.LyricsSyllables,
+                            StartMs = x.StartMs,
+                            EndMs = x.EndMs,
+                            PhoneticText = x.PhoneticText,
+                            OriginalText = x.OriginalText,
+                            TranslatedText = x.TranslatedText
+                        }).ToList();
+                    }
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
+        {
+            if (message.Sender is LiveStates)
+            {
+                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<int> message)
+        {
+            if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsFontSize))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.OriginalLyricsFontSize))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.TranslatedLyricsFontSize))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontStrokeWidth))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.PlayingLineTopOffset))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+            else if (message.Sender is LyricsEffectSettings)
+            {
+                if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollDuration))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollTopDuration))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollBottomDuration))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollTopDelay))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollBottomDelay))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.FanLyricsAngle))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<double> message)
+        {
+            if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsLineSpacingFactor))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<bool> message)
+        {
+            if (message.Sender is LyricsEffectSettings)
+            {
+                if (message.PropertyName == nameof(LyricsEffectSettings.IsFanLyricsEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsBlurEffectEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+            else if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.IsDynamicLyricsFontSize))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<TextAlignmentType> message)
+        {
+            if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsAlignmentType))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<SongInfo?> message)
+        {
+            if (message.Sender is IMediaSessionsService)
+            {
+                if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
+                {
+                    ResetPlaybackState();
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<LyricsFontWeight> message)
+        {
+            if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontWeight))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<string> message)
+        {
+            if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCJKFontFamily))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.LyricsWesternFontFamily))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml

@@ -18,147 +18,30 @@
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
                     <!--  Effect  -->
-
                     <TextBlock
                         x:Uid="SettingsPageLyricsEffect"
                         Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                         Text="Effect" />
 
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsVerticalEdgeOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsVerticalEdgeOpacitySlider"
-                            Default="0"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind LyricsEffectSettings.LyricsVerticalEdgeOpacity, Mode=TwoWay}" />
+                    <!--  模糊效果  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsBlurEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsBlurEffectEnabled, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsBlurAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsBlurAmountExtendedSlider"
-                            Default="5"
-                            Maximum="10"
-                            Minimum="0"
-                            Value="{x:Bind LyricsEffectSettings.LyricsBlurAmount, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsLineFade" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED3A;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsLineFadeEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
-                    <!--  高亮  -->
-                    <dev:SettingsExpander x:Uid="SettingsPageLyricsHighlight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E6;}">
-                        <dev:SettingsExpander.Items>
-
-                            <dev:SettingsCard x:Uid="SettingsPagePhoneticText">
-                                <local:ExtendedSlider
-                                    Default="60"
-                                    Frequency="5"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Unit="%"
-                                    Value="{x:Bind LyricsEffectSettings.PhoneticLyricsHighlightAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                            <dev:SettingsCard x:Uid="SettingsPageLyricsHighlightScope">
-                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.OriginalLyricsHighlightScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
-                                </ComboBox>
-                            </dev:SettingsCard>
-
-                            <dev:SettingsCard x:Uid="SettingsPageOriginalText">
-                                <local:ExtendedSlider
-                                    Default="60"
-                                    Frequency="5"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Unit="%"
-                                    Value="{x:Bind LyricsEffectSettings.OriginalLyricsHighlightAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                            <dev:SettingsCard x:Uid="SettingsPageTranslatedText">
-                                <local:ExtendedSlider
-                                    Default="60"
-                                    Frequency="5"
-                                    Maximum="100"
-                                    Minimum="0"
-                                    Unit="%"
-                                    Value="{x:Bind LyricsEffectSettings.TranslatedLyricsHighlightAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-
-                        </dev:SettingsExpander.Items>
-                    </dev:SettingsExpander>
-
-                    <!--  阴影  -->
-                    <dev:SettingsExpander
-                        x:Uid="SettingsPageLyricsShadow"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xF5EF;}"
-                        IsExpanded="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=TwoWay}" />
-                        <dev:SettingsExpander.Items>
-                            <dev:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
-                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsShadowScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
-                                </ComboBox>
-                            </dev:SettingsCard>
-                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Default="8"
-                                    Maximum="20"
-                                    Minimum="1"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsShadowAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-                        </dev:SettingsExpander.Items>
-                    </dev:SettingsExpander>
-
                     <!--  辉光效果  -->
-                    <dev:SettingsExpander
-                        x:Uid="SettingsPageLyricsGlowEffect"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE9A9;}"
-                        IsExpanded="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE9A9;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
-                        <dev:SettingsExpander.Items>
-                            <dev:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
-                                </ComboBox>
-                            </dev:SettingsCard>
-                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Default="8"
-                                    Maximum="20"
-                                    Minimum="1"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-                        </dev:SettingsExpander.Items>
-                    </dev:SettingsExpander>
+                    </dev:SettingsCard>
+
+                    <!--  缩放效果  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8A3;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectEnabled, Mode=TwoWay}" />
+                    </dev:SettingsCard>
 
                     <!--  浮动动画  -->
-                    <dev:SettingsExpander
-                        x:Uid="SettingsPageLyricsFloatAnimation"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE8C5;}"
-                        IsExpanded="True">
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8C5;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
-                        <dev:SettingsExpander.Items>
-                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Default="1"
-                                    Maximum="4"
-                                    Minimum="1"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsFloatAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>
-                        </dev:SettingsExpander.Items>
-                    </dev:SettingsExpander>
+                    </dev:SettingsCard>
 
                     <!--  扇形歌词  -->
                     <dev:SettingsExpander
@@ -224,7 +107,7 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <!--  滚动动画  -->
+                    <!--  歌词动画  -->
                     <dev:SettingsExpander x:Uid="SettingsPageScrollEasing" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xECE7;}">
                         <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsScrollEasingType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                             <ComboBoxItem x:Uid="SettingsPageEasingTypeLinear" />
@@ -246,7 +129,7 @@
                                     Default="500"
                                     Frequency="50"
                                     Maximum="1000"
-                                    Minimum="50"
+                                    Minimum="0"
                                     Unit="ms"
                                     Value="{x:Bind LyricsEffectSettings.LyricsScrollTopDuration, Mode=TwoWay}" />
                             </dev:SettingsCard>
@@ -255,7 +138,7 @@
                                     Default="500"
                                     Frequency="50"
                                     Maximum="1000"
-                                    Minimum="50"
+                                    Minimum="0"
                                     Unit="ms"
                                     Value="{x:Bind LyricsEffectSettings.LyricsScrollDuration, Mode=TwoWay}" />
                             </dev:SettingsCard>
@@ -264,7 +147,7 @@
                                     Default="500"
                                     Frequency="50"
                                     Maximum="1000"
-                                    Minimum="50"
+                                    Minimum="0"
                                     Unit="ms"
                                     Value="{x:Bind LyricsEffectSettings.LyricsScrollBottomDuration, Mode=TwoWay}" />
                             </dev:SettingsCard>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml

@@ -27,6 +27,7 @@
             <Grid Grid.Column="0">
                 <ScrollViewer>
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
                         <TextBlock x:Uid="LyricsSearchControlSongInfoMapping" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                         <Grid
@@ -34,22 +35,32 @@
                             Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                             CornerRadius="4">
                             <StackPanel Spacing="6">
-                                <TextBlock x:Uid="LyricsSearchControlTitle" />
-                                <TextBlock
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    IsTextSelectionEnabled="True"
-                                    Text="{x:Bind ViewModel.MappedSongSearchQuery.OriginalTitle, Mode=OneWay}"
-                                    TextWrapping="Wrap" />
 
-                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
-                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedTitle, Mode=TwoWay}" TextWrapping="Wrap" />
-                                <Button
-                                    VerticalAlignment="Center"
-                                    Command="{x:Bind ViewModel.ResetMappedTitleCommand}"
-                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                          FontSize=12,
-                                                          Glyph=&#xE777;}"
-                                    Style="{StaticResource GhostButtonStyle}" />
+                                <local:PropertyRow x:Uid="LyricsSearchControlTitle" Value="{x:Bind ViewModel.MappedSongSearchQuery.OriginalTitle, Mode=OneWay}" />
+
+                                <Grid ColumnSpacing="6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        x:Uid="LyricsSearchControlMappedAs"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center" />
+                                    <TextBox
+                                        Grid.Column="1"
+                                        Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedTitle, Mode=TwoWay}"
+                                        TextWrapping="Wrap" />
+                                    <Button
+                                        Grid.Column="2"
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind ViewModel.ResetMappedTitleCommand}"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE777;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </Grid>
 
                             </StackPanel>
                         </Grid>
@@ -60,33 +71,52 @@
                             CornerRadius="4">
                             <StackPanel Spacing="6">
 
-                                <TextBlock x:Uid="LyricsSearchControlArtist" />
-                                <TextBlock
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    IsTextSelectionEnabled="True"
-                                    Text="{x:Bind ViewModel.MappedSongSearchQuery.OriginalArtist, Mode=OneWay}"
-                                    TextWrapping="Wrap" />
+                                <local:PropertyRow x:Uid="LyricsSearchControlArtist" Value="{x:Bind ViewModel.MappedSongSearchQuery.OriginalArtist, Mode=OneWay}" />
 
-                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
-                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}" TextWrapping="Wrap" />
-                                <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap">
+                                <Grid ColumnSpacing="6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        x:Uid="LyricsSearchControlMappedAs"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center" />
+                                    <TextBox
+                                        Grid.Column="1"
+                                        Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}"
+                                        TextWrapping="Wrap" />
+                                    <Button
+                                        Grid.Column="2"
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind ViewModel.ResetMappedArtistCommand}"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE777;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </Grid>
+
+                                <RichTextBlock
+                                    FontSize="12"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    TextWrapping="Wrap">
                                     <Paragraph>
+                                        <Run Text="*" />
                                         <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}"
-                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                          FontSize=12,
-                                                          Glyph=&#xE777;}"
-                                    Style="{StaticResource GhostButtonStyle}" />
+
+                                <RichTextBlock
+                                    FontSize="12"
+                                    FontWeight="Bold"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    Loaded="ArtistsSplitHintRichTextBlock_Loaded"
+                                    TextWrapping="Wrap">
+                                    <Paragraph>
+                                        <Run Text=";    ,    /    ；    、    ，" />
+                                    </Paragraph>
+                                </RichTextBlock>
 
                             </StackPanel>
                         </Grid>
@@ -97,22 +127,32 @@
                             CornerRadius="4">
                             <StackPanel Spacing="6">
 
-                                <TextBlock x:Uid="LyricsSearchControlAlbum" />
-                                <TextBlock
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    IsTextSelectionEnabled="True"
-                                    Text="{x:Bind ViewModel.MappedSongSearchQuery.OriginalAlbum, Mode=OneWay}"
-                                    TextWrapping="Wrap" />
+                                <local:PropertyRow x:Uid="LyricsSearchControlAlbum" Value="{x:Bind ViewModel.MappedSongSearchQuery.OriginalAlbum, Mode=OneWay}" />
 
-                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
-                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedAlbum, Mode=TwoWay}" TextWrapping="Wrap" />
-                                <Button
-                                    VerticalAlignment="Center"
-                                    Command="{x:Bind ViewModel.ResetMappedAlbumCommand}"
-                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                          FontSize=12,
-                                                          Glyph=&#xE777;}"
-                                    Style="{StaticResource GhostButtonStyle}" />
+                                <Grid ColumnSpacing="6">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <TextBlock
+                                        x:Uid="LyricsSearchControlMappedAs"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center" />
+                                    <TextBox
+                                        Grid.Column="1"
+                                        Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedAlbum, Mode=TwoWay}"
+                                        TextWrapping="Wrap" />
+                                    <Button
+                                        Grid.Column="2"
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind ViewModel.ResetMappedAlbumCommand}"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE777;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </Grid>
 
                             </StackPanel>
                         </Grid>
@@ -136,22 +176,31 @@
                     <ListView.ItemTemplate>
                         <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 DisplayArtists}"
-                                        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}}" />
+                                <StackPanel Padding="0,6" Opacity="{x:Bind IsFound, Converter={StaticResource BoolToPartialOpacityConverter}}">
+                                    <local:PropertyRow
+                                        Margin="-8,0,0,0"
+                                        Link="{x:Bind Reference, Mode=OneWay}"
+                                        ToolTipService.ToolTip="{x:Bind Reference, TargetNullValue=N/A, Mode=OneWay}"
+                                        Value="{x:Bind Provider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
+                                    <!--  Lyrics search result  -->
+                                    <StackPanel Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}">
+                                        <local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind Title, TargetNullValue=N/A, Mode=OneWay}" />
+                                        <local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
+                                        <local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind Album, TargetNullValue=N/A, Mode=OneWay}" />
+                                        <local:PropertyRow
+                                            x:Uid="LyricsSearchControlDurauion"
+                                            Unit="s"
+                                            Value="{x:Bind Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                                        <local:PropertyRow
+                                            x:Uid="LyricsPageMatchPercentage"
+                                            Unit="%"
+                                            Value="{x:Bind MatchPercentage, Mode=OneWay}" />
+                                        <local:PropertyRow
+                                            x:Uid="LyricsPageCachePath"
+                                            Link="{x:Bind SelfPath, TargetNullValue=N/A, Mode=OneWay}"
+                                            ToolTipService.ToolTip="{x:Bind SelfPath, TargetNullValue=N/A, Mode=OneWay}" />
+                                    </StackPanel>
+                                    <!--  NOT FOUND  -->
                                     <TextBlock
                                         x:Uid="LyricsSearchControlNotFound"
                                         VerticalAlignment="Center"
@@ -220,23 +269,30 @@
                         </interactivity:DataTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
                     <Pivot.HeaderTemplate>
-                        <DataTemplate>
-                            <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{Binding LanguageCode, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
+                        <DataTemplate x:DataType="models:LyricsData">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{x:Bind LanguageCode, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
+                                <InfoBadge
+                                    x:Uid="LyricsSearchControlAutoGenerated"
+                                    Margin="6,0,0,0"
+                                    Style="{StaticResource StringInfoBadgeStyle}"
+                                    Visibility="{x:Bind AutoGenerated, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
+                            </StackPanel>
                         </DataTemplate>
                     </Pivot.HeaderTemplate>
                     <Pivot.ItemTemplate>
-                        <DataTemplate>
-                            <ListView ItemsSource="{Binding LyricsLines, Mode=OneWay}" SelectionChanged="ListView_SelectionChanged">
+                        <DataTemplate x:DataType="models:LyricsData">
+                            <ListView ItemsSource="{x:Bind LyricsLines, Mode=OneWay}" SelectionChanged="ListView_SelectionChanged">
                                 <ListView.ItemTemplate>
-                                    <DataTemplate>
+                                    <DataTemplate x:DataType="models:LyricsLine">
                                         <StackPanel Orientation="Horizontal">
-                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{Binding StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
+                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind StartMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
                                             <TextBlock
                                                 Margin="1,0"
                                                 Foreground="{ThemeResource SystemFillColorNeutralBrush}"
                                                 Text="-" />
-                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{Binding EndMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
-                                            <TextBlock Margin="6,0" Text="{Binding OriginalText}" />
+                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind EndMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
+                                            <TextBlock Margin="6,0" Text="{x:Bind OriginalText, Mode=OneWay}" />
                                         </StackPanel>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
@@ -267,31 +323,29 @@
                 </StackPanel>
             </Grid>
         </Grid>
-        <Grid Grid.Row="1">
-            <RelativePanel>
-                <TextBlock
-                    x:Uid="LyricsSearchControlHelp"
-                    Margin="0,0,24,0"
-                    FontSize="12"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    RelativePanel.AlignVerticalCenterWithPanel="True"
-                    RelativePanel.LeftOf="Reset"
-                    TextWrapping="Wrap" />
-                <Button
-                    x:Name="Reset"
-                    x:Uid="LyricsSearchControlReset"
-                    Margin="0,0,6,0"
-                    Command="{x:Bind ViewModel.ResetCommand}"
-                    RelativePanel.AlignVerticalCenterWithPanel="True"
-                    RelativePanel.LeftOf="SaveChanges" />
-                <Button
-                    x:Name="SaveChanges"
-                    x:Uid="LyricsSearchControlSaveChanges"
-                    Command="{x:Bind ViewModel.SaveCommand}"
-                    RelativePanel.AlignRightWithPanel="True"
-                    RelativePanel.AlignVerticalCenterWithPanel="True"
-                    Style="{StaticResource AccentButtonStyle}" />
-            </RelativePanel>
+        <Grid Grid.Row="1" ColumnSpacing="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                x:Uid="LyricsSearchControlHelp"
+                Grid.Column="1"
+                VerticalAlignment="Center"
+                FontSize="12"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                TextWrapping="Wrap" />
+            <Button
+                x:Uid="LyricsSearchControlReset"
+                Grid.Column="2"
+                Command="{x:Bind ViewModel.ResetCommand}" />
+            <Button
+                x:Uid="LyricsSearchControlSaveChanges"
+                Grid.Column="3"
+                Command="{x:Bind ViewModel.SaveCommand}"
+                Style="{StaticResource AccentButtonStyle}" />
         </Grid>
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs

@@ -2,6 +2,8 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Media;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -22,5 +24,26 @@ namespace BetterLyrics.WinUI3.Controls
         {
             ViewModel.SelectedLyricsLine = e.OriginalSource as LyricsLine;
         }
+
+        private void ArtistsSplitHintRichTextBlock_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            if (sender is RichTextBlock richTextBlock)
+            {
+                TextHighlighter highlighter = new()
+                {
+                    Background = App.Current.Resources["AccentTextFillColorPrimaryBrush"] as SolidColorBrush,
+                    Ranges =
+                    {
+                        new() { StartIndex = 0, Length = 1 },
+                        new() { StartIndex = 5, Length = 1 },
+                        new() { StartIndex = 10, Length = 1 },
+                        new() { StartIndex = 15, Length = 1 },
+                        new() { StartIndex = 20, Length = 1 },
+                        new() { StartIndex = 25, Length = 1 },
+                    }
+                };
+                richTextBlock.TextHighlighters.Add(highlighter);
+            }
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsStyleSettingsControl.xaml

@@ -23,12 +23,32 @@
 
                     <dev:SettingsCard x:Uid="SettingsPageLyricsAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
                         <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsLeft" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsCenter" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsRight" />
+                            <ComboBoxItem x:Uid="SettingsPageLeft" />
+                            <ComboBoxItem x:Uid="SettingsPageCenter" />
+                            <ComboBoxItem x:Uid="SettingsPageRight" />
                         </ComboBox>
                     </dev:SettingsCard>
 
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsCenterTopOffset" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE78A;}">
+                        <local:ExtendedSlider
+                            Default="50"
+                            Maximum="100"
+                            Minimum="0"
+                            Unit="%"
+                            Value="{x:Bind LyricsStyleSettings.PlayingLineTopOffset, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
+                        <local:ExtendedSlider
+                            x:Uid="SettingsPageLyricsLineSpacingFactorSlider"
+                            Default="0.5"
+                            Frequency="0.1"
+                            Maximum="2"
+                            Minimum="0"
+                            Unit="x"
+                            Value="{x:Bind LyricsStyleSettings.LyricsLineSpacingFactor, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
                     <dev:SettingsExpander x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
                         <dev:SettingsExpander.Items>
                             <dev:SettingsCard x:Uid="SettingsPageCJK">
@@ -56,15 +76,6 @@
                         </ComboBox>
                     </dev:SettingsCard>
 
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsBgFontOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <local:ExtendedSlider
-                            Default="30"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind LyricsStyleSettings.LyricsBgFontOpacity, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
                     <dev:SettingsCard x:Uid="SettingsPageLyricsFontStrokeWidth" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC12;}">
                         <local:ExtendedSlider
                             Default="0"
@@ -216,24 +227,6 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsLineSpacingFactorSlider"
-                            Default="0.5"
-                            Frequency="0.1"
-                            Maximum="2"
-                            Minimum="0"
-                            Unit="x"
-                            Value="{x:Bind LyricsStyleSettings.LyricsLineSpacingFactor, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsTranslationSeparator" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF464;}">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <TextBox AcceptsReturn="True" Text="{x:Bind LyricsStyleSettings.LyricsTranslationSeparator, Mode=TwoWay}" />
-                            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
-                        </StackPanel>
-                    </dev:SettingsCard>
-
                 </StackPanel>
             </Grid>
         </ScrollViewer>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml

@@ -13,21 +13,32 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid ColumnSpacing="6">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
+    <Grid>
+
+        <Grid x:Name="DisplayGrid" SizeChanged="DisplayGrid_SizeChanged">
             <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
 
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                        <TextBlock
-                            x:Uid="SettingsPageRecordedWindowStatus"
-                            RelativePanel.AlignLeftWithPanel="True"
-                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                x:Uid="SettingsPageRecordedWindowStatus"
+                                Grid.Column="0"
+                                Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                            <Button
+                                Grid.Column="2"
+                                Margin="0,30,0,0"
+                                Command="{x:Bind ViewModel.OpenConfigPanelCommand}"
+                                Style="{StaticResource AccentButtonStyle}">
+                                <TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" />
+                            </Button>
+                        </Grid>
 
                         <StackPanel Orientation="Horizontal" Spacing="3">
 
@@ -60,7 +71,7 @@
                             </Button>
 
                             <!--  Sharing hub  -->
-                            <HyperlinkButton x:Uid="SettingsPageShareHub" NavigateUri="{x:Bind constants:Link.ShareHubUrl}" />
+                            <HyperlinkButton x:Uid="SettingsPageShareHub" NavigateUri="{x:Bind constants:Link.ShareHub}" />
 
                         </StackPanel>
 
@@ -114,16 +125,44 @@
                 </Grid>
             </ScrollViewer>
         </Grid>
-        <Grid Grid.Column="1">
+
+        <Grid
+            x:Name="ConfigGrid"
+            Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
+            Opacity="{x:Bind ViewModel.IsConfigPanelOpened, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
+            Translation="{x:Bind ViewModel.ConfigPanelTranslation, Mode=OneWay}">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <Grid.TranslationTransition>
+                <Vector3Transition />
+            </Grid.TranslationTransition>
 
             <Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig"
+                            Grid.Column="0"
+                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <Button
+                            Grid.Column="2"
+                            Margin="0,30,0,0"
+                            Command="{x:Bind ViewModel.CloseConfigPanelCommand}"
+                            Content="{ui:FontIcon FontSize=16,
+                                                  FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE711;}"
+                            Style="{StaticResource AccentButtonStyle}" />
+                    </Grid>
 
                     <Pivot SelectionChanged="Pivot_SelectionChanged">
 
-                        <PivotItem Tag="General">
+                        <PivotItem Tag="Window">
                             <PivotItem.Header>
                                 <TextBlock
                                     x:Uid="AppSettingsControlGeneral"
@@ -132,6 +171,15 @@
                             </PivotItem.Header>
                         </PivotItem>
 
+                        <PivotItem Tag="Layout">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageLayout"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
                         <PivotItem Tag="AlbumArtStyle">
                             <PivotItem.Header>
                                 <TextBlock
@@ -141,6 +189,15 @@
                             </PivotItem.Header>
                         </PivotItem>
 
+                        <PivotItem Tag="AlbumArtEffect">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageAlbumEffect"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
                         <PivotItem Tag="LyricsStyle">
                             <PivotItem.Header>
                                 <TextBlock
@@ -168,15 +225,6 @@
                             </PivotItem.Header>
                         </PivotItem>
 
-                        <PivotItem Tag="Advanced">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageAdvanced"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
                     </Pivot>
 
                 </StackPanel>
@@ -189,29 +237,20 @@
                     </TransitionCollection>
                 </controls:SwitchPresenter.ContentTransitions>
 
-                <!--  General  -->
-                <controls:Case Value="General">
+                <!--  Window  -->
+                <controls:Case Value="Window">
+                    <uc:WindowSettingsControl LyricsWindowStatus="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Layout  -->
+                <controls:Case Value="Layout">
                     <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
                         <Grid Style="{StaticResource SettingsGridStyle}">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                                <TextBlock x:Uid="SettingsPageLayout" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                                <dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8AC;}">
-                                    <StackPanel
-                                        Margin="0,6,0,0"
-                                        Orientation="Horizontal"
-                                        Spacing="6">
-                                        <TextBox Text="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
-                                        <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
-                                    </StackPanel>
-                                </dev:SettingsCard>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageDisplayTypeSwitcher"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xF246;}"
-                                    IsExpanded="True">
+                                <dev:SettingsExpander x:Uid="SettingsPageDisplayTypeSwitcher" IsExpanded="True">
                                     <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                         <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
                                         <ComboBoxItem x:Uid="MainPageLyriscOnly" />
@@ -227,115 +266,6 @@
                                     </dev:SettingsExpander.Items>
                                 </dev:SettingsExpander>
 
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageWorkArea"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE78B;}"
-                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=TwoWay}" />
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard x:Uid="SettingsPageWorkAreaHeight" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                            <uc:ExtendedSlider
-                                                Default="64"
-                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
-                                                Minimum="64"
-                                                Unit="px"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockHeight, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-
-                                        <dev:SettingsCard x:Uid="SettingsPageDockPlacement" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                                <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
-                                                <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
-                                            </ComboBox>
-                                        </dev:SettingsCard>
-
-                                        <dev:SettingsCard x:Uid="SettingsPageDockMonitor" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
-                                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                                <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorDeviceName, Mode=TwoWay}" />
-                                                <Button
-                                                    Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
-                                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                                          FontSize=12,
-                                                                          Glyph=&#xE72C;}"
-                                                    Style="{StaticResource GhostButtonStyle}" />
-                                            </StackPanel>
-                                        </dev:SettingsCard>
-
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageAdaptEnvColor"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE88F;}"
-                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard
-                                            x:Uid="SettingsPageEnvColorSample"
-                                            Header="Environment color sample mode"
-                                            IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
-                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
-                                            </ComboBox>
-                                        </dev:SettingsCard>
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageWindowBounds"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xF16B;}"
-                                    IsExpanded="True">
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard Header="X">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowX, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                        <dev:SettingsCard Header="Y">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowY, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                        <dev:SettingsCard x:Uid="SettingsPageWidth">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                        <dev:SettingsCard x:Uid="SettingsPageHeight">
-                                            <NumberBox
-                                                SmallChange="10"
-                                                SpinButtonPlacementMode="Inline"
-                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowHeight, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsExpander
-                                    x:Uid="SettingsPageAOT"
-                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xE718;}"
-                                    IsExpanded="True">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=TwoWay}" />
-                                    <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard x:Uid="SettingsPageForceAlwaysOnTop" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=OneWay}">
-                                            <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTopPolling, Mode=TwoWay}" />
-                                        </dev:SettingsCard>
-                                    </dev:SettingsExpander.Items>
-                                </dev:SettingsExpander>
-
-                                <dev:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
                             </StackPanel>
                         </Grid>
                     </ScrollViewer>
@@ -343,7 +273,12 @@
 
                 <!--  Album art area style  -->
                 <controls:Case Value="AlbumArtStyle">
-                    <uc:AlbumArtLayoutSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                    <uc:AlbumArtAreaStyleSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Album art area effect  -->
+                <controls:Case Value="AlbumArtEffect">
+                    <uc:AlbumArtAreaEffectSettingsControl AlbumArtAreaEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtAreaEffectSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics style  -->
@@ -361,39 +296,9 @@
                     <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
                 </controls:Case>
 
-                <!--  Advanced  -->
-                <controls:Case Value="Advanced">
-                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                        <Grid Style="{StaticResource SettingsGridStyle}">
-                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                                <dev:SettingsCard x:Uid="SettingsPageShowInSwitchers" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C4;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageClickThrough" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C9;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsClickThrough, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageBorderless" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8B2;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
-                                </dev:SettingsCard>
-
-                                <dev:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB41;}">
-                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
-                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaTop" />
-                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaWhole" />
-                                    </ComboBox>
-                                </dev:SettingsCard>
-
-                            </StackPanel>
-                        </Grid>
-                    </ScrollViewer>
-                </controls:Case>
-
             </controls:SwitchPresenter>
 
         </Grid>
+
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs

@@ -2,7 +2,6 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
-using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
@@ -27,7 +26,6 @@ namespace BetterLyrics.WinUI3.Controls
 
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
         private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
         public LyricsWindowSettingsControl()
         {
@@ -75,7 +73,7 @@ namespace BetterLyrics.WinUI3.Controls
                     StorageFile? file;
                     if (this.Parent is FlyoutPresenter)
                     {
-                        file = await PickerHelper.PickSaveFileAsync<LyricsWindow>(fileTypeChoices);
+                        file = await PickerHelper.PickSaveFileAsync<NowPlayingWindow>(fileTypeChoices);
                     }
                     else
                     {
@@ -87,7 +85,7 @@ namespace BetterLyrics.WinUI3.Controls
                         clonedData.IsDefault = false;
                         var json = System.Text.Json.JsonSerializer.Serialize(clonedData, SourceGenerationContext.Default.LyricsWindowStatus);
                         File.WriteAllText(file.Path, json);
-                        DevWinUI.Growl.Success(_resourceService.GetLocalizedString("ExportSettingsSuccess"));
+                        ToastHelper.ShowToast("ExportSettingsSuccess", null, InfoBarSeverity.Success);
                     }
                 }
             }
@@ -134,7 +132,7 @@ namespace BetterLyrics.WinUI3.Controls
             StorageFile? file;
             if (this.Parent is FlyoutPresenter)
             {
-                file = await PickerHelper.PickSingleFileAsync<LyricsWindow>(fileTypeFilter);
+                file = await PickerHelper.PickSingleFileAsync<NowPlayingWindow>(fileTypeFilter);
             }
             else
             {
@@ -147,9 +145,14 @@ namespace BetterLyrics.WinUI3.Controls
                 if (data != null)
                 {
                     ViewModel.AppSettings.WindowBoundsRecords.Add(data);
-                    DevWinUI.Growl.Success(_resourceService.GetLocalizedString("ImportSettingsSuccess"));
+                    ToastHelper.ShowToast("ImportSettingsSuccess", null, InfoBarSeverity.Success);
                 }
             }
         }
+
+        private void DisplayGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            ViewModel.DisplayPanelHeight = e.NewSize.Height;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml

@@ -75,7 +75,7 @@
                                 Width="16"
                                 Height="16"
                                 CornerRadius="4">
-                                <Image Source="{Binding Logo, Mode=OneWay}" />
+                                <ImageIcon Source="{Binding LogoPath}" />
                             </Grid>
                             <TextBlock
                                 MaxWidth="200"
@@ -182,6 +182,21 @@
 
                         <!--  歌词源配置  -->
                         <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>
+                        <dev:SettingsCard x:Uid="SettingsPageMatchingThreshold">
+                            <local:ExtendedSlider
+                                Default="0"
+                                Maximum="100"
+                                Minimum="0"
+                                Unit="%"
+                                Value="{x:Bind ViewModel.SelectedMediaSourceProvider.MatchingThreshold, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
                         <ListView
                             x:Name="LyricsSearchProvidersListView"
                             AllowDrop="True"
@@ -202,12 +217,48 @@
                             </ListView.ItemContainerStyle>
                             <ListView.ItemTemplate>
                                 <DataTemplate x:DataType="models:LyricsSearchProviderInfo">
-                                    <dev:SettingsCard Header="{Binding Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}, Mode=OneWay}">
-                                        <dev:SettingsCard.HeaderIcon>
-                                            <FontIcon FontFamily="Segoe UI Symbol" Glyph="&#x283F;" />
-                                        </dev:SettingsCard.HeaderIcon>
-                                        <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
-                                    </dev:SettingsCard>
+                                    <Grid>
+                                        <dev:SettingsExpander Header="{Binding Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}, Mode=OneWay}" IsExpanded="{Binding IsMatchingThresholdOverwritten, Mode=OneWay}">
+                                            <dev:SettingsExpander.HeaderIcon>
+                                                <FontIcon FontFamily="Segoe UI Symbol" Glyph="&#x283F;" />
+                                            </dev:SettingsExpander.HeaderIcon>
+                                            <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+                                            <dev:SettingsExpander.Items>
+                                                <dev:SettingsCard x:Uid="SettingsPageOverwriteMatchingThreshold">
+                                                    <ToggleSwitch IsOn="{Binding IsMatchingThresholdOverwritten, Mode=TwoWay}" />
+                                                </dev:SettingsCard>
+                                                <dev:SettingsCard x:Uid="SettingsPageMatchingThreshold" IsEnabled="{Binding IsMatchingThresholdOverwritten, Mode=OneWay}">
+                                                    <local:ExtendedSlider
+                                                        Default="0"
+                                                        Maximum="100"
+                                                        Minimum="0"
+                                                        Unit="%"
+                                                        Value="{Binding MatchingThreshold, Mode=TwoWay}" />
+                                                </dev:SettingsCard>
+                                            </dev:SettingsExpander.Items>
+                                        </dev:SettingsExpander>
+                                        <Grid
+                                            Width="48"
+                                            HorizontalAlignment="Left"
+                                            Background="{ThemeResource ControlStrokeColorDefaultBrush}"
+                                            CornerRadius="4,0,0,4"
+                                            Opacity="0">
+                                            <interactivity:Interaction.Behaviors>
+                                                <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                                                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                                </interactivity:EventTriggerBehavior>
+                                                <interactivity:EventTriggerBehavior EventName="PointerExited">
+                                                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                                </interactivity:EventTriggerBehavior>
+                                            </interactivity:Interaction.Behaviors>
+                                            <Grid.OpacityTransition>
+                                                <ScalarTransition />
+                                            </Grid.OpacityTransition>
+                                            <ToolTipService.ToolTip>
+                                                <ToolTip x:Uid="SettingsPageHoldDragSort" />
+                                            </ToolTipService.ToolTip>
+                                        </Grid>
+                                    </Grid>
                                 </DataTemplate>
                             </ListView.ItemTemplate>
                         </ListView>
@@ -248,55 +299,65 @@
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                        <!--  Provider info  -->
+                        <!--  Realtime info  -->
                         <TextBlock x:Uid="SettingsPageRealtimeStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <dev:SettingsCard ContentAlignment="Left">
+
+                        <!--  Playback source info  -->
+                        <Expander
+                            x:Uid="SettingsPagePlaybackStatus"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Left">
                             <StackPanel Spacing="6">
-                                <Grid ColumnSpacing="12">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock
-                                        x:Uid="SettingsPagePlaybackSource"
-                                        Grid.Column="0"
-                                        VerticalAlignment="Center" />
-                                    <RichTextBlock
-                                        Grid.Column="1"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        IsTextSelectionEnabled="True"
-                                        TextWrapping="Wrap">
-                                        <Paragraph>
-                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentMediaSourceProviderInfo.DisplayName, Mode=OneWay}" />
-                                            <Run Text="(" />
-                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.PlayerId, TargetNullValue=N/A, Mode=OneWay}" />
-                                            <Run Text=")" />
-                                        </Paragraph>
-                                    </RichTextBlock>
-                                </Grid>
-                                <StackPanel Orientation="Horizontal" Spacing="12">
-                                    <TextBlock VerticalAlignment="Center" Text="NCM ID" />
-                                    <TextBlock
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        IsTextSelectionEnabled="True"
-                                        Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.SongId, Mode=OneWay, TargetNullValue=N/A}" />
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Spacing="12">
-                                    <TextBlock x:Uid="LyricsPageLyricsProviderPrefix" VerticalAlignment="Center" />
-                                    <TextBlock
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        IsTextSelectionEnabled="True"
-                                        Text="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" Spacing="12">
-                                    <TextBlock x:Uid="LyricsPageTranslationProviderPrefix" VerticalAlignment="Center" />
-                                    <TextBlock
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        IsTextSelectionEnabled="True"
-                                        Text="{x:Bind ViewModel.MediaSessionsService.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
-                                </StackPanel>
+                                <local:PropertyRow x:Uid="SettingsPagePlaybackSource" Value="{x:Bind ViewModel.MediaSessionsService.CurrentMediaSourceProviderInfo.DisplayName, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="SettingsPagePlaybackSourceID" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.PlayerId, TargetNullValue=N/A, Mode=OneWay}" />
                             </StackPanel>
-                        </dev:SettingsCard>
+                        </Expander>
+
+                        <!--  Song info  -->
+                        <Expander
+                            x:Uid="SettingsPageSongStatus"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Left">
+                            <StackPanel Spacing="6">
+                                <local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Title, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Album, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow
+                                    x:Uid="LyricsSearchControlDurauion"
+                                    Unit="s"
+                                    Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                            </StackPanel>
+                        </Expander>
+
+                        <!--  Search result info  -->
+                        <Expander
+                            x:Uid="SettingsPageSearchResultStatus"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Left">
+                            <StackPanel Spacing="6">
+                                <local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Title, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Album, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow
+                                    x:Uid="LyricsSearchControlDurauion"
+                                    Unit="s"
+                                    Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow
+                                    x:Uid="LyricsPageLyricsProviderPrefix"
+                                    Link="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, Mode=OneWay}"
+                                    ToolTipService.ToolTip="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, TargetNullValue=N/A, Mode=OneWay}"
+                                    Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
+                                <local:PropertyRow x:Uid="LyricsPageTranslationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                                <local:PropertyRow
+                                    x:Uid="LyricsPageMatchPercentage"
+                                    Unit="%"
+                                    Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.MatchPercentage, Mode=OneWay}" />
+                                <local:PropertyRow
+                                    x:Uid="LyricsPageCachePath"
+                                    Link="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.SelfPath, TargetNullValue=N/A, Mode=OneWay}"
+                                    ToolTipService.ToolTip="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.SelfPath, TargetNullValue=N/A, Mode=OneWay}" />
+                            </StackPanel>
+                        </Expander>
 
                         <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
@@ -438,7 +499,7 @@
                                     Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                           FontSize=12,
                                                           Glyph=&#xE897;}"
-                                    NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
+                                    NavigateUri="{x:Bind constants:Link.AppleMusicCfg}" />
                                 <Button
                                     Grid.Column="2"
                                     Command="{x:Bind ViewModel.SaveAppleMusicMediaUserTokenCommand}"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.PropertyRow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid HorizontalAlignment="Left" ColumnSpacing="6">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock
+            Grid.Column="0"
+            VerticalAlignment="Top"
+            Text="{x:Bind Header, Mode=OneWay}" />
+
+        <Grid
+            Grid.Column="1"
+            VerticalAlignment="Top"
+            PointerEntered="OnPointerEntered"
+            PointerExited="OnPointerExited">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Grid Grid.Column="0">
+                <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Visibility="{x:Bind TextVisibility, Mode=OneWay}">
+                    <Paragraph>
+                        <Run Text="{x:Bind Value, Mode=OneWay}" />
+                        <Run Text="{x:Bind Unit, Mode=OneWay}" />
+                    </Paragraph>
+                </RichTextBlock>
+
+                <HyperlinkButton
+                    Margin="0,-2,0,0"
+                    Padding="0"
+                    HorizontalContentAlignment="Left"
+                    Click="OnLinkClicked"
+                    Visibility="{x:Bind LinkVisibility, Mode=OneWay}">
+                    <TextBlock Text="{x:Bind Value, Mode=OneWay}" TextWrapping="Wrap" />
+                </HyperlinkButton>
+            </Grid>
+
+            <Button
+                x:Name="CopyButton"
+                Grid.Column="1"
+                Margin="8,-2,0,0"
+                Padding="4"
+                VerticalAlignment="Top"
+                Click="OnCopyClicked"
+                Opacity="0">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="Copy" />
+                </ToolTipService.ToolTip>
+                <Button.OpacityTransition>
+                    <ScalarTransition />
+                </Button.OpacityTransition>
+                <Grid>
+                    <FontIcon
+                        x:Name="CopyIcon"
+                        FontFamily="{StaticResource IconFontFamily}"
+                        FontSize="16"
+                        Glyph="&#xE8C8;"
+                        Opacity="1">
+                        <FontIcon.OpacityTransition>
+                            <ScalarTransition />
+                        </FontIcon.OpacityTransition>
+                    </FontIcon>
+                    <FontIcon
+                        x:Name="CheckIcon"
+                        FontFamily="{StaticResource IconFontFamily}"
+                        FontSize="16"
+                        Glyph="&#xE73E;"
+                        Opacity="0">
+                        <FontIcon.OpacityTransition>
+                            <ScalarTransition />
+                        </FontIcon.OpacityTransition>
+                    </FontIcon>
+                </Grid>
+            </Button>
+        </Grid>
+    </Grid>
+
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PropertyRow.xaml.cs

@@ -0,0 +1,115 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using System;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.DataTransfer;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class PropertyRow : UserControl
+    {
+        public PropertyRow()
+        {
+            this.InitializeComponent();
+        }
+
+        public string Header
+        {
+            get => (string)GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+        public static readonly DependencyProperty HeaderProperty =
+            DependencyProperty.Register(nameof(Header), typeof(string), typeof(PropertyRow), new PropertyMetadata(string.Empty));
+
+        public string Value
+        {
+            get => (string)GetValue(ValueProperty);
+            set => SetValue(ValueProperty, value);
+        }
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register(nameof(Value), typeof(string), typeof(PropertyRow), new PropertyMetadata(string.Empty));
+
+        public string Link
+        {
+            get => (string)GetValue(LinkProperty);
+            set => SetValue(LinkProperty, value);
+        }
+        public static readonly DependencyProperty LinkProperty =
+            DependencyProperty.Register(nameof(Link), typeof(string), typeof(PropertyRow), new PropertyMetadata(string.Empty));
+
+        public string Unit
+        {
+            get => (string)GetValue(UnitProperty);
+            set => SetValue(UnitProperty, value);
+        }
+        public static readonly DependencyProperty UnitProperty =
+            DependencyProperty.Register(nameof(Unit), typeof(string), typeof(PropertyRow), new PropertyMetadata(string.Empty));
+
+        private Visibility TextVisibility => Link == string.Empty ? Visibility.Visible : Visibility.Collapsed;
+        private Visibility LinkVisibility => Link != string.Empty ? Visibility.Visible : Visibility.Collapsed;
+
+        private void OnPointerEntered(object sender, PointerRoutedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(Value))
+            {
+                CopyButton.Opacity = 1;
+            }
+        }
+
+        private void OnPointerExited(object sender, PointerRoutedEventArgs e)
+        {
+            CopyButton.Opacity = 0;
+        }
+
+        private void OnCopyClicked(object sender, RoutedEventArgs e)
+        {
+            var targetValue = string.IsNullOrEmpty(Link) ? Value : Link;
+
+            if (string.IsNullOrEmpty(targetValue)) return;
+
+            try
+            {
+                DataPackage dataPackage = new DataPackage();
+                dataPackage.SetText(targetValue);
+                Clipboard.SetContent(dataPackage);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Copy failed: {ex.Message}");
+                return;
+            }
+
+            CheckIcon.Opacity = 1;
+            CopyIcon.Opacity = 0;
+
+            this.DispatcherQueue.TryEnqueue(async () =>
+            {
+                await Task.Delay(1000);
+
+                CheckIcon.Opacity = 0;
+                CopyIcon.Opacity = 1;
+            });
+        }
+
+        private async void OnLinkClicked(object sender, RoutedEventArgs e)
+        {
+            Uri.TryCreate(Link, UriKind.Absolute, out var uri);
+            if (uri != null)
+            {
+                if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
+                {
+                    await Windows.System.Launcher.LaunchUriAsync(uri);
+                }
+                else if (uri.Scheme == Uri.UriSchemeFile)
+                {
+                    await LauncherHelper.SelectAndShowFile(uri.LocalPath);
+                }
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShadowImage.xaml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.ShadowImage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:const="using:BetterLyrics.WinUI3.Constants"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <UserControl.OpacityTransition>
+        <ScalarTransition />
+    </UserControl.OpacityTransition>
+
+    <Grid Margin="-32" Padding="32">
+        <Grid
+            x:Name="ShadowCastGrid"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            SizeChanged="ShadowCastGrid_SizeChanged">
+            <Image Source="{x:Bind Source, Mode=OneWay}" Stretch="Uniform" />
+        </Grid>
+        <Border
+            x:Name="ShadowRect"
+            Loaded="ShadowRect_Loaded"
+            SizeChanged="ShadowRect_SizeChanged"
+            Translation="0,0,0">
+            <Border.Shadow>
+                <ThemeShadow x:Name="Shadow" />
+            </Border.Shadow>
+        </Border>
+    </Grid>
+
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShadowImage.xaml.cs

@@ -0,0 +1,103 @@
+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.
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class ShadowImage : UserControl
+    {
+        public int CornerRadiusAmount
+        {
+            get { return (int)GetValue(CornerRadiusAmountProperty); }
+            set { SetValue(CornerRadiusAmountProperty, value); }
+        }
+
+        public static readonly DependencyProperty CornerRadiusAmountProperty =
+            DependencyProperty.Register(nameof(CornerRadiusAmount), typeof(int), typeof(ShadowImage), new PropertyMetadata(0, OnDependencyPropertyChanged));
+
+        public int ShadowAmount
+        {
+            get { return (int)GetValue(ShadowAmountProperty); }
+            set { SetValue(ShadowAmountProperty, value); }
+        }
+
+        public static readonly DependencyProperty ShadowAmountProperty =
+            DependencyProperty.Register(nameof(ShadowAmount), typeof(int), typeof(ShadowImage), new PropertyMetadata(0, OnDependencyPropertyChanged));
+
+        public ImageSource? Source
+        {
+            get { return (ImageSource?)GetValue(SourceProperty); }
+            set { SetValue(SourceProperty, value); }
+        }
+
+        public static readonly DependencyProperty SourceProperty =
+            DependencyProperty.Register(nameof(Source), typeof(ImageSource), typeof(ShadowImage), new PropertyMetadata(null));
+
+        public ShadowImage()
+        {
+            InitializeComponent();
+        }
+
+        private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is ShadowImage shadowImage)
+            {
+                if (e.Property == CornerRadiusAmountProperty)
+                {
+                    shadowImage.UpdateShadowCastGridCornerRadius();
+                    shadowImage.UpdateShadowRectCornerRadius();
+                }
+                else if (e.Property == ShadowAmountProperty)
+                {
+                    shadowImage.UpdateShadowRectShadow();
+                }
+            }
+        }
+
+        private void UpdateShadowRectShadow()
+        {
+            ShadowRect.Translation = new(0, 0, ShadowAmount);
+        }
+
+        private void UpdateShadowCastGridCornerRadius()
+        {
+            var minSize = Math.Min(ShadowCastGrid.ActualHeight, ShadowCastGrid.ActualWidth);
+            ShadowCastGrid.CornerRadius = new(CornerRadiusAmount / 100.0 * minSize);
+        }
+
+        private void UpdateShadowRectCornerRadius()
+        {
+            var minSize = Math.Min(ShadowRect.ActualHeight, ShadowRect.ActualWidth);
+            ShadowRect.CornerRadius = new(CornerRadiusAmount / 100.0 * minSize);
+        }
+
+        private void ShadowCastGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateShadowCastGridCornerRadius();
+        }
+
+        private void ShadowRect_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            UpdateShadowRectCornerRadius();
+        }
+
+        private void ShadowRect_Loaded(object sender, RoutedEventArgs e)
+        {
+            Shadow.Receivers.Add(ShadowCastGrid);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml

@@ -23,7 +23,11 @@
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                       FontSize=12,
                                       Glyph=}"
-                Style="{StaticResource GhostButtonStyle}" />
+                Style="{StaticResource GhostButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="SettingsPageClear" />
+                </ToolTipService.ToolTip>
+            </Button>
             <Button
                 Margin="3,0,0,0"
                 HorizontalAlignment="Right"
@@ -31,7 +35,11 @@
                 Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                       FontSize=12,
                                       Glyph=&#xE721;}"
-                Style="{StaticResource GhostButtonStyle}" />
+                Style="{StaticResource GhostButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="SettingsPageCheckShortcut" />
+                </ToolTipService.ToolTip>
+            </Button>
         </StackPanel>
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs

@@ -1,3 +1,4 @@
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -92,11 +93,11 @@ namespace BetterLyrics.WinUI3.Controls
             bool registered = GlobalHotKeyHook.IsHotKeyRegistered(Shortcut);
             if (registered)
             {
-                DevWinUI.Growl.Success(_resourceService.GetLocalizedString("SettingsPageShortcutRegSuccessInfo"));
+                ToastHelper.ShowToast("SettingsPageShortcutRegSuccessInfo", null, InfoBarSeverity.Success);
             }
             else
             {
-                DevWinUI.Growl.Error(_resourceService.GetLocalizedString("SettingsPageShortcutRegFailInfo"));
+                ToastHelper.ShowToast("SettingsPageShortcutRegFailInfo", null, InfoBarSeverity.Error);
             }
         }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/SystemTray.xaml

@@ -48,7 +48,7 @@
                     x:Uid="SystemTrayMusicGallery"
                     Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=}" />
+                                       Glyph=}" />
                 <MenuFlyoutItem
                     x:Uid="SystemTraySettings"
                     Command="{x:Bind ViewModel.OpenSettingsCommand}"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.WindowSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="AppSettingsControlGeneral" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8AC;}">
+                        <StackPanel
+                            Margin="0,6,0,0"
+                            Orientation="Horizontal"
+                            Spacing="6">
+                            <TextBox Text="{x:Bind LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
+                            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
+                        </StackPanel>
+                    </dev:SettingsCard>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageWorkArea"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE78B;}"
+                        IsExpanded="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageWorkAreaHeight" IsEnabled="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="64"
+                                    Maximum="{x:Bind LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
+                                    Minimum="64"
+                                    Unit="px"
+                                    Value="{x:Bind LyricsWindowStatus.DockHeight, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+
+                            <dev:SettingsCard x:Uid="SettingsPageDockPlacement" IsEnabled="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
+                                    <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+
+                            <dev:SettingsCard x:Uid="SettingsPageDockMonitor" IsEnabled="{x:Bind LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <ComboBox ItemsSource="{x:Bind MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind LyricsWindowStatus.MonitorDeviceName, Mode=TwoWay}" />
+                                    <Button
+                                        Click="RefreshMonitorButton_Click"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE72C;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </StackPanel>
+                            </dev:SettingsCard>
+
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageAdaptEnvColor"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE88F;}"
+                        IsExpanded="{x:Bind LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard
+                                x:Uid="SettingsPageEnvColorSample"
+                                Header="Environment color sample mode"
+                                IsEnabled="{x:Bind LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
+                                    <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageWindowBounds"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF16B;}"
+                        IsExpanded="True">
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard Header="X">
+                                <NumberBox
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Inline"
+                                    Value="{x:Bind LyricsWindowStatus.WindowX, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard Header="Y">
+                                <NumberBox
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Inline"
+                                    Value="{x:Bind LyricsWindowStatus.WindowY, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageWidth">
+                                <NumberBox
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Inline"
+                                    Value="{x:Bind LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageHeight">
+                                <NumberBox
+                                    SmallChange="10"
+                                    SpinButtonPlacementMode="Inline"
+                                    Value="{x:Bind LyricsWindowStatus.WindowHeight, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageAOT"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE718;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAlwaysOnTop, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageForceAlwaysOnTop" IsEnabled="{x:Bind LyricsWindowStatus.IsAlwaysOnTop, Mode=OneWay}">
+                                <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAlwaysOnTopPolling, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
+                    <dev:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.AutoShowOrHideWindow, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageShowInSwitchers" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C4;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageClickThrough" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C9;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsClickThrough, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageBorderless" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8B2;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB41;}">
+                        <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
+                            <ComboBoxItem x:Uid="SettingsPageTitleBarAreaTop" />
+                            <ComboBoxItem x:Uid="SettingsPageTitleBarAreaWhole" />
+                        </ComboBox>
+                    </dev:SettingsCard>
+
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml.cs

@@ -0,0 +1,56 @@
+using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.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.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.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class WindowSettingsControl : UserControl
+{
+    public static readonly DependencyProperty LyricsWindowStatusProperty =
+        DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(AlbumArtAreaEffectSettings), typeof(WindowSettingsControl), new PropertyMetadata(default));
+
+    public LyricsWindowStatus LyricsWindowStatus
+    {
+        get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
+        set => SetValue(LyricsWindowStatusProperty, value);
+    }
+
+    public ObservableCollection<string> MonitorDeviceNames { get; set; } = [];
+
+    public WindowSettingsControl()
+    {
+        InitializeComponent();
+        MonitorDeviceNames = [.. MonitorHook.GetAllMonitorDeviceNames()];
+    }
+
+    private void RefreshMonitorDeviceNames()
+    {
+        MonitorDeviceNames = [.. MonitorHook.GetAllMonitorDeviceNames()];
+        LyricsWindowStatus.MonitorDeviceName = MonitorDeviceNames.FirstOrDefault() ?? "";
+    }
+
+    private void RefreshMonitorButton_Click(object sender, RoutedEventArgs e)
+    {
+        RefreshMonitorDeviceNames();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LyricsFontWeightToFontWeightConverter.cs

@@ -0,0 +1,24 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class LyricsFontWeightToFontWeightConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is LyricsFontWeight weight)
+            {
+                return weight.ToFontWeight();
+            }
+            return FontWeights.Normal;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LyricsLayoutOrientationNegationToOrientationConverter.cs

@@ -0,0 +1,25 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class LyricsLayoutOrientationNegationToOrientationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is LyricsLayoutOrientation orientation)
+            {
+                return orientation.ToOrientationInverse();
+            }
+            return Orientation.Horizontal;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LyricsLayoutOrientationToOrientationConverter.cs

@@ -0,0 +1,25 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class LyricsLayoutOrientationToOrientationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is LyricsLayoutOrientation orientation)
+            {
+                return orientation.ToOrientation();
+            }
+            return Orientation.Horizontal;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PictureInfosToImageSourceConverter.cs

@@ -0,0 +1,32 @@
+using ATL;
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class PictureInfosToImageSourceConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            BitmapImage bitmapImage = new();
+            if (value is IList<PictureInfo> list && list.FirstOrDefault()?.PictureData is byte[] pictureData)
+            {
+                bitmapImage.SetSource(ImageHelper.ToIRandomAccessStream(pictureData));
+            }
+            else
+            {
+                bitmapImage.UriSource = new Uri(PathHelper.AlbumArtPlaceholderPath);
+            }
+            return bitmapImage;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TextAlignmentTypeToHorizontalAlignmentConverter.cs

@@ -0,0 +1,24 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class TextAlignmentTypeToHorizontalAlignmentConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is TextAlignmentType type)
+            {
+                return type.ToHorizontalAlignment();
+            }
+            return HorizontalAlignment.Left;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ImageSwitchType.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum ImageSwitchType
+    {
+        Crossfade,
+        Slide
+    }
+}

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,
-            };
-        }
-    }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchProvider.cs

@@ -1,7 +1,5 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Helper;
-
 namespace BetterLyrics.WinUI3.Enums
 {
     public enum LyricsSearchProvider
@@ -17,70 +15,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,
-            };
-        }
-    }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsSearchType.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsSearchType
+    {
+        Sequential,
+        BestMatch
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SpectrumStyle.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum SpectrumStyle
+    {
+        Curve,
+        Bar
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TextAlignmentType.cs

@@ -1,6 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using Microsoft.Graphics.Canvas.Text;
+using Microsoft.UI.Xaml;
 using System;
 
 namespace BetterLyrics.WinUI3.Enums
@@ -14,6 +15,17 @@ namespace BetterLyrics.WinUI3.Enums
 
     public static class LyricsAlignmentTypeExtensions
     {
+        public static HorizontalAlignment ToHorizontalAlignment(this TextAlignmentType alignmentType)
+        {
+            return alignmentType switch
+            {
+                TextAlignmentType.Left => HorizontalAlignment.Left,
+                TextAlignmentType.Center => HorizontalAlignment.Center,
+                TextAlignmentType.Right => HorizontalAlignment.Right,
+                _ => throw new ArgumentOutOfRangeException(nameof(alignmentType), alignmentType, null),
+            };
+        }
+
         public static CanvasHorizontalAlignment ToCanvasHorizontalAlignment(this TextAlignmentType alignmentType)
         {
             return alignmentType switch

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsFormatExtensions.cs

@@ -0,0 +1,34 @@
+using BetterLyrics.WinUI3.Enums;
+
+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,
+                };
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsLayoutOrientationExtensions.cs

@@ -0,0 +1,26 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml.Controls;
+using System;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class LyricsLayoutOrientationExtensions
+    {
+        extension(LyricsLayoutOrientation orientation)
+        {
+            public Orientation ToOrientation() => orientation switch
+            {
+                LyricsLayoutOrientation.Horizontal => Orientation.Horizontal,
+                LyricsLayoutOrientation.Vertical => Orientation.Vertical,
+                _ => throw new ArgumentOutOfRangeException(nameof(orientation)),
+            };
+
+            public Orientation ToOrientationInverse() => orientation switch
+            {
+                LyricsLayoutOrientation.Horizontal => Orientation.Vertical,
+                LyricsLayoutOrientation.Vertical => Orientation.Horizontal,
+                _ => throw new ArgumentOutOfRangeException(nameof(orientation)),
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsSearchProviderExtensions.cs

@@ -0,0 +1,64 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using System;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class LyricsSearchProviderExtensions
+    {
+        extension(LyricsSearchProvider provider)
+        {
+            public string GetCacheDirectory() => 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,
+                LyricsSearchProvider.LocalMusicFile => PathHelper.LocalMusicCacheDirectory,
+                LyricsSearchProvider.LocalLrcFile => PathHelper.LocalLrcCacheDirectory,
+                LyricsSearchProvider.LocalEslrcFile => PathHelper.LocalEslrcCacheDirectory,
+                LyricsSearchProvider.LocalTtmlFile => PathHelper.LocalTtmlCacheDirectory,
+                _ => throw new ArgumentOutOfRangeException(nameof(provider)),
+            };
+
+            public LyricsFormat GetLyricsFormat() => 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 bool IsLocal() => provider
+                is LyricsSearchProvider.LocalMusicFile
+                or LyricsSearchProvider.LocalLrcFile
+                or LyricsSearchProvider.LocalEslrcFile
+                or LyricsSearchProvider.LocalTtmlFile;
+
+            public bool IsRemote() => !provider.IsLocal();
+
+            public TranslationSearchProvider? ToTranslationSearchProvider() => 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,
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs

@@ -70,7 +70,7 @@ namespace BetterLyrics.WinUI3.Extensions
             {
                 Name = _resourceService.GetLocalizedString("FullscreenMode"),
                 IsBorderless = true,
-                IsAlwaysOnTop = false,
+                IsAlwaysOnTop = true,
                 TitleBarArea = TitleBarArea.None,
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/PointExtensions.cs

@@ -8,6 +8,12 @@ namespace BetterLyrics.WinUI3.Extensions
         extension(Point point)
         {
             public PointInt32 ToPointInt32() => new((int)point.X, (int)point.Y);
+
+            public Point AddX(double deltaX) => new(point.X + deltaX, point.Y);
+            public Point AddY(double deltaY) => new(point.X, point.Y + deltaY);
+
+            public Point WithX(double x) => new(x, point.Y);
+            public Point WithY(double y) => new(point.X, y);
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/RectExtensions.cs

@@ -41,6 +41,41 @@ namespace BetterLyrics.WinUI3.Extensions
                 rect.Width,
                 rect.Height
             );
+
+            public Rect AddY(double y) => new(
+                rect.X,
+                rect.Y + y,
+                rect.Width,
+                rect.Height
+            );
+
+            public Rect Extend(double left, double top, double right, double bottom) => new(
+                rect.X - left,
+                rect.Y - top,
+                rect.Width + left + right,
+                rect.Height + top + bottom
+            );
+
+            public Rect Extend(double padding) => Extend(rect, padding, padding, padding, padding);
+
+            public Rect Scale(double scale)
+            {
+                double originalWidth = rect.Width;
+                double originalHeight = rect.Height;
+
+                double scaledWidth = originalWidth * scale;
+                double scaledHeight = originalHeight * scale;
+
+                double scaleOffsetX = (scaledWidth - originalWidth) / 2;
+                double scaleOffsetY = (scaledHeight - originalHeight) / 2;
+
+                return new Rect(
+                    rect.X - scaleOffsetX,
+                    rect.Y - scaleOffsetY,
+                    scaledWidth,
+                    scaledHeight
+                );
+            }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/StringExtensions.cs

@@ -1,8 +1,5 @@
-using NTextCat.Commons;
-using System;
-using System.Collections.Generic;
+using BetterLyrics.WinUI3.Enums;
 using System.Linq;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Extensions
 {
@@ -37,6 +34,47 @@ namespace BetterLyrics.WinUI3.Extensions
                     return [str];
                 }
             }
+
+            public LyricsFormat? DetectFormat()
+            {
+                if (string.IsNullOrWhiteSpace(str))
+                    return null;
+
+                // TTML: 检查 <tt ... xmlns="http://www.w3.org/ns/ttml"
+                if (System.Text.RegularExpressions.Regex.IsMatch(
+                        str,
+                        @"<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(
+                             str,
+                             @"^\[\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(
+                             str,
+                             @"^\[\d+,\d+\].*?\(\d+,\d+\)",
+                             System.Text.RegularExpressions.RegexOptions.Multiline))
+                {
+                    return LyricsFormat.Qrc;
+                }
+                // 标准LRC和增强型LRC
+                else if (System.Text.RegularExpressions.Regex.IsMatch(str, @"\[\d{1,2}:\d{2}") ||
+                         System.Text.RegularExpressions.Regex.IsMatch(str, @"<\d{1,2}:\d{2}\.\d{2,3}>"))
+                {
+                    return LyricsFormat.Lrc;
+                }
+                else
+                {
+                    return null;
+                }
+            }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs

@@ -15,7 +15,14 @@ namespace BetterLyrics.WinUI3.Extensions
             {
                 if (track.Path is string path)
                 {
-                    return TagLib.File.Create(path).Tag.Lyrics;
+                    try
+                    {
+                        return TagLib.File.Create(path).Tag.Lyrics;
+                    }
+                    catch (System.Exception)
+                    {
+                        return "";
+                    }
                 }
                 return "";
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CanvasHelper.cs

@@ -1,14 +1,6 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
-using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Brushes;
+using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
-using Microsoft.Graphics.Canvas.UI.Xaml;
-using Microsoft.UI;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using Windows.Foundation;
+using System;
 using Windows.Graphics.Effects;
 using Windows.UI;
 
@@ -16,351 +8,6 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class CanvasHelper
     {
-        public static CanvasLinearGradientBrush CreateHorizontalFillBrush(
-            ICanvasAnimatedControl control,
-            List<(double position, double opacity)> stops,
-            double startX,
-            double width
-        )
-        {
-            return new CanvasLinearGradientBrush(control, stops.Select(stops => new CanvasGradientStop
-            {
-                Position = (float)stops.position,
-                Color = Color.FromArgb((byte)(stops.opacity * 255), 128, 128, 128),
-            }).ToArray())
-            {
-                StartPoint = new Vector2((float)startX, 0),
-                EndPoint = new Vector2((float)(startX + width), 0),
-            };
-        }
-
-        /// <summary>
-        /// 背景层
-        /// </summary>
-        /// <param name="lyricsLayerOpacity">_lyricsOpacityTransition.Value</param>
-        public static OpacityEffect CreateBackgroundEffect(LyricsLine lyricsLine, CanvasCommandList backgroundFontEffect, double lyricsLayerOpacity)
-        {
-            if (lyricsLine.BlurAmountTransition.Value == 0)
-            {
-                return new OpacityEffect
-                {
-                    Source = backgroundFontEffect,
-                    Opacity = (float)(lyricsLine.OpacityTransition.Value * lyricsLayerOpacity),
-                };
-            }
-            else
-            {
-                return new OpacityEffect
-                {
-                    Source = new GaussianBlurEffect
-                    {
-                        Source = backgroundFontEffect,
-                        BlurAmount = (float)lyricsLine.BlurAmountTransition.Value,
-                        BorderMode = EffectBorderMode.Soft,
-                        Optimization = EffectOptimization.Speed,
-                    },
-                    Opacity = (float)(lyricsLine.OpacityTransition.Value * lyricsLayerOpacity),
-                };
-            }
-        }
-
-        public static CanvasCommandList CreateFontEffect(LyricsLine lyricsLine, ICanvasAnimatedControl control, Color strokeColor, int strokeWidth, Color fontColor)
-        {
-            CanvasCommandList list = new(control);
-            using var ds = list.CreateDrawingSession();
-
-            // 描边
-            if (strokeWidth > 0)
-            {
-                if (lyricsLine.PhoneticCanvasGeometry != null)
-                {
-                    ds.DrawGeometry(lyricsLine.PhoneticCanvasGeometry, lyricsLine.PhoneticPosition, strokeColor, strokeWidth);
-                }
-                if (lyricsLine.OriginalCanvasGeometry != null)
-                {
-                    ds.DrawGeometry(lyricsLine.OriginalCanvasGeometry, lyricsLine.OriginalPosition, strokeColor, strokeWidth);
-                }
-                if (lyricsLine.TranslatedCanvasGeometry != null)
-                {
-                    ds.DrawGeometry(lyricsLine.TranslatedCanvasGeometry, lyricsLine.TranslatedPosition, strokeColor, strokeWidth);
-                }
-            }
-
-            // 绘制文本（填充）
-            if (lyricsLine.PhoneticCanvasTextLayout != null)
-            {
-                ds.DrawTextLayout(lyricsLine.PhoneticCanvasTextLayout, lyricsLine.PhoneticPosition, fontColor);
-            }
-            if (lyricsLine.OriginalCanvasTextLayout != null)
-            {
-                ds.DrawTextLayout(lyricsLine.OriginalCanvasTextLayout, lyricsLine.OriginalPosition, fontColor);
-            }
-            if (lyricsLine.TranslatedCanvasTextLayout != null)
-            {
-                ds.DrawTextLayout(lyricsLine.TranslatedCanvasTextLayout, lyricsLine.TranslatedPosition, fontColor);
-            }
-
-            return list;
-        }
-
-        /// <summary>
-        /// 创建辉光效果层
-        /// 仅需在布局重构 (Relayout) 时调用
-        /// </summary>
-        /// <param name="lineRenderingType">_lyricsGlowEffectScope</param>
-        /// <param name="glowEffectAmount">_lyricsGlowEffectAmount</param>
-        public static GaussianBlurEffect CreateForegroundBlurEffect(CanvasCommandList foregroundFontEffect, IGraphicsEffectSource mask, double glowEffectAmount)
-        {
-            return new GaussianBlurEffect
-            {
-                Source = new AlphaMaskEffect
-                {
-                    Source = foregroundFontEffect,
-                    AlphaMask = mask,
-                },
-                BlurAmount = (float)glowEffectAmount,
-                Optimization = EffectOptimization.Speed,
-            };
-        }
-
-        public static CanvasCommandList CreateCharMask(ICanvasAnimatedControl control, LyricsLine lyricsLine, int charStartIndex, int charLength, double charProgress)
-        {
-            var mask = new CanvasCommandList(control);
-            using var ds = mask.CreateDrawingSession();
-
-            if (lyricsLine.OriginalCanvasTextLayout == null)
-            {
-                return mask;
-            }
-
-            var highlightRegion = lyricsLine.OriginalCanvasTextLayout.GetCharacterRegions(charStartIndex, charLength).FirstOrDefault();
-
-            double highlightTotalWidth = (double)highlightRegion.LayoutBounds.Width;
-            // Draw the highlight for the current character
-            double highlightWidth = highlightTotalWidth * charProgress;
-
-            double fadingWidth = (double)highlightRegion.LayoutBounds.Height / 2;
-
-            // Rects
-            var highlightRect = new Rect(
-                highlightRegion.LayoutBounds.X,
-                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                highlightWidth,
-                highlightRegion.LayoutBounds.Height
-            );
-
-            var fadeInRect = new Rect(
-                highlightRect.Right - fadingWidth,
-                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                fadingWidth,
-                highlightRegion.LayoutBounds.Height
-            );
-            var fadeOutRect = new Rect(
-                highlightRect.Right,
-                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                fadingWidth,
-                highlightRegion.LayoutBounds.Height
-            );
-
-            // Brushes
-            using var fadeInBrush = CanvasHelper.CreateHorizontalFillBrush(
-                control,
-                [(0f, 0f), (1f, 1f)],
-                (double)highlightRect.Right - fadingWidth,
-                fadingWidth
-            );
-            using var fadeOutBrush = CanvasHelper.CreateHorizontalFillBrush(
-                control,
-                [(0f, 1f), (1f, 0f)],
-                (double)highlightRect.Right,
-                fadingWidth
-            );
-
-            ds.FillRectangle(fadeInRect, fadeInBrush);
-            ds.FillRectangle(fadeOutRect, fadeOutBrush);
-
-            return mask;
-        }
-
-        public static CanvasCommandList CreateLineStartToCharMask(ICanvasAnimatedControl control, LyricsLine lyricsLine, int charStartIndex, int charLength, double charProgress, bool fade)
-        {
-            var mask = new CanvasCommandList(control);
-
-            if (lyricsLine.OriginalCanvasTextLayout == null)
-            {
-                return mask;
-            }
-
-            using var ds = mask.CreateDrawingSession();
-
-            var regions = lyricsLine.OriginalCanvasTextLayout.GetCharacterRegions(0, charStartIndex);
-            var highlightRegion = lyricsLine.OriginalCanvasTextLayout
-                .GetCharacterRegions(charStartIndex, charLength)
-                .FirstOrDefault();
-            if (regions.Length > 0)
-            {
-                // Draw the mask for the current line
-                for (int j = 0; j < regions.Length; j++)
-                {
-                    var region = regions[j];
-                    var rect = new Rect(
-                        region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                        region.LayoutBounds.Width,
-                        region.LayoutBounds.Height
-                    );
-                    ds.FillRectangle(rect, Color.FromArgb(255, 128, 128, 128));
-                }
-            }
-
-            double highlightTotalWidth = (double)highlightRegion.LayoutBounds.Width;
-            // Draw the highlight for the current character
-            double highlightWidth = highlightTotalWidth * charProgress;
-
-            double fadingWidth = (double)highlightRegion.LayoutBounds.Height / 2;
-
-            // Rects
-            var highlightRect = new Rect(
-                highlightRegion.LayoutBounds.X,
-                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                highlightWidth,
-                highlightRegion.LayoutBounds.Height
-            );
-
-            var fadeInRect = new Rect(
-                highlightRect.Right - fadingWidth,
-                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                fadingWidth,
-                highlightRegion.LayoutBounds.Height
-            );
-
-            ds.FillRectangle(highlightRect, Color.FromArgb(255, 128, 128, 128));
-
-            if (fade)
-            {
-                var fadeOutRect = new Rect(
-                    highlightRect.Right,
-                    highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                    fadingWidth,
-                    highlightRegion.LayoutBounds.Height
-                );
-                using var fadeOutBrush = CreateHorizontalFillBrush(
-                    control,
-                    [(0f, 1f), (1f, 0f)],
-                    (double)highlightRect.Right,
-                    fadingWidth
-                );
-                ds.FillRectangle(fadeOutRect, fadeOutBrush);
-            }
-
-            return mask;
-        }
-
-        public static CanvasCommandList CreateLineMask(ICanvasAnimatedControl control, LyricsLine lyricsLine)
-        {
-            var mask = new CanvasCommandList(control);
-            using var ds = mask.CreateDrawingSession();
-
-            if (lyricsLine.OriginalCanvasTextLayout == null)
-            {
-                return mask;
-            }
-
-            var regions = lyricsLine.OriginalCanvasTextLayout.GetCharacterRegions(0, lyricsLine.OriginalText.Length);
-            if (regions.Length > 0)
-            {
-                for (int j = 0; j < regions.Length; j++)
-                {
-                    var region = regions[j];
-                    var rect = new Rect(
-                        region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
-                        region.LayoutBounds.Width,
-                        region.LayoutBounds.Height
-                    );
-                    ds.FillRectangle(rect, Colors.White);
-                }
-            }
-
-            return mask;
-        }
-
-        public static CanvasCommandList CreatePhoneticHighlightMask(ICanvasAnimatedControl control, LyricsLine lyricsLine)
-        {
-            var mask = new CanvasCommandList(control);
-            using var ds = mask.CreateDrawingSession();
-
-            if (lyricsLine.PhoneticCanvasTextLayout == null)
-            {
-                return mask;
-            }
-
-            var regions = lyricsLine.PhoneticCanvasTextLayout.GetCharacterRegions(0, lyricsLine.PhoneticText.Length);
-            if (regions.Length > 0)
-            {
-                for (int j = 0; j < regions.Length; j++)
-                {
-                    var region = regions[j];
-                    var rect = new Rect(
-                        region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.PhoneticPosition.Y,
-                        region.LayoutBounds.Width,
-                        region.LayoutBounds.Height
-                    );
-                    ds.FillRectangle(rect, Colors.White);
-                }
-            }
-
-            return mask;
-        }
-
-        public static CanvasCommandList CreateTranslatedHighlightMask(ICanvasAnimatedControl control, LyricsLine lyricsLine)
-        {
-            var mask = new CanvasCommandList(control);
-            using var ds = mask.CreateDrawingSession();
-
-            if (lyricsLine.TranslatedCanvasTextLayout == null)
-            {
-                return mask;
-            }
-
-            var regions = lyricsLine.TranslatedCanvasTextLayout.GetCharacterRegions(0, lyricsLine.TranslatedText.Length);
-            if (regions.Length > 0)
-            {
-                for (int j = 0; j < regions.Length; j++)
-                {
-                    var region = regions[j];
-                    var rect = new Rect(
-                        region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.TranslatedPosition.Y,
-                        region.LayoutBounds.Width,
-                        region.LayoutBounds.Height
-                    );
-                    ds.FillRectangle(rect, Colors.White);
-                }
-            }
-
-            return mask;
-        }
-
-        /// <summary>
-        /// 创建高亮效果层
-        /// </summary>
-        /// <param name="control"></param>
-        /// <param name="lineRenderingType"></param>
-        public static OpacityEffect CreateForegroundHighlightEffect(CanvasCommandList foregroundFontEffect, IGraphicsEffectSource mask, double opacity)
-        {
-            return new OpacityEffect
-            {
-                Source = new AlphaMaskEffect
-                {
-                    Source = foregroundFontEffect,
-                    AlphaMask = mask,
-                },
-                Opacity = (float)opacity,
-            };
-        }
-
         public static ShadowEffect CreateForegroundShadowEffect(CanvasCommandList foregroundFontEffect, IGraphicsEffectSource mask, Color shadowColor, double shadowAmount)
         {
             return new ShadowEffect
@@ -371,34 +18,10 @@ namespace BetterLyrics.WinUI3.Helper
                     AlphaMask = mask,
                 },
                 ShadowColor = shadowColor,
-                BlurAmount = (float)shadowAmount,
+                BlurAmount = (float)Math.Clamp(shadowAmount, 0, 100),
                 Optimization = EffectOptimization.Speed,
             };
         }
 
-        public static OpacityEffect CreateForegroundTranslationEffect(CanvasCommandList foregroundFontEffect, IGraphicsEffectSource mask, double opacity)
-        {
-            return new OpacityEffect
-            {
-                Source = new AlphaMaskEffect
-                {
-                    Source = foregroundFontEffect,
-                    AlphaMask = mask,
-                },
-                Opacity = (float)opacity,
-            };
-        }
-
-        public static IGraphicsEffectSource GetAlphaMask(ICanvasAnimatedControl control, IGraphicsEffectSource charMask, IGraphicsEffectSource lineStartToCharMask, IGraphicsEffectSource lineMask, LineRenderingType lineRenderingType)
-        {
-            var result = lineRenderingType switch
-            {
-                LineRenderingType.CurrentChar => charMask,
-                LineRenderingType.LineStartToCurrentChar => lineStartToCharMask,
-                LineRenderingType.CurrentLine => lineMask,
-                _ => new CanvasCommandList(control),
-            };
-            return result;
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs

@@ -1,7 +1,9 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Serialization;
 using System;
 using System.IO;
 using System.Text;
@@ -36,12 +38,18 @@ namespace BetterLyrics.WinUI3.Helper
             return sb.ToString();
         }
 
-        public static string? ReadLyricsCache(SongInfo songInfo, LyricsFormat format, string cacheFolderPath)
+        public static LyricsSearchResult? ReadLyricsCache(SongInfo songInfo, LyricsSearchProvider lyricsSearchProvider)
         {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{songInfo.DisplayArtists} - {songInfo.Title} - {songInfo.Album}{format.ToFileExtension()}"));
+            var cacheFilePath = Path.Combine(
+                lyricsSearchProvider.GetCacheDirectory(),
+                SanitizeFileName($"{songInfo.ToFileName()}.json"));
+
             if (File.Exists(cacheFilePath))
             {
-                return File.ReadAllText(cacheFilePath);
+                var json = File.ReadAllText(cacheFilePath);
+                var data = System.Text.Json.JsonSerializer.Deserialize(json, SourceGenerationContext.Default.LyricsSearchResult);
+                data?.SelfPath = cacheFilePath;
+                return data;
             }
             return null;
         }
@@ -56,10 +64,14 @@ namespace BetterLyrics.WinUI3.Helper
             return null;
         }
 
-        public static void WriteLyricsCache(SongInfo songInfo, string lyrics, LyricsFormat format, string cacheFolderPath)
+        public static void WriteLyricsCache(SongInfo songInfo, LyricsSearchResult lyricsSearchResult)
         {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{songInfo.DisplayArtists} - {songInfo.Title} - {songInfo.Album}{format.ToFileExtension()}"));
-            File.WriteAllText(cacheFilePath, lyrics);
+            var cacheFilePath = Path.Combine(
+                lyricsSearchResult.Provider.GetCacheDirectory(),
+                SanitizeFileName($"{songInfo.ToFileName()}.json"));
+            lyricsSearchResult.SelfPath = cacheFilePath;
+            var json = System.Text.Json.JsonSerializer.Serialize(lyricsSearchResult, SourceGenerationContext.Default.LyricsSearchResult);
+            File.WriteAllText(cacheFilePath, json);
         }
 
         public static void WriteAlbumArtCache(SongInfo songInfo, byte[] img, string format, string cacheFolderPath)
@@ -68,17 +80,6 @@ namespace BetterLyrics.WinUI3.Helper
             File.WriteAllBytes(cacheFilePath, img);
         }
 
-        public static bool IsSwitchableNormalizedMatch(string fileName, string q1, string q2)
-        {
-            var normFileName = StringHelper.Normalize(fileName);
-            var normQ1 = StringHelper.Normalize(q1);
-            var normQ2 = StringHelper.Normalize(q2);
-
-            // 常见两种顺序
-            return normFileName == normQ1 + normQ2
-                || normFileName == normQ2 + normQ1;
-        }
-
         public static readonly string[] MusicExtensions = {
             ".mp3", ".aac", ".m4a", ".ogg", ".opus", ".wma", ".amr",
             ".flac", ".alac", ".ape", ".wv", ".tak",

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs

@@ -1,10 +1,39 @@
 using Microsoft.Graphics.Canvas.Text;
+using Microsoft.UI.Xaml;
+using System;
+using System.Globalization;
 using System.Linq;
+using System.Windows.Markup;
+using System.Windows.Media;
 
 namespace BetterLyrics.WinUI3.Helper
 {
     public static class FontHelper
     {
         public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies().Order().ToArray();
+
+        public static string GetLocalizedFontFamilyName(string sourceName, string langCode)
+        {
+            if (langCode == "")
+            {
+                langCode = CultureInfo.CurrentCulture.Name;
+            }
+
+            foreach (var font in Fonts.SystemFontFamilies)
+            {
+                if (font.FamilyNames.TryGetValue(XmlLanguage.GetLanguage("en-us"), out string englishFamilyName) && englishFamilyName == sourceName)
+                {
+                    if (font.FamilyNames.ContainsKey(XmlLanguage.GetLanguage(langCode)))
+                    {
+                        if (font.FamilyNames.TryGetValue(XmlLanguage.GetLanguage(langCode), out string localizedFamilyName))
+                        {
+                            return localizedFamilyName;
+                        }
+                    }
+                }
+            }
+
+            return sourceName;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ImageHelper.cs

@@ -137,7 +137,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static async Task<byte[]?> GetImageBytesFromUrlAsync(string url)
+        public static async Task<byte[]?> GetImageByteArrayFromUrlAsync(string url)
         {
             if (string.IsNullOrWhiteSpace(url))
             {
@@ -185,5 +185,21 @@ namespace BetterLyrics.WinUI3.Helper
         {
             return buffer.AsStream().AsRandomAccessStream();
         }
+
+        public static byte[] ToByteArray(IBuffer buffer)
+        {
+            using (var dataReader = DataReader.FromBuffer(buffer))
+            {
+                byte[] byteArray = new byte[buffer.Length];
+                dataReader.ReadBytes(byteArray);
+                return byteArray;
+            }
+        }
+
+        public static IRandomAccessStream ToIRandomAccessStream(byte[] arr)
+        {
+            MemoryStream stream = new MemoryStream(arr);
+            return stream.AsRandomAccessStream();
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs

@@ -14,6 +14,9 @@ namespace BetterLyrics.WinUI3.Helper
         private static readonly RankedLanguageIdentifier _identifier;
         private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
+        public const string ChineseCode = "zh";
+        public const string JapaneseCode = "ja";
+
         public static List<ExtendedLanguage> SupportedTranslationTargetLanguages { get; set; } =
         [
             new ExtendedLanguage("ar"),
@@ -105,7 +108,6 @@ namespace BetterLyrics.WinUI3.Helper
         public static string? DetectLanguageCode(string? text)
         {
             if (text == null) return null;
-
             var guessList = _identifier.Identify(text);
             string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
             code = code switch

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsLayoutHelper.cs

@@ -0,0 +1,75 @@
+using BetterLyrics.WinUI3.Models;
+using System;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class LyricsLayoutHelper
+    {
+        // 硬性限制
+        private const float BaseMinFontSize = 14f;
+        private const float BaseMaxFontSize = 80f;
+        private const float TargetMinVisibleLines = 5f;
+        private const float WidthPaddingRatio = 0.85f;
+
+        // 比例配置
+        private const float RatioSongTitle = 1f;
+        private const float RatioArtist = 0.85f;
+        private const float RatioAlbum = 0.75f;
+        private const float RatioTranslation = 0.7f;
+        private const float RatioTransliteration = 0.55f;
+        private const float AbsoluteMinReadableSize = 10f;
+
+        public static LyricsLayoutMetrics CalculateLayout(double width, double height)
+        {
+            float baseSize = CalculateBaseFontSize(width, height);
+
+            return new LyricsLayoutMetrics
+            {
+                MainLyricsSize = baseSize,
+                TranslationSize = ApplyRatio(baseSize, RatioTranslation),
+                TransliterationSize = ApplyRatio(baseSize, RatioTransliteration),
+                SongTitleSize = ApplyRatio(baseSize, RatioSongTitle),
+                ArtistNameSize = ApplyRatio(baseSize, RatioArtist),
+                AlbumNameSize = ApplyRatio(baseSize, RatioAlbum)
+            };
+        }
+
+        private static float CalculateBaseFontSize(double width, double height)
+        {
+            float usableWidth = (float)width * WidthPaddingRatio;
+
+            // 宽度 300~500px 时，除以 14 (字大)
+            // 宽度 >1000px 时，除以 30 (字适中，展示更多内容)
+            float targetCharsPerLine;
+            if (width < 500)
+            {
+                targetCharsPerLine = 14f;
+            }
+            else if (width > 1000)
+            {
+                targetCharsPerLine = 30f;
+            }
+            else
+            {
+                // 平滑过渡
+                float t = (float)(width - 500) / 500f;
+                targetCharsPerLine = 14f + 16f * t;
+            }
+
+            float sizeByWidth = usableWidth / targetCharsPerLine;
+            float sizeByHeight = (float)height / TargetMinVisibleLines;
+
+            float targetSize = Math.Min(sizeByWidth, sizeByHeight);
+
+            // 窄屏时底线设高一点 (16px)，宽屏如果高度不够可能允许更小
+            float currentMinLimit = (width < 400) ? 16f : BaseMinFontSize;
+
+            return Math.Clamp(targetSize, currentMinLimit, BaseMaxFontSize);
+        }
+
+        private static float ApplyRatio(float baseSize, float ratio)
+        {
+            return Math.Max(baseSize * ratio, AbsoluteMinReadableSize);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs

@@ -1,525 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
-using BetterLyrics.WinUI3.Models;
-using Lyricify.Lyrics.Parsers;
-using NTextCat.Commons;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Xml.Linq;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public partial class LyricsParser
-    {
-        public List<LyricsData> LyricsDataArr { get; private set; } = [];
-
-        public void Parse(List<MappedSongSearchQuery> mappedSongSearchQueries, Models.SongInfo songInfo, string? raw, LyricsSearchProvider? lyricsSearchProvider)
-        {
-            var overridenTitle = songInfo.Title;
-            var overridenArtist = songInfo.Artists;
-            var overridenAlbum = songInfo.Album;
-
-            var found = mappedSongSearchQueries
-                .FirstOrDefault(x =>
-                    x.OriginalTitle == overridenTitle &&
-                    x.OriginalArtist == overridenArtist.Join(ATL.Settings.DisplayValueSeparator.ToString()) &&
-                    x.OriginalAlbum == overridenAlbum);
-
-            if (found != null)
-            {
-                overridenTitle = found.MappedTitle;
-                overridenArtist = found.MappedArtist.Split(ATL.Settings.DisplayValueSeparator);
-                overridenAlbum = found.MappedAlbum;
-            }
-
-            LyricsDataArr = [];
-            if (raw == null)
-            {
-                LyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder((int)songInfo.DurationMs));
-            }
-            else
-            {
-                switch (raw.DetectFormat())
-                {
-                    case LyricsFormat.Lrc:
-                    case LyricsFormat.Eslrc:
-                        ParseLrc(raw);
-                        break;
-                    case LyricsFormat.Qrc:
-                        ParseQrcKrc(QrcParser.Parse(raw).Lines);
-                        break;
-                    case LyricsFormat.Krc:
-                        ParseQrcKrc(KrcParser.Parse(raw).Lines);
-                        break;
-                    case LyricsFormat.Ttml:
-                        ParseTtml(raw);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            FillRomanizationLyricsData();
-            FillTranslationFromCache(
-                ((SongInfo)songInfo.Clone())
-                    .WithTitle(overridenTitle)
-                    .WithArtist(overridenArtist)
-                    .WithAlbum(overridenAlbum),
-                lyricsSearchProvider);
-        }
-
-        private void FillTranslationFromCache(SongInfo songInfo, LyricsSearchProvider? provider)
-        {
-            string? translationRaw = null;
-            switch (provider)
-            {
-                case LyricsSearchProvider.QQ:
-                    translationRaw = FileHelper.ReadLyricsCache(songInfo, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
-                    break;
-                case LyricsSearchProvider.Kugou:
-                    translationRaw = FileHelper.ReadLyricsCache(songInfo, LyricsFormat.Lrc, PathHelper.KugouTranslationCacheDirectory);
-                    break;
-                case LyricsSearchProvider.Netease:
-                    translationRaw = FileHelper.ReadLyricsCache(songInfo, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
-                    break;
-                case LyricsSearchProvider.LrcLib:
-                    break;
-                case LyricsSearchProvider.AmllTtmlDb:
-                    break;
-                case LyricsSearchProvider.LocalMusicFile:
-                    break;
-                case LyricsSearchProvider.LocalLrcFile:
-                    break;
-                case LyricsSearchProvider.LocalEslrcFile:
-                    break;
-                case LyricsSearchProvider.LocalTtmlFile:
-                    break;
-                default:
-                    break;
-            }
-
-            if (translationRaw != null)
-            {
-                switch (provider)
-                {
-                    case LyricsSearchProvider.QQ:
-                    case LyricsSearchProvider.Kugou:
-                    case LyricsSearchProvider.Netease:
-                        ParseLrc(translationRaw);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        private void FillRomanizationLyricsData()
-        {
-            var chinese = LyricsDataArr.FirstOrDefault(x => x.LanguageCode == "zh");
-            if (chinese != null)
-            {
-                LyricsDataArr.Add(new LyricsData
-                {
-                    LanguageCode = PhoneticHelper.PinyinCode,
-                    LyricsLines = chinese.LyricsLines.Select(line => new LyricsLine
-                    {
-                        StartMs = line.StartMs,
-                        EndMs = line.EndMs,
-                        OriginalText = PhoneticHelper.ToPinyin(line.OriginalText),
-                        LyricsChars = line.LyricsChars.Select(c => new LyricsChar
-                        {
-                            StartMs = c.StartMs,
-                            EndMs = c.EndMs,
-                            Text = PhoneticHelper.ToPinyin(c.Text),
-                            StartIndex = c.StartIndex
-                        }).ToList()
-                    }).ToList()
-                });
-                LyricsDataArr.Add(new LyricsData
-                {
-                    LanguageCode = PhoneticHelper.JyutpingCode,
-                    LyricsLines = chinese.LyricsLines.Select(line => new LyricsLine
-                    {
-                        StartMs = line.StartMs,
-                        EndMs = line.EndMs,
-                        OriginalText = PhoneticHelper.ToJyutping(line.OriginalText),
-                        LyricsChars = line.LyricsChars.Select(c => new LyricsChar
-                        {
-                            StartMs = c.StartMs,
-                            EndMs = c.EndMs,
-                            Text = PhoneticHelper.ToJyutping(c.Text),
-                            StartIndex = c.StartIndex
-                        }).ToList()
-                    }).ToList()
-                });
-            }
-            var japanese = LyricsDataArr.FirstOrDefault(x => x.LanguageCode == "ja");
-            if (japanese != null)
-            {
-                LyricsDataArr.Add(new LyricsData
-                {
-                    LanguageCode = PhoneticHelper.RomajiCode,
-                    LyricsLines = japanese.LyricsLines.Select(line => new LyricsLine
-                    {
-                        StartMs = line.StartMs,
-                        EndMs = line.EndMs,
-                        OriginalText = PhoneticHelper.ToRomaji(line.OriginalText),
-                        LyricsChars = line.LyricsChars.Select(c => new LyricsChar
-                        {
-                            StartMs = c.StartMs,
-                            EndMs = c.EndMs,
-                            Text = PhoneticHelper.ToRomaji(c.Text),
-                            StartIndex = c.StartIndex
-                        }).ToList()
-                    }).ToList()
-                });
-            }
-        }
-
-        private void ParseLrc(string raw)
-        {
-            var lines = raw.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries);
-            var lrcLines =
-                new List<(int time, string text, List<(int time, string text)> syllables)>();
-
-            // 支持 [mm:ss.xx]字、<mm:ss.xx>字，毫秒两位或三位
-            var syllableRegex = SyllableRegex();
-
-            foreach (var line in lines)
-            {
-                var matches = syllableRegex.Matches(line);
-                var syllables = new List<(int, string)>();
-                for (int i = 0; i < matches.Count; i++)
-                {
-                    var m = matches[i];
-                    int min = int.Parse(m.Groups[2].Value);
-                    int sec = int.Parse(m.Groups[3].Value);
-                    int ms = int.Parse(m.Groups[4].Value.PadRight(3, '0'));
-                    int totalMs = min * 60_000 + sec * 1000 + ms;
-                    string text = m.Groups[6].Value;
-
-                    syllables.Add((totalMs, text));
-                }
-                if (syllables.Count > 1)
-                {
-                    lrcLines.Add(
-                        (
-                            syllables[0].Item1,
-                            string.Concat(syllables.Select(s => s.Item2)),
-                            syllables
-                        )
-                    );
-                }
-                else
-                {
-                    // 普通LRC行
-                    Regex? bracketRegex = LrcRegex();
-                    var bracketMatches = bracketRegex.Matches(line);
-
-                    string content = line;
-                    int? lineStartTime = null;
-                    if (bracketMatches.Count > 0)
-                    {
-                        var m = bracketMatches[0];
-                        int min = int.Parse(m.Groups[1].Value);
-                        int sec = int.Parse(m.Groups[2].Value);
-                        int ms = int.Parse(m.Groups[4].Value.PadRight(3, '0'));
-                        lineStartTime = min * 60_000 + sec * 1000 + ms;
-                        content = bracketRegex!.Replace(line, "").Trim();
-                        if (content == "//") content = "";
-                        lrcLines.Add((lineStartTime.Value, content, new List<(int, string)>()));
-                    }
-                }
-            }
-
-            // 按时间分组
-            var grouped = lrcLines.GroupBy(l => l.time).OrderBy(g => g.Key).ToList();
-            int languageCount = 0;
-            if (grouped != null && grouped.Count > 0)
-            {
-                // 计算最大语言数量
-                languageCount = grouped.Max(g => g.Count());
-            }
-
-            // 初始化每种语言的歌词列表
-            //LyricsDataArr.Clear();
-            int langStartIndex = LyricsDataArr.Count;
-            for (int i = 0; i < languageCount; i++) LyricsDataArr.Add(new LyricsData());
-
-            // 遍历每个时间分组
-            if (grouped != null)
-            {
-                foreach (var group in grouped)
-                {
-                    var linesInGroup = group.ToList();
-                    for (int langIdx = 0; langIdx < languageCount; langIdx++)
-                    {
-                        // 只添加有对应行的语言，否则跳过
-                        if (langIdx < linesInGroup.Count)
-                        {
-                            var (start, text, syllables) = linesInGroup[langIdx];
-                            var line = new LyricsLine
-                            {
-                                StartMs = start,
-                                OriginalText = text,
-                                LyricsChars = [],
-                            };
-                            if (syllables != null && syllables.Count > 0)
-                            {
-                                int currentIndex = 0;
-                                for (int j = 0; j < syllables.Count; j++)
-                                {
-                                    var (charStart, charText) = syllables[j];
-                                    int startIndex = currentIndex;
-                                    line.LyricsChars.Add(
-                                        new LyricsChar
-                                        {
-                                            StartMs = charStart,
-                                            Text = charText ?? "",
-                                            StartIndex = startIndex,
-                                        }
-                                    );
-                                    currentIndex += charText?.Length ?? 0;
-                                }
-                            }
-                            LyricsDataArr[langStartIndex + langIdx].LyricsLines.Add(line);
-                        }
-                        // 没有翻译行则不补原文，直接跳过
-                    }
-                }
-            }
-        }
-
-        private void ParseTtml(string raw)
-        {
-            try
-            {
-                List<LyricsLine> originalLines = [];
-                List<LyricsLine> translationLines = [];
-                var xdoc = XDocument.Parse(raw, LoadOptions.PreserveWhitespace);
-                var body = xdoc.Descendants().FirstOrDefault(e => e.Name.LocalName == "body");
-                if (body == null) return;
-                var ps = body.Descendants().Where(e => e.Name.LocalName == "p");
-                foreach (var p in ps)
-                {
-                    // 句级时间
-                    string? pBegin = p.Attribute("begin")?.Value;
-                    string? pEnd = p.Attribute("end")?.Value;
-                    int pStartMs = ParseTtmlTime(pBegin);
-                    int pEndMs = ParseTtmlTime(pEnd);
-
-                    // 只获取一级span，且排除 ttm:role="x-bg" 的 span 和 ttm:role="x-roman"
-                    var spans = p.Elements()
-                        .Where(s => s.Name.LocalName == "span" &&
-                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg" &&
-                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-roman")
-                        .ToList();
-
-                    // 原文和翻译分离
-                    var originalTextSpans = spans
-                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-translation")
-                        .ToList();
-                    var translationTextSpans = spans
-                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value == "x-translation")
-                        .ToList();
-
-                    // 处理原文span后的空白
-                    for (int i = 0; i < originalTextSpans.Count; i++)
-                    {
-                        var span = originalTextSpans[i];
-                        var nextNode = span.NodesAfterSelf().FirstOrDefault();
-                        if (nextNode is XText textNode)
-                        {
-                            span.Value += textNode.Value;
-                        }
-                    }
-                    // 拼接空白字符后的原文
-                    string originalText = string.Concat(originalTextSpans.Select(s => s.Value));
-
-                    var originalCharTimings = new List<LyricsChar>();
-                    int originalStartIndex = 0;
-                    foreach (var span in originalTextSpans)
-                    {
-                        string? sBegin = span.Attribute("begin")?.Value;
-                        string? sEnd = span.Attribute("end")?.Value;
-                        int sStartMs = ParseTtmlTime(sBegin);
-                        int sEndMs = ParseTtmlTime(sEnd);
-                        originalCharTimings.Add(new LyricsChar
-                        {
-                            StartMs = sStartMs,
-                            EndMs = sEndMs,
-                            StartIndex = originalStartIndex,
-                            Text = span.Value
-                        });
-                        originalStartIndex += span.Value.Length;
-                    }
-                    if (originalTextSpans.Count == 0)
-                        originalText = p.Value;
-
-                    originalLines.Add(new LyricsLine
-                    {
-                        StartMs = pStartMs,
-                        EndMs = pEndMs,
-                        OriginalText = originalText,
-                        LyricsChars = originalCharTimings,
-                    });
-
-                    // 翻译
-                    string translationText = string.Concat(translationTextSpans.Select(s => s.Value));
-                    var translationCharTimings = new List<LyricsChar>();
-                    int translationStartIndex = 0;
-                    foreach (var span in translationTextSpans)
-                    {
-                        string? sBegin = span.Attribute("begin")?.Value;
-                        string? sEnd = span.Attribute("end")?.Value;
-                        int sStartMs = ParseTtmlTime(sBegin);
-                        int sEndMs = ParseTtmlTime(sEnd);
-                        translationCharTimings.Add(new LyricsChar
-                        {
-                            StartMs = sStartMs,
-                            EndMs = sEndMs,
-                            StartIndex = translationStartIndex,
-                            Text = span.Value
-                        });
-                        translationStartIndex += span.Value.Length;
-                    }
-                    if (translationTextSpans.Count > 0)
-                    {
-                        translationLines.Add(new LyricsLine
-                        {
-                            StartMs = pStartMs,
-                            EndMs = pEndMs,
-                            OriginalText = translationText,
-                            LyricsChars = translationCharTimings,
-                        });
-                    }
-                }
-                LyricsDataArr.Add(new LyricsData(originalLines));
-                if (translationLines.Count > 0)
-                    LyricsDataArr.Add(new LyricsData(translationLines));
-            }
-            catch
-            {
-                // 解析失败，忽略
-            }
-        }
-
-        private static int ParseTtmlTime(string? t)
-        {
-            if (string.IsNullOrWhiteSpace(t))
-                return 0;
-
-            t = t.Trim();
-
-            // 支持 "1.000s"
-            if (t.EndsWith("s"))
-            {
-                if (
-                    double.TryParse(
-                        t.TrimEnd('s'),
-                        System.Globalization.NumberStyles.Float,
-                        System.Globalization.CultureInfo.InvariantCulture,
-                        out double seconds
-                    )
-                )
-                    return (int)(seconds * 1000);
-            }
-            else
-            {
-                var parts = t.Split(':');
-                if (parts.Length == 3)
-                {
-                    // hh:mm:ss.xxx
-                    int h = int.Parse(parts[0]);
-                    int m = int.Parse(parts[1]);
-                    double s = double.Parse(
-                        parts[2],
-                        System.Globalization.CultureInfo.InvariantCulture
-                    );
-                    return (int)((h * 3600 + m * 60 + s) * 1000);
-                }
-                else if (parts.Length == 2)
-                {
-                    // mm:ss.xxx
-                    int m = int.Parse(parts[0]);
-                    double s = double.Parse(
-                        parts[1],
-                        System.Globalization.CultureInfo.InvariantCulture
-                    );
-                    return (int)((m * 60 + s) * 1000);
-                }
-                else if (parts.Length == 1)
-                {
-                    // ss.xxx
-                    if (
-                        double.TryParse(
-                            parts[0],
-                            System.Globalization.NumberStyles.Float,
-                            System.Globalization.CultureInfo.InvariantCulture,
-                            out double s
-                        )
-                    )
-                        return (int)(s * 1000);
-                }
-            }
-            return 0;
-        }
-
-        private void ParseQrcKrc(List<Lyricify.Lyrics.Models.ILineInfo>? lines)
-        {
-            lines = lines?.Where(x => x.Text != string.Empty).ToList();
-            List<LyricsLine> lyricsLines = [];
-
-            if (lines != null && lines.Count > 0)
-            {
-                lyricsLines = [];
-                for (int lineIndex = 0; lineIndex < lines.Count; lineIndex++)
-                {
-                    var lineRead = lines[lineIndex];
-                    var lineWrite = new LyricsLine
-                    {
-                        StartMs = lineRead.StartTime ?? 0,
-                        EndMs = lineRead.EndTime ?? 0,
-                        OriginalText = lineRead.Text,
-                        LyricsChars = [],
-                    };
-
-                    var syllables = (lineRead as Lyricify.Lyrics.Models.SyllableLineInfo)?.Syllables;
-                    if (syllables != null)
-                    {
-                        int startIndex = 0;
-                        for (
-                            int syllableIndex = 0;
-                            syllableIndex < syllables.Count;
-                            syllableIndex++
-                        )
-                        {
-                            var syllable = syllables[syllableIndex];
-                            var charTiming = new LyricsChar
-                            {
-                                StartMs = syllable.StartTime,
-                                EndMs = syllable.EndTime,
-                                Text = syllable.Text,
-                                StartIndex = startIndex,
-                            };
-                            lineWrite.LyricsChars.Add(charTiming);
-                            startIndex += syllable.Text.Length;
-                        }
-                    }
-
-                    lyricsLines.Add(lineWrite);
-                }
-            }
-
-            LyricsDataArr.Add(new LyricsData(lyricsLines));
-        }
-
-        [GeneratedRegex(@"\[(\d*):(\d*)(\.|\:)(\d*)\]")]
-        private static partial Regex LrcRegex();
-        [GeneratedRegex(@"(\[|\<)(\d*):(\d*)\.(\d*)(\]|\>)([^\[\]\<\>]*)")]
-        private static partial Regex SyllableRegex();
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MetadataComparer.cs

@@ -0,0 +1,123 @@
+using BetterLyrics.WinUI3.Models;
+using F23.StringSimilarity;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static partial class MetadataComparer
+    {
+        private const double WeightTitle = 0.40;
+        private const double WeightArtist = 0.40;
+        private const double WeightAlbum = 0.10;
+        private const double WeightDuration = 0.10;
+
+        // JaroWinkler 适合短字符串匹配
+        private static readonly JaroWinkler _algo = new();
+
+        public static int CalculateScore(SongInfo local, LyricsSearchResult remote)
+        {
+            if (local == null || remote == null) return 0;
+
+            double totalScore = 0;
+
+            bool localHasMetadata = !string.IsNullOrWhiteSpace(local.Title);
+            bool remoteHasMetadata = !string.IsNullOrWhiteSpace(remote.Title);
+
+            if (localHasMetadata && remoteHasMetadata)
+            {
+                double titleScore = GetStringSimilarity(local.Title, remote.Title);
+                double artistScore = GetArtistSimilarity(local.Artists, remote.Artists);
+                double albumScore = GetStringSimilarity(local.Album, remote.Album);
+                double durationScore = GetDurationSimilarity(local.DurationMs, remote.Duration);
+
+                totalScore = (titleScore * WeightTitle) +
+                                    (artistScore * WeightArtist) +
+                                    (albumScore * WeightAlbum) +
+                                    (durationScore * WeightDuration);
+            }
+            else
+            {
+                string? localQuery = localHasMetadata
+                    ? $"{local.Title} {string.Join(" ", local.Artists ?? [])}"
+                    : Path.GetFileNameWithoutExtension(local.LinkedFileName);
+
+                string remoteQuery = remoteHasMetadata
+                    ? $"{remote.Title} {string.Join(" ", remote.Artists ?? [])}"
+                    : Path.GetFileNameWithoutExtension(remote.Reference);
+
+                string fp1 = CreateSortedFingerprint(localQuery);
+                string fp2 = CreateSortedFingerprint(remoteQuery);
+
+                if (string.IsNullOrWhiteSpace(fp1) || string.IsNullOrWhiteSpace(fp2))
+                    totalScore = 0;
+                else
+                    totalScore = _algo.Similarity(fp1, fp2);
+            }
+
+            return (int)Math.Round(totalScore * 100);
+        }
+
+        private static double GetStringSimilarity(string? s1, string? s2)
+        {
+            s1 = s1?.Trim().ToLowerInvariant() ?? "";
+            s2 = s2?.Trim().ToLowerInvariant() ?? "";
+
+            if (string.IsNullOrEmpty(s1) && string.IsNullOrEmpty(s2)) return 1.0; // 都是空，视为匹配
+            if (string.IsNullOrEmpty(s1) || string.IsNullOrEmpty(s2)) return 0.0; // 其中一个为空
+
+            return _algo.Similarity(s1, s2);
+        }
+
+        private static double GetArtistSimilarity(string[]? localArtists, string[]? remoteArtists)
+        {
+            if (localArtists == null || localArtists.Length == 0) return 0.0;
+            if (remoteArtists == null || remoteArtists.Length == 0) return 0.0;
+
+            // 将艺术家数组排序并连接，避免顺序不同导致的不匹配
+            var s1 = string.Join(" ", localArtists.OrderBy(a => a).Select(a => a.Trim().ToLowerInvariant()));
+            var s2 = string.Join(" ", remoteArtists.OrderBy(a => a).Select(a => a.Trim().ToLowerInvariant()));
+
+            return _algo.Similarity(s1, s2);
+        }
+
+        private static double GetDurationSimilarity(double localMs, double? remoteSeconds)
+        {
+            if (remoteSeconds == null || remoteSeconds == 0) return 0.0; // 远程没有时长数据，不匹配
+
+            double localSeconds = localMs / 1000.0;
+            double diff = Math.Abs(localSeconds - remoteSeconds.Value);
+
+            // 差距 <= 3秒：100% 相似
+            // 差距 >= 20秒：0% 相似
+            // 中间线性插值
+
+            const double PerfectTolerance = 3.0;
+            const double MaxTolerance = 20.0;
+
+            if (diff <= PerfectTolerance) return 1.0;
+            if (diff >= MaxTolerance) return 0.0;
+
+            return 1.0 - ((diff - PerfectTolerance) / (MaxTolerance - PerfectTolerance));
+        }
+
+        private static string CreateSortedFingerprint(string? input)
+        {
+            if (string.IsNullOrWhiteSpace(input)) return "";
+
+            input = input.ToLowerInvariant();
+
+            string cleaned = NonWordCharactersRegex().Replace(input, " ");
+
+            var tokens = cleaned.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)
+                                .OrderBy(t => t); // 排序
+
+            return string.Join(" ", tokens);
+        }
+
+        [GeneratedRegex(@"[\p{P}\p{S}]")]
+        private static partial Regex NonWordCharactersRegex();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PasswordVaultHelper.cs

@@ -12,23 +12,23 @@ namespace BetterLyrics.WinUI3.Helper
         /// <param name="value">要保存的值</param>
         public static void Save(string resource, string key, string value)
         {
-            var vault = new PasswordVault();
-
             // 删除旧值（避免重复存储）
             try
             {
+                var vault = new PasswordVault();
+
                 var oldCredential = vault.Retrieve(resource, key);
                 if (oldCredential != null)
                 {
                     vault.Remove(oldCredential);
                 }
+
+                vault.Add(new PasswordCredential(resource, key, value));
             }
             catch
             {
                 // 没有旧值就忽略
             }
-
-            vault.Add(new PasswordCredential(resource, key, value));
         }
 
         /// <summary>
@@ -39,9 +39,10 @@ namespace BetterLyrics.WinUI3.Helper
         /// <returns>存储的值，若不存在则返回 null</returns>
         public static string? Get(string resource, string key)
         {
-            var vault = new PasswordVault();
             try
             {
+                var vault = new PasswordVault();
+
                 var credential = vault.Retrieve(resource, key);
                 credential.RetrievePassword();
                 return credential.Password;
@@ -57,9 +58,10 @@ namespace BetterLyrics.WinUI3.Helper
         /// </summary>
         public static void Delete(string resource, string key)
         {
-            var vault = new PasswordVault();
             try
             {
+                var vault = new PasswordVault();
+
                 var credential = vault.Retrieve(resource, key);
                 vault.Remove(credential);
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs

@@ -14,9 +14,26 @@ namespace BetterLyrics.WinUI3.Helper
         public static string SettingsFilePath => Path.Combine(SettingsDirectory, "settings.json");
 
         public static string LanguageProfilePath => Path.Combine(AssetsFolder, "Wiki82.profile.xml");
-
-        public static string AlbumArtPlaceholderPath => Path.Combine(AssetsFolder, "AlbumArtPlaceholder.png");
         public static string LogoPath => Path.Combine(AssetsFolder, "Logo.ico");
+        public static string AlbumArtPlaceholderPath => Path.Combine(AssetsFolder, "AlbumArtPlaceholder.png");
+        public static string AIMPLogoPath => Path.Combine(AssetsFolder, "AIMP.png");
+        public static string Foobar2000LogoPath => Path.Combine(AssetsFolder, "foobar2000.png");
+        public static string MusicBeeLogoPath => Path.Combine(AssetsFolder, "MusicBee.png");
+        public static string SpotifyLogoPath => Path.Combine(AssetsFolder, "Spotify.png");
+        public static string AppleMusicLogoPath => Path.Combine(AssetsFolder, "AppleMusic.png");
+        public static string iTunesLogoPath => Path.Combine(AssetsFolder, "iTunes.png");
+        public static string KugouMusicLogoPath => Path.Combine(AssetsFolder, "KugouMusic.png");
+        public static string NetEaseCloudMusicLogoPath => Path.Combine(AssetsFolder, "NetEaseCloudMusic.png");
+        public static string QQMusicLogoPath => Path.Combine(AssetsFolder, "QQMusic.png");
+        public static string LXMusicLogoPath => Path.Combine(AssetsFolder, "LXMusic.png");
+        public static string MediaPlayerWindows11LogoPath => Path.Combine(AssetsFolder, "MediaPlayerWindows11.png");
+        public static string PotPlayerLogoPath => Path.Combine(AssetsFolder, "PotPlayer.png");
+        public static string ChromeLogoPath => Path.Combine(AssetsFolder, "Chrome.png");
+        public static string EdgeLogoPath => Path.Combine(AssetsFolder, "Edge.png");
+        public static string SaltPlayerForWindowsLogoPath => Path.Combine(AssetsFolder, "SaltPlayerForWindows.png");
+        public static string MoeKoeMusicLogoPath => Path.Combine(AssetsFolder, "MoeKoeMusic.png");
+        public static string Listen1LogoPath => Path.Combine(AssetsFolder, "Listen1.png");
+        public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
 
         public static string LogDirectory => Path.Combine(CacheFolder, "logs");
         public static string LogFilePattern => Path.Combine(LogDirectory, "log-.txt");
@@ -28,14 +45,13 @@ namespace BetterLyrics.WinUI3.Helper
         public static string KugouLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "kugou");
         public static string AmllTtmlDbLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "amll-ttml-db");
         public static string AppleMusicCacheDirectory => Path.Combine(LyricsCacheDirectory, "apple-music");
-        public static string AmllTtmlDbIndexPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-index.json");
+        public static string LocalMusicCacheDirectory => Path.Combine(LyricsCacheDirectory, "local-music");
+        public static string LocalLrcCacheDirectory => Path.Combine(LyricsCacheDirectory, "local-lrc");
+        public static string LocalEslrcCacheDirectory => Path.Combine(LyricsCacheDirectory, "local-eslrc");
+        public static string LocalTtmlCacheDirectory => Path.Combine(LyricsCacheDirectory, "local-ttml");
+        public static string AmllTtmlDbIndexPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-index.jsonl");
         public static string AmllTtmlDbLastUpdatedPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-last-updated.txt");
 
-        public static string TranslationCacheDirectory => Path.Combine(CacheFolder, "translations");
-        public static string QQTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "qq");
-        public static string NeteaseTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "netease");
-        public static string KugouTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "kugou");
-
         public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
         public static string iTunesAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "itunes");
 
@@ -53,12 +69,12 @@ namespace BetterLyrics.WinUI3.Helper
             Directory.CreateDirectory(NeteaseLyricsCacheDirectory);
             Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
             Directory.CreateDirectory(AppleMusicCacheDirectory);
-
-            Directory.CreateDirectory(QQTranslationCacheDirectory);
-            Directory.CreateDirectory(NeteaseTranslationCacheDirectory);
-            Directory.CreateDirectory(KugouTranslationCacheDirectory);
+            Directory.CreateDirectory(LocalMusicCacheDirectory);
+            Directory.CreateDirectory(LocalLrcCacheDirectory);
+            Directory.CreateDirectory(LocalEslrcCacheDirectory);
+            Directory.CreateDirectory(LocalTtmlCacheDirectory);
 
             Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
         }
     }
-}
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs

@@ -1,7 +1,6 @@
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System;
-using System.Linq;
 
 namespace BetterLyrics.WinUI3.Helper
 {
@@ -9,13 +8,13 @@ namespace BetterLyrics.WinUI3.Helper
     {
         private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
-        public const string PinyinCode = "zh-pinyin";
-        public const string JyutpingCode = "zh-jyutping";
-        public const string RomajiCode = "ja-romaji";
+        public const string PinyinCode = "zh-cmn-pinyin";
+        public const string JyutpingCode = "zh-yue-jyutping";
+        public const string RomanCode = "ja-latin";
 
         public static bool IsPhoneticCode(string code)
         {
-            return code == PinyinCode || code == JyutpingCode || code == RomajiCode;
+            return code == PinyinCode || code == JyutpingCode || code == RomanCode;
         }
 
         public static string GetDisplayName(string code)
@@ -26,7 +25,7 @@ namespace BetterLyrics.WinUI3.Helper
                     return _resourceService.GetLocalizedString("Pinyin");
                 case JyutpingCode:
                     return _resourceService.GetLocalizedString("Jyutping");
-                case RomajiCode:
+                case RomanCode:
                     return _resourceService.GetLocalizedString("Romaji");
                 default:
                     throw new ArgumentOutOfRangeException(nameof(code));

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs

@@ -0,0 +1,87 @@
+using BetterLyrics.WinUI3.Constants;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class PlayerIDHelper
+    {
+        private static readonly List<string> neteaseFamilyRegex =
+        [
+            "cloudmusic.exe", //NetEaseCloudMusic
+            "^17588BrandonWong\\.LyricEase_", //LyricEase
+            "^48848aaaaaaccd\\.HyPlayer_" //HyPlayer
+        ];
+
+        public static bool IsNeteaseFamily(string? id)
+        {
+            if (id is null) return false;
+
+            foreach (var regex in neteaseFamilyRegex)
+            {
+                var isMatch = Regex.IsMatch(id, regex);
+                if (isMatch) return true;
+            }
+            return false;
+        }
+
+        public static bool IsLXMusic(string? id) => id is PlayerID.LXMusic or PlayerID.LXMusicPortable;
+
+        public static bool IsAppleMusic(string? id) => id is PlayerID.AppleMusic or PlayerID.AppleMusicAlternative;
+
+        public static string? GetDisplayName(string? id) => id 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.SaltPlayerForWindowsMS => PlayerName.SaltPlayerForWindowsMS,
+            PlayerID.SaltPlayerForWindowsSteam => PlayerName.SaltPlayerForWindowsSteam,
+            PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
+            PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
+            PlayerID.Listen1 => PlayerName.Listen1,
+            _ => id,
+        };
+
+        public static string GetLogoPath(string? id) => id 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.SaltPlayerForWindowsMS => PathHelper.SaltPlayerForWindowsLogoPath,
+            PlayerID.SaltPlayerForWindowsSteam => PathHelper.SaltPlayerForWindowsLogoPath,
+            PlayerID.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
+            PlayerID.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
+            PlayerID.Listen1 => PathHelper.Listen1LogoPath,
+            _ => PathHelper.UnknownPlayerLogoPath,
+        };
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIdMatcher.cs

@@ -1,32 +0,0 @@
-using BetterLyrics.WinUI3.Constants;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class PlayerIDMatcher
-    {
-        private static readonly List<string> neteaseFamilyRegex =
-        [
-            "cloudmusic.exe", //NetEaseCloudMusic
-            "^17588BrandonWong\\.LyricEase_", //LyricEase
-            "^48848aaaaaaccd\\.HyPlayer_" //HyPlayer
-        ];
-
-        public static bool IsNeteaseFamily(string? id)
-        {
-            if (id is null) return false;
-
-            foreach (var regex in neteaseFamilyRegex)
-            {
-                var isMatch = Regex.IsMatch(id, regex);
-                if (isMatch) return true;
-            }
-            return false;
-        }
-
-        public static bool IsLXMusic(string? id) => id is SpecialHandlePlayerID.LXMusic or SpecialHandlePlayerID.LXMusicPortable;
-
-        public static bool IsAppleMusic(string? id) => id is SpecialHandlePlayerID.AppleMusic or SpecialHandlePlayerID.AppleMusicAlternative;
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/STATaskHelper.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SpectrumAnalyzer.cs

@@ -6,6 +6,7 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public partial class SpectrumAnalyzer : IDisposable
     {
+        private readonly object _lock = new();
         private WasapiLoopbackCapture? _capture;
 
         private int _sampleRate = 48000;
@@ -28,7 +29,7 @@ namespace BetterLyrics.WinUI3.Helper
         private float[]? _currentSpectrum;
         public float[]? SmoothSpectrum { get; private set; }
 
-        public int BarCount { get; set; } = 16;
+        public int BarCount { get; set; } = 64;
         public int Sensitivity { get; set; } = 100;
         public float SmoothingFactor { get; set; } = 0.95f;
         public bool IsCapturing { get; private set; } = false;
@@ -121,12 +122,15 @@ namespace BetterLyrics.WinUI3.Helper
                 Array.Copy(_spectrumRightData, 0, _spectrumData, _spectrumLeftData.Length, _spectrumRightData.Length);
             }
 
-            for (int i = 0; i < BarCount; i++)
+            lock (_lock)
             {
-                int index = (int)((float)i / BarCount * _spectrumData.Length);
-                if (index < _spectrumData.Length)
+                for (int i = 0; i < BarCount; i++)
                 {
-                    _currentSpectrum[i] = _spectrumData[index] * 250f * Sensitivity;
+                    int index = (int)((float)i / BarCount * _spectrumData.Length);
+                    if (index < _spectrumData.Length)
+                    {
+                        _currentSpectrum[i] = _spectrumData[index] * 250f * Sensitivity;
+                    }
                 }
             }
 
@@ -139,10 +143,13 @@ namespace BetterLyrics.WinUI3.Helper
                 return;
             }
 
-            for (int i = 0; i < BarCount; i++)
+            lock (_lock)
             {
-                SmoothSpectrum[i] = SmoothSpectrum[i] * SmoothingFactor +
-                    _currentSpectrum[i] * (1 - SmoothingFactor);
+                for (int i = 0; i < BarCount; i++)
+                {
+                    SmoothSpectrum[i] = SmoothSpectrum[i] * SmoothingFactor +
+                        _currentSpectrum[i] * (1 - SmoothingFactor);
+                }
             }
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StringHelper.cs

@@ -11,5 +11,16 @@ namespace BetterLyrics.WinUI3.Helper
                 .ToArray())
                 .ToLowerInvariant();
         public static string NewLine = "\n";
+
+        public static bool IsSwitchableNormalizedMatch(string source, string q1, string q2)
+        {
+            var normFileName = Normalize(source);
+            var normQ1 = Normalize(q1);
+            var normQ2 = Normalize(q2);
+
+            // 常见两种顺序
+            return normFileName == normQ1 + normQ2
+                || normFileName == normQ2 + normQ1;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ToastHelper.cs

@@ -0,0 +1,23 @@
+using BetterLyrics.WinUI3.Services.ResourceService;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Windows.AppNotifications;
+using Microsoft.Windows.AppNotifications.Builder;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class ToastHelper
+    {
+        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+
+        public static void ShowToast(string localizedTitleKey, string? description, InfoBarSeverity severity)
+        {
+            AppNotification notification = new AppNotificationBuilder()
+                .AddText(_resourceService.GetLocalizedString(localizedTitleKey))
+                .AddText(description)
+                .BuildNotification();
+
+            AppNotificationManager.Default.Show(notification);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ValueTransition.cs

@@ -24,8 +24,10 @@ namespace BetterLyrics.WinUI3.Helper
 
         public bool IsTransitioning => _isTransitioning;
         public T Value => _currentValue;
+        public T StartValue => _startValue;
         public T TargetValue => _targetValue;
         public EasingType? EasingType => _easingType;
+        public double Progress => _progress;
 
         public ValueTransition(T initialValue, double durationSeconds, Func<T, T, double, T>? interpolator = null, EasingType? easingType = null, double delaySeconds = 0)
         {
@@ -57,7 +59,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         public void SetDuration(double seconds)
         {
-            if (seconds <= 0)
+            if (seconds < 0)
                 throw new ArgumentOutOfRangeException(nameof(seconds), "Duration must be positive.");
             _durationSeconds = seconds;
         }
@@ -145,7 +147,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        private Func<T, T, double, T> GetInterpolatorByEasingType(EasingType type)
+        private Func<T, T, double, T> GetInterpolatorByEasingType(EasingType? type)
         {
             if (typeof(T) == typeof(double))
             {
@@ -193,6 +195,7 @@ namespace BetterLyrics.WinUI3.Helper
                             t = EasingHelper.Linear(t);
                             break;
                         default:
+                            t = EasingHelper.EaseInOutQuad(t);
                             break;
                     }
                     return (T)(object)(s + (e - s) * t);
@@ -201,7 +204,7 @@ namespace BetterLyrics.WinUI3.Helper
             throw new NotSupportedException($"Easing type {type} is not supported for type {typeof(T)}.");
         }
 
-        public void SetEasingType(EasingType easingType)
+        public void SetEasingType(EasingType? easingType)
         {
             _easingType = easingType;
             _interpolator = GetInterpolatorByEasingType(easingType);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/AppHook.cs

@@ -1,14 +1,9 @@
-using DevWinUI;
-using Microsoft.UI.Xaml.Media.Imaging;
+using Microsoft.UI.Xaml.Media.Imaging;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
@@ -31,6 +26,7 @@ namespace BetterLyrics.WinUI3.Hooks
 
             if (hIconCopy.IsNull)
             {
+                User32.DestroyIcon(hIconCopy);
                 return null;
             }
             else
@@ -63,11 +59,12 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static ShellItem? GetShellItem(string aumid)
         {
-            try
+            string path = $"shell:AppsFolder\\{aumid}";
+            if (Path.Exists(path))
             {
-                return new ShellItem($"shell:AppsFolder\\{aumid}");
+                return new ShellItem(path);
             }
-            catch
+            else
             {
                 var shellFolder = new ShellFolder(KNOWNFOLDERID.FOLDERID_AppsFolder);
                 var found = shellFolder.FirstOrDefault(x => x.ParsingName?.EndsWith(aumid) == true);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/WindowHook.cs

@@ -14,7 +14,6 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using Vanara.PInvoke;
-using Vanara.Windows.Shell;
 using Windows.ApplicationModel.Core;
 using Windows.Foundation;
 using WinRT.Interop;
@@ -44,7 +43,7 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void CloseWindow<T>()
         {
-            if (typeof(T) == typeof(LyricsWindow))
+            if (typeof(T) == typeof(NowPlayingWindow))
             {
                 EnsureDockModeReleased();
             }
@@ -56,6 +55,15 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
+        public static void MinimizeWindow<T>()
+        {
+            var window = _activeWindows.Find(w => w is T);
+            if (window is Window w)
+            {
+                w.Minimize();
+            }
+        }
+
         public static T? GetWindow<T>()
         {
             foreach (var window in _activeWindows)
@@ -92,12 +100,13 @@ namespace BetterLyrics.WinUI3.Hooks
         public static void OpenOrShowWindow<T>()
         {
             var window = _activeWindows.Find(w => w is T);
+            //window = null;
             if (window == null)
             {
-                if (typeof(T) == typeof(LyricsWindow))
+                if (typeof(T) == typeof(NowPlayingWindow))
                 {
-                    window = new LyricsWindow();
-                    ((LyricsWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
+                    window = new NowPlayingWindow();
+                    ((NowPlayingWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
                 }
                 else if (typeof(T) == typeof(SettingsWindow))
                 {
@@ -115,16 +124,21 @@ namespace BetterLyrics.WinUI3.Hooks
                 {
                     window = new LyricsWindowSwitchWindow();
                 }
+                else if (typeof(T) == typeof(SystemTrayWindow))
+                {
+                    window = new SystemTrayWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));
                 }
+
                 TrackWindow(window);
                 var castedWindow = (Window)window;
                 castedWindow.Restore();
                 castedWindow.Activate();
 
-                if (typeof(T) == typeof(LyricsWindow))
+                if (typeof(T) == typeof(NowPlayingWindow))
                 {
                     _liveStatesService.InitLyricsWindowStatus();
 
@@ -132,7 +146,7 @@ namespace BetterLyrics.WinUI3.Hooks
                     _defaultWindowStyle.Add(hwnd, castedWindow.GetWindowStyle());
                     _defaultExtendedWindowStyle.Add(hwnd, castedWindow.GetExtendedWindowStyle());
 
-                    var lyricsWindow = (LyricsWindow)window;
+                    var lyricsWindow = (NowPlayingWindow)window;
                     lyricsWindow.ViewModel.InitShortcuts();
                     lyricsWindow.ViewModel.InitFgWindowWatcher();
 
@@ -186,7 +200,7 @@ namespace BetterLyrics.WinUI3.Hooks
 
         private static void EnsureDockModeReleased()
         {
-            SetIsWorkArea<LyricsWindow>(false);
+            SetIsWorkArea<NowPlayingWindow>(false);
         }
 
         private static void TrackWindow(object window)
@@ -292,9 +306,9 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
         {
-            if (typeof(T) == typeof(LyricsWindow))
+            if (typeof(T) == typeof(NowPlayingWindow))
             {
-                LyricsWindow? lyricsWindow = GetWindow<LyricsWindow>();
+                NowPlayingWindow? lyricsWindow = GetWindow<NowPlayingWindow>();
                 lyricsWindow?.SetTitleBarArea(titleBarArea);
             }
             else
@@ -395,7 +409,7 @@ namespace BetterLyrics.WinUI3.Hooks
 
             _setLyricsWindowVisibilityByPlayingStatusTimer.Debounce(() =>
             {
-                var window = GetWindow<LyricsWindow>();
+                var window = GetWindow<NowPlayingWindow>();
                 if (window == null) return;
 
                 if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && !_mediaSessionsService.CurrentIsPlaying)
@@ -403,23 +417,23 @@ namespace BetterLyrics.WinUI3.Hooks
                     if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
                         _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        SetIsWorkArea<LyricsWindow>(false);
+                        SetIsWorkArea<NowPlayingWindow>(false);
                         _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
                     }
-                    HideWindow<LyricsWindow>();
+                    HideWindow<NowPlayingWindow>();
                 }
                 else if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && _mediaSessionsService.CurrentIsPlaying)
                 {
                     if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
                         _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        SetIsWorkArea<LyricsWindow>(true);
+                        SetIsWorkArea<NowPlayingWindow>(true);
                         _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
                     }
-                    OpenOrShowWindow<LyricsWindow>();
+                    OpenOrShowWindow<NowPlayingWindow>();
                     if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
-                        MoveAndResize<LyricsWindow>(_liveStatesService.LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
+                        MoveAndResize<NowPlayingWindow>(_liveStatesService.LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
                     }
                 }
             }, Constants.Time.DebounceTimeout);