chores: i18n

Updated the acknowledgments section to reflect ongoing support and gratitude towards contributors and users.

.devin/wiki.json

@@ -0,0 +1,291 @@
+{
+  "repo_notes": [
+    {
+      "content": "Always use the latest files in the repo to generate the wiki"
+    }
+  ],
+  "pages": [
+    {
+      "title": "Overview",
+      "purpose": "Introduce BetterLyrics, its purpose as a WinUI3 lyrics display application, key features, and supported music players",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Getting Started",
+      "purpose": "Guide users through installation, initial setup, and basic usage of BetterLyrics",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Installation and Deployment",
+      "purpose": "Explain how to install BetterLyrics from Microsoft Store or build from source, system requirements, and supported Windows versions",
+      "parent": "Getting Started",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Initial Configuration",
+      "purpose": "Walk through first-time setup including media player configuration, folder selection, and basic settings",
+      "parent": "Getting Started",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Architecture",
+      "purpose": "Provide technical overview of BetterLyrics' internal architecture, design patterns, and component organization",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Application Entry Point and Dependency Injection",
+      "purpose": "Document the App.xaml.cs entry point, service registration, and dependency injection container configuration",
+      "parent": "Architecture",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Service Layer Architecture",
+      "purpose": "Explain the service-oriented architecture, service interfaces, and their implementations including MediaSessionsService, LyricsSearchService, and SettingsService",
+      "parent": "Architecture",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Data Models",
+      "purpose": "Document core data models including LyricsLine, LyricsData, SongInfo, and configuration models",
+      "parent": "Architecture",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Multi-Window System",
+      "purpose": "Explain how BetterLyrics manages multiple simultaneous lyrics windows, window lifecycle, and state management",
+      "parent": "Architecture",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "User Interface",
+      "purpose": "Document the UI components, windows, and user interaction patterns in BetterLyrics",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Now Playing Window",
+      "purpose": "Detail the main lyrics display window, its components, and integration with the rendering system",
+      "parent": "User Interface",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Display Modes and Window Configurations",
+      "purpose": "Explain different display modes (Standard, Desktop, Docked, Fullscreen, Narrow, Taskbar) and how to configure them",
+      "parent": "User Interface",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Settings and Customization",
+      "purpose": "Document the settings interface, configuration options, and how to customize lyrics appearance and behavior",
+      "parent": "User Interface",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Music Gallery",
+      "purpose": "Explain the local music library management feature, including playback, playlist management, and integration with media controls",
+      "parent": "User Interface",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "System Tray and Global Controls",
+      "purpose": "Document the system tray integration, global hotkeys, and application-wide controls",
+      "parent": "User Interface",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Lyrics System",
+      "purpose": "Comprehensive documentation of the lyrics acquisition, processing, and display pipeline",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Lyrics Search and Providers",
+      "purpose": "Document the lyrics search system, supported providers (QQ Music, Netease, Kugou, LrcLib, Apple Music, local files), and search strategies",
+      "parent": "Lyrics System",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Parsing and Translation",
+      "purpose": "Explain how lyrics are parsed from different formats (LRC, QRC, TTML), translation system using LibreTranslate, and metadata matching",
+      "parent": "Lyrics System",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Rendering Pipeline",
+      "purpose": "Document the Win2D-based rendering system, LyricsCanvas, PlayingLineRenderer, UnplayingLineRenderer, and LyricsLayoutManager",
+      "parent": "Lyrics System",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Visual Effects and Animation",
+      "purpose": "Explain character-level effects (glow, float, scale), background effects (fluid, snow, fog, spectrum), and the animation transition system",
+      "parent": "Lyrics System",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Media Integration",
+      "purpose": "Document how BetterLyrics integrates with music players and manages media sessions",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Windows Media Transport Controls Integration",
+      "purpose": "Explain how BetterLyrics uses Windows SMTC to work universally with media players",
+      "parent": "Media Integration",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Supported Players and Special Configurations",
+      "purpose": "List supported media players, document special configurations (Apple Music token, LX Music SSE), and player-specific handling",
+      "parent": "Media Integration",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Album Art and Theme Colors",
+      "purpose": "Document album art retrieval from multiple sources, color palette generation (MedianCut, OctTree), and adaptive theming",
+      "parent": "Media Integration",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Internationalization",
+      "purpose": "Explain the localization system, supported languages, and how resources are managed",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Development",
+      "purpose": "Technical documentation for developers contributing to or extending BetterLyrics",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Build Configuration and Deployment",
+      "purpose": "Document the build process, publish profiles for different architectures, CI/CD pipeline, and packaging for Microsoft Store",
+      "parent": "Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "Helper Utilities and Extensions",
+      "purpose": "Document utility classes including TaskbarHook, WindowHook, ColorHelper, ImageHelper, and various extension methods",
+      "parent": "Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    },
+    {
+      "title": "External Dependencies and Libraries",
+      "purpose": "List and explain third-party dependencies including Win2D, NAudio, ATL.NET, FlaUI, and their usage in the application",
+      "parent": "Development",
+      "page_notes": [
+        {
+          "content": ""
+        }
+      ]
+    }
+  ]
+}

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -50,6 +50,7 @@
             <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
             <converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
+            <converter:TransliterationSearchProviderToDisplayNameConverter x:Key="TransliterationSearchProviderToDisplayNameConverter" />
             <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converter:MillisecondsToFormattedTimeConverter x:Key="MillisecondsToFormattedTimeConverter" />
@@ -64,7 +65,6 @@
             <converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
             <converter:DisplayLanguageCodeToIndexConverter x:Key="DisplayLanguageCodeToIndexConverter" />
             <converter:PathToParentFolderConverter x:Key="PathToParentFolderConverter" />
-            <converter:TrackToLyricsConverter x:Key="TrackToLyricsConverter" />
             <converter:IntToBoolConverter x:Key="IntToBoolConverter" />
             <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
             <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
@@ -74,6 +74,7 @@
             <converter:TextAlignmentTypeToHorizontalAlignmentConverter x:Key="TextAlignmentTypeToHorizontalAlignmentConverter" />
             <converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
             <converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
+            <converter:FileSourceTypeToIconConverter x:Key="FileSourceTypeToIconConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
@@ -95,8 +96,7 @@
                 <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,9,16,11" />
-                <Setter Property="Margin" Value="0" />
+                <Setter Property="Padding" Value="14,6,14,9" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostButtonStyle" TargetType="Button">
@@ -110,10 +110,10 @@
                 x:Key="TitleBarToggleButtonStyle"
                 BasedOn="{StaticResource ToggleButtonRevealStyle}"
                 TargetType="ToggleButton">
+                <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="CornerRadius" Value="4" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,9,16,11" />
+                <Setter Property="Padding" Value="14,6,14,9" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">

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

@@ -6,12 +6,12 @@ using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.Services.TranslateService;
+using BetterLyrics.WinUI3.Services.TranslationService;
+using BetterLyrics.WinUI3.Services.TransliterationService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
@@ -21,11 +21,11 @@ using Microsoft.UI.Xaml;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
 using System;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
-using WinUIEx;
 
 namespace BetterLyrics.WinUI3
 {
@@ -69,12 +69,26 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            // 设置托盘
-            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
-            WindowHook.HideWindow<SystemTrayWindow>();
+            var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
 
-            WindowHook.OpenOrShowWindow<NowPlayingWindow>();
-            if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
+            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
+
+            if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)
+            {
+                var defaultStatus = settingsService.AppSettings.WindowBoundsRecords.Where(x => x.IsDefault);
+                if (defaultStatus != null)
+                {
+                    foreach (var item in defaultStatus)
+                    {
+                        WindowHook.OpenOrShowWindow<NowPlayingWindow>(item);
+                        if (!settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            if (settingsService.AppSettings.MusicGallerySettings.AutoOpen)
             {
                 WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
             }
@@ -96,13 +110,13 @@ namespace BetterLyrics.WinUI3
                         loggingBuilder.AddSerilog();
                     })
                     // Services
-                    .AddSingleton<ILiveStatesService, LiveStatesService>()
                     .AddSingleton<ISettingsService, SettingsService>()
                     .AddSingleton<IMediaSessionsService, MediaSessionsService>()
                     .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
                     .AddSingleton<ILyricsSearchService, LyricsSearchService>()
                     .AddSingleton<ILibWatcherService, LibWatcherService>()
-                    .AddSingleton<ITranslateService, TranslateService>()
+                    .AddSingleton<ITranslationService, TranslationService>()
+                    .AddSingleton<ITransliterationService, TransliterationService>()
                     .AddSingleton<ILastFMService, LastFMService>()
                     .AddSingleton<IResourceService, ResourceService>()
                     .AddSingleton<IDiscordService, DiscordService>()
@@ -114,15 +128,17 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<LyricsWindowSettingsControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchControlViewModel>()
                     .AddSingleton<LyricsWindowSwitchWindowViewModel>()
-                    
-                    .AddSingleton<NowPlayingWindowViewModel>()
-                    .AddSingleton<NowPlayingPageViewModel>()
-
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
                     .AddSingleton<SettingsPageViewModel>()
-                    .AddSingleton<MusicGalleryViewModel>()
+                    .AddSingleton<MusicGalleryPageViewModel>()
                     .AddSingleton<AboutControlViewModel>()
+                    .AddSingleton<MusicGalleryWindowViewModel>()
+
+                    .AddTransient<NowPlayingWindowViewModel>()
+                    .AddTransient<NowPlayingPageViewModel>()
+                    .AddTransient<NowPlayingBarViewModel>()
+
                     .BuildServiceProvider()
             );
         }

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

@@ -34,8 +34,10 @@
 		<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
 		<None Remove="Controls\MediaSettingsControl.xaml" />
+		<None Remove="Controls\NowPlayingBar.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\PropertyRow.xaml" />
+		<None Remove="Controls\RemoteServerConfigControl.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
 		<None Remove="Controls\WindowSettingsControl.xaml" />
@@ -57,36 +59,37 @@
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.251219" />
 		<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.7.0" />
-		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.8.1" />
+		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.6" />
 		<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
+		<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
+		<PackageReference Include="FluentFTP" Version="53.0.2" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
+		<PackageReference Include="Interop.UIAutomationClient" Version="10.19041.0" />
 		<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.Extensions.DependencyInjection" Version="10.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.1" />
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
 		<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="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" />
+		<PackageReference Include="SMBLibrary" Version="1.5.5.1" />
+		<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
 		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
@@ -95,6 +98,7 @@
 		<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="WebDav.Client" Version="2.9.0" />
 		<PackageReference Include="WinUIEx" Version="2.9.0" />
 		<PackageReference Include="z440.atl.core" Version="7.9.0" />
 	</ItemGroup>
@@ -114,6 +118,8 @@
 	</ItemGroup>
 	<!--Disable Trimming for Specific Packages-->
 	<ItemGroup>
+		<TrimmerRootAssembly Include="FlaUI.UIA3" />
+		<TrimmerRootAssembly Include="Interop.UIAutomationClient" />
 		<TrimmerRootAssembly Include="NAudio.Wasapi" />
 		<TrimmerRootAssembly Include="TagLibSharp" />
 		<TrimmerRootAssembly Include="Vanara.PInvoke.DwmApi" />
@@ -337,6 +343,16 @@
 	<ItemGroup>
 	  <Folder Include="TemplateSelector\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\RemoteServerConfigControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\NowPlayingBar.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Views\SystemTrayWindow.xaml">
 	    <Generator>MSBuild:Compile</Generator>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/App.cs

@@ -3,6 +3,8 @@
     public static class App
     {
         public const string AppAuthor = "Zhe Fang";
+        public const string AppAuthorNicknameEN = "jayfunc";
+        public const string AppAuthorNicknameZH = "摘叶飞镖";
         public const string AppName = "BetterLyrics";
 
         public const string AutoStartupTaskId = "AutoStartup";

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

@@ -4,15 +4,23 @@
     {
         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 AuthorGitHub = "https://github.com/jayfunc";
+
+        public const string BetterLyricsGitHub = $"{AuthorGitHub}/BetterLyrics";
+
+        public const string ShareHub = $"{BetterLyricsGitHub}/blob/dev/ShareHub/index.md";
+        public const string TermsOfService = $"{BetterLyricsGitHub}/blob/dev/TermsofService.md";
+        public const string PrivacyPolicy = $"{BetterLyricsGitHub}/blob/dev/PrivacyPolicy.md";
+        public const string UserGuide = $"{BetterLyricsGitHub}/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";
+
+        public const string BuyMeACoffee = "https://buymeacoffee.com/founchoo";
+        public const string PayPal = "https://paypal.me/zhefangpay";
+        public const string Afdian = "https://afdian.com/a/jayfunc";
     }
 }

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

@@ -28,30 +28,37 @@
                             </StackPanel>
                         </dev:SettingsExpander.Header>
                         <dev:SettingsExpander.Description>
-                            <StackPanel
-                                Margin="0,2,0,0"
-                                Orientation="Horizontal"
-                                Spacing="2">
-                                <TextBlock Text="©" />
-                                <HyperlinkButton
-                                    Margin="0,-1,0,0"
-                                    Content="Zhe Fang"
-                                    NavigateUri="https://github.com/jayfunc" />
-                                <TextBlock Text="2025" />
+                            <StackPanel Orientation="Horizontal">
+                                <StackPanel
+                                    Margin="0,2,0,0"
+                                    Orientation="Horizontal"
+                                    Spacing="2">
+                                    <TextBlock Text="©" />
+                                    <HyperlinkButton
+                                        Margin="0,-1,0,0"
+                                        Content="{x:Bind const:App.AppAuthor}"
+                                        NavigateUri="https://github.com/jayfunc" />
+                                    <TextBlock Text="2025" />
+                                </StackPanel>
                             </StackPanel>
                         </dev:SettingsExpander.Description>
-                        <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
-                            <Paragraph>
-                                <Run x:Uid="SettingsPageVersion" />
-                                <Run Text="{x:Bind helper:MetadataHelper.AppVersion}" />
-                            </Paragraph>
-                        </RichTextBlock>
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <RichTextBlock
+                                Margin="0,-1,0,0"
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                                <Paragraph>
+                                    <Run x:Uid="SettingsPageVersion" />
+                                    <Run Text="{x:Bind helper:MetadataHelper.AppVersion}" />
+                                </Paragraph>
+                            </RichTextBlock>
+                        </StackPanel>
                         <dev:SettingsExpander.Items>
 
                             <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.GitHub}" />
+                                        <HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.BetterLyricsGitHub}" />
                                         <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.TermsOfService}" />
@@ -75,14 +82,14 @@
                                 <StackPanel Spacing="6">
                                     <TextBlock x:Uid="SetingsPageDonation" />
                                     <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton Content="Buy Me a Coffee" NavigateUri="https://buymeacoffee.com/founchoo" />
-                                        <HyperlinkButton Content="PayPal" NavigateUri="https://paypal.me/zhefangpay" />
-                                        <Button
-                                            Content="支付宝"
-                                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                                            Style="{StaticResource GhostButtonStyle}">
-                                            <Button.Flyout>
-                                                <Flyout>
+                                        <HyperlinkButton Content="Buy Me a Coffee" NavigateUri="{x:Bind const:Link.BuyMeACoffee}" />
+                                        <HyperlinkButton Content="PayPal" NavigateUri="{x:Bind const:Link.PayPal}" />
+                                        <HyperlinkButton
+                                            x:Name="AlipayButton"
+                                            Click="AlipayButton_Click"
+                                            Content="支付宝">
+                                            <HyperlinkButton.ContextFlyout>
+                                                <Flyout x:Name="AlipayFlyout">
                                                     <Flyout.FlyoutPresenterStyle>
                                                         <Style TargetType="FlyoutPresenter">
                                                             <Setter Property="CornerRadius" Value="12" />
@@ -91,14 +98,14 @@
                                                     </Flyout.FlyoutPresenterStyle>
                                                     <Image Height="300" Source="/Assets/Alipay.jpg" />
                                                 </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                        <Button
-                                            Content="微信"
-                                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                                            Style="{StaticResource GhostButtonStyle}">
-                                            <Button.Flyout>
-                                                <Flyout>
+                                            </HyperlinkButton.ContextFlyout>
+                                        </HyperlinkButton>
+                                        <HyperlinkButton
+                                            x:Name="WeChatButton"
+                                            Click="WeChat_Click"
+                                            Content="微信">
+                                            <HyperlinkButton.ContextFlyout>
+                                                <Flyout x:Name="WeChatFlyout">
                                                     <Flyout.FlyoutPresenterStyle>
                                                         <Style TargetType="FlyoutPresenter">
                                                             <Setter Property="CornerRadius" Value="12" />
@@ -107,8 +114,9 @@
                                                     </Flyout.FlyoutPresenterStyle>
                                                     <Image Height="300" Source="/Assets/WeChatReward.png" />
                                                 </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
+                                            </HyperlinkButton.ContextFlyout>
+                                        </HyperlinkButton>
+                                        <HyperlinkButton Content="爱发电" NavigateUri="{x:Bind const:Link.Afdian}" />
                                     </StackPanel>
                                     <StackPanel Orientation="Horizontal" Spacing="6">
                                         <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="*" />
@@ -120,16 +128,13 @@
                                 </StackPanel>
                             </dev:SettingsCard>
 
-                            <dev:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
-                                <StackPanel Spacing="6">
-                                    <TextBlock x:Uid="SetingsPageContributors" />
-                                    <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton Content="jayfunc" NavigateUri="https://github.com/jayfunc" />
-                                        <HyperlinkButton Content="Raspberry-Monster" NavigateUri="https://github.com/Raspberry-Monster" />
-                                        <HyperlinkButton Content="ZHider" NavigateUri="https://github.com/ZHider" />
-                                        <HyperlinkButton Content="kusutori" NavigateUri="https://github.com/kusutori" />
-                                    </StackPanel>
-                                </StackPanel>
+                            <dev:SettingsCard x:Uid="SettingsPageThanksList">
+                                <Button
+                                    Click="Patron_Click"
+                                    Content="{ui:FontIcon FontSize=16,
+                                                          FontFamily={StaticResource IconFontFamily},
+                                                          Glyph=&#xE7FD;}"
+                                    Style="{StaticResource AccentButtonStyle}" />
                             </dev:SettingsCard>
 
                         </dev:SettingsExpander.Items>
@@ -177,10 +182,6 @@
                         </dev:SettingsExpander.ItemsHeader>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsCard x:Uid="SettingsPageDebugOverlay">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsDebugOverlayEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
                     <dev:SettingsCard x:Uid="SettingsPageFixedTimeStep" Visibility="Collapsed">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.AdvancedSettings.IsFixedTimeStep, Mode=TwoWay}" />
                     </dev:SettingsCard>
@@ -198,5 +199,190 @@
             </Grid>
         </ScrollViewer>
 
+        <Grid
+            x:Name="CreditsReel"
+            Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+            Opacity="0"
+            SizeChanged="CreditsReel_SizeChanged"
+            Tapped="CreditsReel_Tapped"
+            Visibility="Collapsed">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <ScrollViewer
+                x:Name="CreditsReelScrollViewer"
+                ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                ScrollViewer.VerticalScrollMode="Disabled">
+                <RichTextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    HorizontalTextAlignment="Center"
+                    LineHeight="28"
+                    PointerEntered="RichTextBlock_PointerEntered"
+                    PointerExited="RichTextBlock_PointerExited">
+
+                    <Paragraph x:Name="CreditsReelHeader" />
+
+                    <!--  贡献者  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SetingsPageContributors" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/jayfunc">
+                            <Run Text="jayfunc" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/Raspberry-Monster">
+                            <Run Text="Raspberry-Monster" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/ZHider">
+                            <Run Text="ZHider" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/kusutori">
+                            <Run Text="kusutori" />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <!--  赞助  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SettingsPagePatrons" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="YE" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Dec 3, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="**玄" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 23, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="**智" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 21, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="*鹤" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 17, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="借过" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Nov 2, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="**华" />
+                        <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="Aug 28, 2025" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run x:Uid="SettingsPageUserWhoPurchased" />
+                    </Paragraph>
+
+                    <!--  特别鸣谢  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SetingsPageSpecialThanks" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run x:Uid="SettingsPageYouNowUsing" />
+                    </Paragraph>
+
+                    <!--  代码参考  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SetingsPageDeps" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://gist.github.com/mcworkaholic/82fbf203e3f1043bbe534b5b2974c0ce">
+                            <Run Text="Get album artwork from ITunes (with Python3 or C#)" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://stackoverflow.com/a/32013610/11048731">
+                            <Run Text="FullyObservableCollection" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/Storyteller-Studios/Impressionist">
+                            <Run Text="Impressionist" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/Storyteller-Studios/ColorThief.WinUI3">
+                            <Run Text="ColorThief.WinUI3" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/Johnwikix/SpectrumVisualization">
+                            <Run Text="SpectrumVisualization" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.shadertoy.com/view/Mdt3Df">
+                            <Run Text="Snow (as shown in sweden)" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://www.shadertoy.com/view/lllSR2">
+                            <Run Text="w10" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/mo-jinran/Taskbar-Lyrics">
+                            <Run Text="Taskbar-Lyrics" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/jayfunc/BetterLyrics/network/dependencies">
+                            <Run Text="..." />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <!--  UI/UX 设计参考  -->
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run x:Uid="SetingsPageUIUXRef" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/solstice23/refined-now-playing-netease">
+                            <Run Text="refined-now-playing-netease" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/WXRIW/Lyricify-App">
+                            <Run Text="Lyricify" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://moriafly.com/program/salt-player">
+                            <Run Text="椒盐音乐 Salt Player" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="https://github.com/TwilightLemon/MyToolBar">
+                            <Run Text="MyToolBar" />
+                        </Hyperlink>
+                    </Paragraph>
+                    <Paragraph>
+                        <Hyperlink NavigateUri="">
+                            <Run Text="" />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <Paragraph Margin="0,20,0,0" FontWeight="Bold">
+                        <Run Text="{x:Bind const:App.AppName}" />
+                    </Paragraph>
+                    <Paragraph>
+                        <Run Text="Proudly built by" />
+                        <Hyperlink NavigateUri="{x:Bind const:Link.AuthorGitHub}">
+                            <Run Text="{x:Bind const:App.AppAuthor}" />
+                        </Hyperlink>
+                    </Paragraph>
+
+                    <Paragraph x:Name="CreditsReelFooter" />
+
+                </RichTextBlock>
+            </ScrollViewer>
+        </Grid>
+
     </Grid>
 </UserControl>

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

@@ -1,6 +1,8 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -9,6 +11,7 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class AboutControl : UserControl
     {
+        private bool _isCreditsScrolling = false;
         public AboutControlViewModel ViewModel => (AboutControlViewModel)DataContext;
 
         public AboutControl()
@@ -16,5 +19,56 @@ namespace BetterLyrics.WinUI3.Controls
             InitializeComponent();
             DataContext = Ioc.Default.GetRequiredService<AboutControlViewModel>();
         }
+
+        private async void Patron_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            CompositionTarget.Rendering += CompositionTarget_Rendering;
+            CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+            CreditsReel.Opacity = 1;
+            _isCreditsScrolling = true;
+        }
+
+        private void CompositionTarget_Rendering(object? sender, object e)
+        {
+            if (_isCreditsScrolling)
+            {
+                CreditsReelScrollViewer.ChangeView(null, CreditsReelScrollViewer.VerticalOffset + 0.5, null);
+            }
+        }
+
+        private async void CreditsReel_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+        {
+            CreditsReel.Opacity = 0;
+            await Task.Delay(Constants.Time.AnimationDuration);
+            CreditsReel.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+            CompositionTarget.Rendering -= CompositionTarget_Rendering;
+            CreditsReelScrollViewer.ChangeView(null, 0, null);
+        }
+
+        private void CreditsReel_SizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
+        {
+            CreditsReelHeader.LineHeight = e.NewSize.Height;
+            CreditsReelFooter.LineHeight = e.NewSize.Height / 2;
+        }
+
+        private void RichTextBlock_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            _isCreditsScrolling = false;
+        }
+
+        private void RichTextBlock_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            _isCreditsScrolling = true;
+        }
+
+        private void WeChat_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            WeChatFlyout.ShowAt(WeChatButton);
+        }
+
+        private void AlipayButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            AlipayFlyout.ShowAt(AlipayButton);
+        }
     }
 }

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

@@ -1,18 +1,6 @@
 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.

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

@@ -40,10 +40,9 @@
                                 <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Mode=TwoWay}" />
                             </dev:SettingsCard>
                             <dev:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.IsAutoCoverImageHeight, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Maximum="512"
+                                <NumberBox
                                     Minimum="0"
-                                    Unit="px"
+                                    SpinButtonPlacementMode="Inline"
                                     Value="{x:Bind AlbumArtLayoutSettings.CoverImageHeight, Mode=TwoWay}" />
                             </dev:SettingsCard>
                         </dev:SettingsExpander.Items>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml

@@ -44,9 +44,9 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <!--  App behavior  -->
+                    <!--  Startup  -->
 
-                    <TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <TextBlock x:Uid="SettingsPageStartup" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <dev:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF71C;}">
                         <ToggleSwitch
@@ -59,42 +59,46 @@
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoOpen, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <dev:SettingsCard x:Uid="SettingsPageAutoOpenLyricsWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE90B;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.AutoStartLyricsWindow, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <!--  Music gallery window  -->
+
+                    <TextBlock x:Uid="SettingsPageMusicGallery" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
                     <dev:SettingsCard x:Uid="SettingsPageAutoPlayWhenOpenMusicGalleryWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE768;}">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.AutoPlay, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <dev:SettingsCard x:Uid="SettingsPageStopTrackOnGalleryWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE71A;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.StopOnWindowClosed, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <dev:SettingsCard x:Uid="SettingsPageExitOnGalleryWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE711;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.MusicGallerySettings.ExitOnWindowClosed, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <!--  Lyrics window  -->
+
+                    <TextBlock x:Uid="SettingsPageLyricsWindow" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
                     <dev:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE711;}">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <dev:SettingsCard x:Uid="SettingsPageListenNewSession" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF270;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                    <!--  Playback shortcut  -->
 
-                    <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>
+                    <TextBlock x:Uid="SettingsPageShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <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>
 
-                    <dev:SettingsCard x:Uid="SettingsPageBorderlessHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.BorderlessShortcut, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
-                    <dev:SettingsCard x:Uid="SettingsPageClickThroughHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ClickThroughShortcut, Mode=TwoWay}" />
-                    </dev:SettingsCard>
-
                     <dev:SettingsCard x:Uid="SettingsPageLyricsWindowSwitchHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
                         <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <!--  Playback shortcut  -->
-
-                    <TextBlock x:Uid="SettingsPagePlaybackShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
                     <dev:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
                         <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
                     </dev:SettingsCard>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml

@@ -7,6 +7,7 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Grid
@@ -91,6 +92,47 @@
                 Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}"
                 TextWrapping="Wrap" />
         </Grid>
+
+        <Grid Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" Opacity="0">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <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.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Button
+                Grid.Column="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Click="OpenButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      Glyph=&#xE78B;}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="SystemTrayLyrics" />
+                </ToolTipService.ToolTip>
+            </Button>
+            <Button
+                Grid.Column="1"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Click="CloseButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      Glyph=&#xE711;}"
+                IsEnabled="{x:Bind LyricsWindowStatus.IsOpened, Mode=OneWay}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="SettingsPageCloseStatus" />
+                </ToolTipService.ToolTip>
+            </Button>
+        </Grid>
     </Grid>
 
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs

@@ -1,6 +1,12 @@
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using System.Linq;
+using static Vanara.PInvoke.User32.RAWINPUT;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -9,6 +15,8 @@ namespace BetterLyrics.WinUI3.Controls;
 
 public sealed partial class DemoWindowGrid : UserControl
 {
+    private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
     public DemoWindowGrid()
     {
         InitializeComponent();
@@ -22,4 +30,32 @@ public sealed partial class DemoWindowGrid : UserControl
         get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
         set => SetValue(LyricsWindowStatusProperty, value);
     }
+
+    private void CloseButton_Click(object sender, RoutedEventArgs e)
+    {
+        var data = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
+        var window = WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == data);
+        window?.CloseWindow();
+    }
+
+    private void OpenButton_Click(object sender, RoutedEventArgs e)
+    {
+        var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
+        // <20>࿪ģʽ
+        if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
+        {
+            WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+        }
+        // <20><><EFBFBD><EFBFBD>ģʽ
+        else
+        {
+            var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
+            foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
+            {
+                item.CloseWindow();
+            }
+            WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+        }
+    }
+
 }

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

@@ -4,12 +4,8 @@ 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.
@@ -52,7 +48,7 @@ namespace BetterLyrics.WinUI3.Controls
             //        FontFamilies = fontFamilies;
             //    });
             //});
-            FontFamilies = FontHelper.SystemFontFamilies.OrderBy(x => x).ToList();
+            FontFamilies = FontHelper.GetSystemFontFamilies();
         }
 
         private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)

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

@@ -1,19 +1,7 @@
 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.

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

@@ -47,6 +47,51 @@
                         </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="200"
+                                    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},

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

@@ -8,45 +8,48 @@ 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 Lyricify.Lyrics.Providers.Web.Netease;
+using Microsoft.Graphics.Canvas;
 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.IO;
 using System.Linq;
-using System.Numerics;
+using System.Threading.Tasks;
 using Windows.Foundation;
+using Windows.Storage.Streams;
 using Windows.UI;
+using static Vanara.PInvoke.Ole32;
 
 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<SongInfo?>>,
+        IRecipient<PropertyChangedMessage<int>>,
         IRecipient<PropertyChangedMessage<double>>,
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<TextAlignmentType>>,
-        IRecipient<PropertyChangedMessage<SongInfo?>>,
         IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
-        IRecipient<PropertyChangedMessage<string>>
+        IRecipient<PropertyChangedMessage<string>>,
+        IRecipient<PropertyChangedMessage<IRandomAccessStream?>>
     {
         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 CoverBackgroundRenderer _coverRenderer = new();
         private readonly PureColorBackgroundRenderer _pureColorRenderer = new();
         private readonly SnowRenderer _snowRenderer = new();
         private readonly FogRenderer _fogRenderer = new();
@@ -108,6 +111,9 @@ namespace BetterLyrics.WinUI3.Controls
         private double _renderLyricsHeight = 0;
         private double _renderLyricsOpacity = 0;
 
+        private LyricsWindowStatus? _lyricsWindowStatus = null;
+        private AlbumArtThemeColors _albumArtThemeColors = new();
+
         private Point _mousePosition = new(0, 0);
         private int _mouseHoverLineIndex = -1;
         private bool _isMouseInLyricsArea = false;
@@ -128,6 +134,24 @@ namespace BetterLyrics.WinUI3.Controls
         public double ActualLyricsHeight => LyricsLayoutManager.CalculateActualHeight(_renderLyricsLines);
         public int CurrentHoveringLineIndex => _mouseHoverLineIndex;
 
+        public LyricsWindowStatus? LyricsWindowStatus
+        {
+            get { return (LyricsWindowStatus?)GetValue(LyricsWindowStatusProperty); }
+            set { SetValue(LyricsWindowStatusProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsWindowStatusProperty =
+            DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(LyricsCanvas), new PropertyMetadata(null, OnDependencyPropertyChanged));
+
+        public AlbumArtThemeColors AlbumArtThemeColors
+        {
+            get { return (AlbumArtThemeColors)GetValue(AlbumArtThemeColorsProperty); }
+            set { SetValue(AlbumArtThemeColorsProperty, value); }
+        }
+
+        public static readonly DependencyProperty AlbumArtThemeColorsProperty =
+            DependencyProperty.Register(nameof(AlbumArtThemeColors), typeof(AlbumArtThemeColors), typeof(LyricsCanvas), new PropertyMetadata(new AlbumArtThemeColors(), OnDependencyPropertyChanged));
+
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC> X <20><><EFBFBD><EFBFBD>
         public double LyricsStartX
         {
@@ -136,7 +160,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsStartXProperty =
-            DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsStartX), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ Y <20><><EFBFBD><EFBFBD>
         public double LyricsStartY
@@ -146,7 +170,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsStartYProperty =
-            DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsStartY), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
         public double LyricsWidth
@@ -156,7 +180,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsWidthProperty =
-            DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsWidth), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߶<EFBFBD>
         public double LyricsHeight
@@ -166,7 +190,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsHeightProperty =
-            DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsHeight), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͸<EFBFBD><CDB8><EFBFBD><EFBFBD>
         public double LyricsOpacity
@@ -176,7 +200,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty LyricsOpacityProperty =
-            DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(LyricsOpacity), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         /// <summary>
         /// <20>û<EFBFBD><C3BB>ٿ<EFBFBD><D9BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD>ľ<EFBFBD><C4BE>루<EFBFBD><EBA3A8> 0 <20><>ʼ<EFBFBD>㣩
@@ -188,7 +212,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty MouseScrollOffsetProperty =
-            DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(MouseScrollOffset), typeof(double), typeof(LyricsCanvas), new PropertyMetadata(0.0, OnDependencyPropertyChanged));
 
         /// <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>
@@ -200,7 +224,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty MousePositionProperty =
-            DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(MousePosition), typeof(Point), typeof(LyricsCanvas), new PropertyMetadata(new Point(0, 0), OnDependencyPropertyChanged));
 
         public bool IsMouseInLyricsArea
         {
@@ -209,7 +233,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty IsMouseInLyricsAreaProperty =
-            DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(IsMouseInLyricsArea), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
 
         public bool IsMousePressing
         {
@@ -218,7 +242,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty IsMousePressingProperty =
-            DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(IsMousePressing), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
 
         public bool IsMouseScrolling
         {
@@ -227,30 +251,27 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty IsMouseScrollingProperty =
-            DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnLayoutPropChanged));
+            DependencyProperty.Register(nameof(IsMouseScrolling), typeof(bool), typeof(LyricsCanvas), new PropertyMetadata(false, OnDependencyPropertyChanged));
 
         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);
+            WeakReferenceMessenger.Default.RegisterAll(this);
+
+            UpdateRenderLyricsLines();
         }
 
-        private static void OnLayoutPropChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is LyricsCanvas canvas)
             {
-                if (e.Property == LyricsStartXProperty)
+                if (e.Property == LyricsWindowStatusProperty)
+                {
+                    canvas._lyricsWindowStatus = (LyricsWindowStatus)e.NewValue;
+                    canvas._isLayoutChanged = true;
+                }
+                else if (e.Property == LyricsStartXProperty)
                 {
                     canvas._renderLyricsStartX = Convert.ToDouble(e.NewValue);
                     canvas._isLayoutChanged = true;
@@ -300,6 +321,18 @@ namespace BetterLyrics.WinUI3.Controls
                     }
                     canvas._isMouseScrolling = value;
                 }
+                else if (e.Property == AlbumArtThemeColorsProperty)
+                {
+                    var albumArtThemeColors = (AlbumArtThemeColors)e.NewValue;
+                    canvas._immersiveBgColorTransition.StartTransition(albumArtThemeColors.EnvColor);
+                    canvas._accentColor1Transition.StartTransition(albumArtThemeColors.AccentColor1);
+                    canvas._accentColor2Transition.StartTransition(albumArtThemeColors.AccentColor2);
+                    canvas._accentColor3Transition.StartTransition(albumArtThemeColors.AccentColor3);
+                    canvas._accentColor4Transition.StartTransition(albumArtThemeColors.AccentColor4);
+
+                    canvas._albumArtThemeColors = albumArtThemeColors;
+                    canvas._isLayoutChanged = true;
+                }
             }
         }
 
@@ -307,23 +340,22 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void Canvas_Draw(ICanvasAnimatedControl sender, CanvasAnimatedDrawEventArgs args)
         {
+            if (_lyricsWindowStatus == null) return;
+
             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;
+            var albumArtLayout = _lyricsWindowStatus.AlbumArtLayoutSettings;
+            var lyricsBg = _lyricsWindowStatus.LyricsBackgroundSettings;
+            var lyricsStyle = _lyricsWindowStatus.LyricsStyleSettings;
+            var lyricsEffect = _lyricsWindowStatus.LyricsEffectSettings;
 
             double songDuration = _mediaSessionsService.CurrentSongInfo?.DurationMs ?? 0;
             bool isForceWordByWord = _settingsService.AppSettings.GeneralSettings.IsForceWordByWordEffect;
 
-            var lyricsThemeColors = _mediaSessionsService.AlbumArtThemeColors;
-
             Color overlayColor;
             double finalOpacity;
 
-            if (status.IsAdaptToEnvironment)
+            if (_lyricsWindowStatus.IsAdaptToEnvironment)
             {
                 // <20><><EFBFBD><EFBFBD>Ӧɫ
                 overlayColor = _immersiveBgColorTransition.Value;
@@ -344,8 +376,8 @@ namespace BetterLyrics.WinUI3.Controls
                 lyricsBg.IsPureColorOverlayEnabled
             );
 
-            _fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity;
-            _fluidRenderer.IsEnabled = lyricsBg.IsFluidOverlayEnabled;
+            _coverRenderer.Draw(sender, args.DrawingSession);
+
             _fluidRenderer.Draw(sender, args.DrawingSession);
 
             _snowRenderer.Draw(sender, args.DrawingSession);
@@ -368,10 +400,10 @@ namespace BetterLyrics.WinUI3.Controls
                 userScrollOffset: _mouseYScrollTransition.Value,
                 lyricsOpacity: _renderLyricsOpacity,
                 playingLineTopOffsetFactor: lyricsStyle.PlayingLineTopOffset / 100.0,
-                windowStatus: status,
-                strokeColor: lyricsThemeColors.StrokeFontColor,
-                bgColor: lyricsThemeColors.BgFontColor,
-                fgColor: lyricsThemeColors.FgFontColor,
+                windowStatus: _lyricsWindowStatus,
+                strokeColor: _albumArtThemeColors.StrokeFontColor,
+                bgColor: _albumArtThemeColors.BgFontColor,
+                fgColor: _albumArtThemeColors.FgFontColor,
                 getPlaybackState: (lineIndex) =>
                 {
                     if (_renderLyricsLines == null) return new LinePlaybackState();
@@ -403,33 +435,34 @@ namespace BetterLyrics.WinUI3.Controls
                     style: lyricsBg.SpectrumStyle,
                     canvasWidth: sender.Size.Width,
                     canvasHeight: sender.Size.Height,
-                    fillColor: lyricsThemeColors.BgFontColor
+                    fillColor: _albumArtThemeColors.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);
+            //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;
+            if (_lyricsWindowStatus == null) return;
+
+            var lyricsBg = _lyricsWindowStatus.LyricsBackgroundSettings;
+            var lyricsStyle = _lyricsWindowStatus.LyricsStyleSettings;
+            var lyricsEffect = _lyricsWindowStatus.LyricsEffectSettings;
             var lyricsData = _mediaSessionsService.CurrentLyricsData;
 
             TimeSpan elapsedTime = args.Timing.ElapsedTime;
@@ -500,10 +533,11 @@ namespace BetterLyrics.WinUI3.Controls
                 sender.Size.Height,
                 _canvasTargetScrollOffset,
                 lyricsStyle.PlayingLineTopOffset / 100.0,
-                _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings,
+                _lyricsWindowStatus.LyricsStyleSettings,
+                _lyricsWindowStatus.LyricsEffectSettings,
                 _canvasYScrollTransition,
-                albumArtThemeColors.BgFontColor,
-                albumArtThemeColors.FgFontColor,
+                _albumArtThemeColors.BgFontColor,
+                _albumArtThemeColors.FgFontColor,
                 elapsedTime,
                 _isMouseScrolling,
                 _isLayoutChanged,
@@ -514,25 +548,31 @@ namespace BetterLyrics.WinUI3.Controls
             _isMouseScrollingChanged = false;
 
             _lyricsRenderer.CalculateLyrics3DMatrix(
+                lyricsStyle: lyricsStyle,
                 lyricsEffect: lyricsEffect,
                 lyricsX: _renderLyricsStartX,
                 lyricsY: _renderLyricsStartY,
                 lyricsWidth: _renderLyricsWidth,
-                canvasHeight: sender.Size.Height
+                lyricsHeight: _renderLyricsHeight
             );
 
             _isLayoutChanged = false;
 
-            if (_fluidRenderer.IsEnabled)
-            {
-                _fluidRenderer.UpdateColors(
-                    _accentColor1Transition.Value,
-                    _accentColor2Transition.Value,
-                    _accentColor3Transition.Value,
-                    _accentColor4Transition.Value
-                );
-                _fluidRenderer.Update(elapsedTime);
-            }
+            _fluidRenderer.IsEnabled = lyricsBg.IsFluidOverlayEnabled;
+            _fluidRenderer.Opacity = lyricsBg.FluidOverlayOpacity / 100.0;
+            _fluidRenderer.UpdateColors(
+                _accentColor1Transition.Value,
+                _accentColor2Transition.Value,
+                _accentColor3Transition.Value,
+                _accentColor4Transition.Value
+            );
+            _fluidRenderer.Update(elapsedTime);
+
+            _coverRenderer.IsEnabled = lyricsBg.IsCoverOverlayEnabled;
+            _coverRenderer.Opacity = lyricsBg.CoverOverlayOpacity;
+            _coverRenderer.BlurAmount = lyricsBg.CoverOverlayBlurAmount;
+            _coverRenderer.Speed = lyricsBg.CoverOverlaySpeed;
+            _coverRenderer.Update(elapsedTime);
 
             _snowRenderer.IsEnabled = lyricsBg.IsSnowFlakeOverlayEnabled;
             _snowRenderer.Amount = lyricsBg.SnowFlakeOverlayAmount / 100f;
@@ -559,19 +599,29 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void Canvas_Unloaded(object sender, RoutedEventArgs e)
         {
-            Canvas.RemoveFromVisualTree();
-            Canvas = null;
-
             _fluidRenderer.Dispose();
+            _coverRenderer.Dispose();
             _snowRenderer.Dispose();
             _fogRenderer.Dispose();
             _spectrumRenderer.Dispose();
+
+            _renderLyricsLines = null;
+
             DisposeAnalyzer();
+
+            Canvas.RemoveFromVisualTree();
+            Canvas = null;
         }
 
         private async void Canvas_CreateResources(CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
         {
-            args.TrackAsyncAction(_fluidRenderer.LoadResourcesAsync().AsAsyncAction());
+            var tasks = new Task[]
+            {
+                _fluidRenderer.LoadResourcesAsync(),
+                ReloadCoverBackgroundResourcesAsync()
+            };
+            args.TrackAsyncAction(Task.WhenAll(tasks).AsAsyncAction());
+
             _snowRenderer.LoadResources();
             _fogRenderer.LoadResources();
 
@@ -592,12 +642,12 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void TriggerRelayout()
         {
-            if (_renderLyricsLines == null || !_isLayoutChanged) return;
+            if (_renderLyricsLines == null || !_isLayoutChanged || _lyricsWindowStatus == null) return;
 
             LyricsLayoutManager.MeasureAndArrange(
                 resourceCreator: Canvas,
                 lines: _renderLyricsLines,
-                status: _liveStatesService.LiveStates.LyricsWindowStatus,
+                status: _lyricsWindowStatus,
                 appSettings: _settingsService.AppSettings,
                 canvasWidth: Canvas.Size.Width,
                 canvasHeight: Canvas.Size.Height,
@@ -639,21 +689,27 @@ namespace BetterLyrics.WinUI3.Controls
             _isLastFMTracked = false;
         }
 
-        public void Receive(PropertyChangedMessage<AlbumArtThemeColors> message)
+        private void UpdateRenderLyricsLines()
         {
-            if (message.Sender is IMediaSessionsService)
+            _renderLyricsLines = null;
+            _renderLyricsLines = _mediaSessionsService.CurrentLyricsData?.LyricsLines.Select(x => new RenderLyricsLine()
             {
-                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);
+                LyricsSyllables = x.LyricsSyllables,
+                StartMs = x.StartMs,
+                EndMs = x.EndMs,
+                PhoneticText = x.PhoneticText,
+                OriginalText = x.OriginalText,
+                TranslatedText = x.TranslatedText
+            }).ToList();
+        }
 
-                    _isLayoutChanged = true;
-                }
+        private async Task ReloadCoverBackgroundResourcesAsync()
+        {
+            if (_mediaSessionsService.AlbumArtBitmapStream is IRandomAccessStream stream)
+            {
+                stream.Seek(0);
+                CanvasBitmap bitmap = await CanvasBitmap.LoadAsync(Canvas, stream);
+                _coverRenderer.SetCoverBitmap(bitmap);
             }
         }
 
@@ -696,38 +752,26 @@ namespace BetterLyrics.WinUI3.Controls
             {
                 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();
-                    }
+                    UpdateRenderLyricsLines();
                     _isLayoutChanged = true;
                 }
             }
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
+        public void Receive(PropertyChangedMessage<SongInfo?> message)
         {
-            if (message.Sender is LiveStates)
+            if (message.Sender is IMediaSessionsService)
             {
-                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
+                if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
                 {
-                    _isLayoutChanged = true;
+                    ResetPlaybackState();
                 }
             }
         }
 
         public void Receive(PropertyChangedMessage<int> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsFontSize))
                 {
@@ -749,8 +793,20 @@ namespace BetterLyrics.WinUI3.Controls
                 {
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsOpacity))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.OriginalLyricsOpacity))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.TranslatedLyricsOpacity))
+                {
+                    _isLayoutChanged = true;
+                }
             }
-            else if (message.Sender is LyricsEffectSettings)
+            else if (message.Sender == LyricsWindowStatus?.LyricsEffectSettings)
             {
                 if (message.PropertyName == nameof(LyricsEffectSettings.LyricsScrollDuration))
                 {
@@ -781,7 +837,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<double> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsLineSpacingFactor))
                 {
@@ -792,7 +848,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<bool> message)
         {
-            if (message.Sender is LyricsEffectSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsEffectSettings)
             {
                 if (message.PropertyName == nameof(LyricsEffectSettings.IsFanLyricsEnabled))
                 {
@@ -802,8 +858,16 @@ namespace BetterLyrics.WinUI3.Controls
                 {
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsFadeOutEffectEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsOutOfSightEffectEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
             }
-            else if (message.Sender is LyricsStyleSettings)
+            else if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.IsDynamicLyricsFontSize))
                 {
@@ -814,7 +878,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<TextAlignmentType> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsAlignmentType))
                 {
@@ -823,20 +887,9 @@ namespace BetterLyrics.WinUI3.Controls
             }
         }
 
-        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.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontWeight))
                 {
@@ -847,7 +900,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         public void Receive(PropertyChangedMessage<string> message)
         {
-            if (message.Sender is LyricsStyleSettings)
+            if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {
                 if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCJKFontFamily))
                 {
@@ -859,5 +912,16 @@ namespace BetterLyrics.WinUI3.Controls
                 }
             }
         }
+
+        public void Receive(PropertyChangedMessage<IRandomAccessStream?> message)
+        {
+            if (message.Sender is IMediaSessionsService)
+            {
+                if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtBitmapStream))
+                {
+                    _ = ReloadCoverBackgroundResourcesAsync();
+                }
+            }
+        }
     }
 }

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

@@ -28,20 +28,88 @@
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsBlurEffectEnabled, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
-                    <!--  辉光效果  -->
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE9A9;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
+                    <!--  淡出效果  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsFadeOutEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE89F;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFadeOutEffectEnabled, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <!--  远离视野  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsOutOfSightEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF19D;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsOutOfSightEffectEnabled, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <!--  辉光效果  -->
+                    <dev:SettingsExpander 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">
+                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageEffectScopeLongDurationSyllable" />
+                                    <ComboBoxItem x:Uid="SettingsPageEffectLineStartToCurrentChar" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageLongSyllableDuration">
+                                <local:ExtendedSlider
+                                    Default="700"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectLongSyllableDuration, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectAmountAutoAdjust, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Maximum="16"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectAmount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
                     <!--  缩放效果  -->
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8A3;}">
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsScaleEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8A3;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageLongSyllableDuration">
+                                <local:ExtendedSlider
+                                    Default="700"
+                                    Maximum="1000"
+                                    Minimum="0"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScaleEffectLongSyllableDuration, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectAmountAutoAdjust, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsScaleEffectAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="115"
+                                    Maximum="200"
+                                    Minimum="100"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScaleEffectAmount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
 
                     <!--  浮动动画  -->
-                    <dev:SettingsCard x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8C5;}">
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8C5;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
-                    </dev:SettingsCard>
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationAmountAutoAdjust, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationAmountAutoAdjust, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="4"
+                                    Maximum="16"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsFloatAnimationAmount, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
 
                     <!--  扇形歌词  -->
                     <dev:SettingsExpander

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

@@ -105,14 +105,6 @@
                                         <Run Text="*" />
                                         <Run x:Uid="ArtistsSplitHint" />
                                     </Paragraph>
-                                </RichTextBlock>
-
-                                <RichTextBlock
-                                    FontSize="12"
-                                    FontWeight="Bold"
-                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                    Loaded="ArtistsSplitHintRichTextBlock_Loaded"
-                                    TextWrapping="Wrap">
                                     <Paragraph>
                                         <Run Text=";    ,    /    ；    、    ，" />
                                     </Paragraph>
@@ -168,6 +160,10 @@
                                 Style="{StaticResource AccentButtonStyle}" />
                         </dev:SettingsCard>
 
+                        <dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
                     </StackPanel>
                 </ScrollViewer>
             </Grid>
@@ -282,18 +278,43 @@
                     </Pivot.HeaderTemplate>
                     <Pivot.ItemTemplate>
                         <DataTemplate x:DataType="models:LyricsData">
-                            <ListView ItemsSource="{x:Bind LyricsLines, Mode=OneWay}" SelectionChanged="ListView_SelectionChanged">
+                            <ListView
+                                ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
+                                ItemsSource="{x:Bind LyricsLines, Mode=OneWay}"
+                                SelectionMode="None">
                                 <ListView.ItemTemplate>
                                     <DataTemplate x:DataType="models:LyricsLine">
-                                        <StackPanel Orientation="Horizontal">
-                                            <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="{x:Bind EndMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
-                                            <TextBlock Margin="6,0" Text="{x:Bind OriginalText, Mode=OneWay}" />
-                                        </StackPanel>
+                                        <Grid Margin="0,6" ColumnSpacing="6">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid Grid.Column="0">
+                                                <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind StartMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
+                                                <Button
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Click="PlayLyricsLineButton_Click"
+                                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                                          FontSize=16,
+                                                                          Glyph=&#xE768;}"
+                                                    Opacity="0"
+                                                    Style="{StaticResource AccentButtonStyle}">
+                                                    <Button.OpacityTransition>
+                                                        <ScalarTransition />
+                                                    </Button.OpacityTransition>
+                                                    <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>
+                                                </Button>
+                                            </Grid>
+                                            <local:PropertyRow Grid.Column="1" Value="{x:Bind OriginalText, Mode=OneWay}" />
+                                        </Grid>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
                             </ListView>

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

@@ -2,8 +2,6 @@ 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.
@@ -20,30 +18,10 @@ namespace BetterLyrics.WinUI3.Controls
             DataContext = Ioc.Default.GetRequiredService<LyricsSearchControlViewModel>();
         }
 
-        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void PlayLyricsLineButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            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);
-            }
+            var lyricsLine = (LyricsLine)((Button)sender).DataContext;
+            ViewModel.PlayLyricsLine(lyricsLine);
         }
     }
 }

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

@@ -32,8 +32,8 @@
                     <dev:SettingsCard x:Uid="SettingsPageLyricsCenterTopOffset" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE78A;}">
                         <local:ExtendedSlider
                             Default="50"
-                            Maximum="100"
-                            Minimum="0"
+                            Maximum="99"
+                            Minimum="1"
                             Unit="%"
                             Value="{x:Bind LyricsStyleSettings.PlayingLineTopOffset, Mode=TwoWay}" />
                     </dev:SettingsCard>
@@ -227,6 +227,36 @@
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
+                    <!--  字体不透明度  -->
+                    <dev:SettingsExpander x:Uid="SettingsPageLyricsOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEF20;}">
+                        <dev:SettingsExpander.Items>
+                            <dev:SettingsCard x:Uid="SettingsPagePhoneticText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsStyleSettings.PhoneticLyricsOpacity, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageOriginalText">
+                                <local:ExtendedSlider
+                                    Default="30"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsStyleSettings.OriginalLyricsOpacity, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageTranslatedText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsStyleSettings.TranslatedLyricsOpacity, Mode=TwoWay}" />
+                            </dev:SettingsCard>
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
                 </StackPanel>
             </Grid>
         </ScrollViewer>

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

@@ -11,6 +11,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="using:BetterLyrics.WinUI3.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
+    Loaded="UserControl_Loaded"
     mc:Ignorable="d">
 
     <Grid>
@@ -21,24 +22,7 @@
 
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
-                        <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>
+                        <TextBlock x:Uid="SettingsPageRecordedWindowStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                         <StackPanel Orientation="Horizontal" Spacing="3">
 
@@ -54,6 +38,7 @@
                                         <MenuFlyoutItem x:Uid="SettingsPageDockedMode" Command="{x:Bind ViewModel.CreateDockedLyricsWindowStatusCommand}" />
                                         <MenuFlyoutItem x:Uid="SettingsPageFullscreenMode" Command="{x:Bind ViewModel.CreateFullLyricsWindowStatusCommand}" />
                                         <MenuFlyoutItem x:Uid="SettingsPageNarrowMode" Command="{x:Bind ViewModel.CreateNarrowLyricsWindowStatusCommand}" />
+                                        <MenuFlyoutItem x:Uid="SettingsPageTaskbarMode" Command="{x:Bind ViewModel.CreateTaskbarLyricsWindowStatusCommand}" />
                                     </MenuFlyout>
                                 </Button.Flyout>
                             </Button>
@@ -87,7 +72,7 @@
                                 Padding="0,12"
                                 CornerRadius="4"
                                 ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-                                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                                SelectionMode="None">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
@@ -101,10 +86,6 @@
                                             Spacing="6">
                                             <StackPanel.ContextFlyout>
                                                 <MenuBarItemFlyout>
-                                                    <MenuFlyoutItem
-                                                        x:Uid="LyricsWindowSettingsControlSetDefault"
-                                                        Click="SetDefaultMenuFlyoutItem_Click"
-                                                        IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                                                     <MenuFlyoutItem x:Uid="SettingsPageCreateFromCurrent" Click="CopyMenuFlyoutItem_Click" />
                                                     <MenuFlyoutItem x:Uid="LyricsWindowSettingsControlShare" Click="ShareMenuFlyoutItem_Click" />
                                                     <MenuFlyoutItem
@@ -113,13 +94,50 @@
                                                         IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
                                                 </MenuBarItemFlyout>
                                             </StackPanel.ContextFlyout>
-                                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                                            <Grid>
+                                                <Border
+                                                    BorderBrush="{ThemeResource AccentAAFillColorDefaultBrush}"
+                                                    BorderThickness="4"
+                                                    CornerRadius="4"
+                                                    Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                                <uc:DemoWindowGrid Margin="4" LyricsWindowStatus="{Binding}" />
+                                            </Grid>
+                                            <Grid>
+                                                <ToggleButton
+                                                    Grid.Column="0"
+                                                    HorizontalAlignment="Stretch"
+                                                    Click="SetDefaultMenuFlyoutItem_Click"
+                                                    IsChecked="{Binding IsDefault, Mode=OneWay}">
+                                                    <TextBlock x:Uid="LyricsWindowSettingsControlSetDefault" />
+                                                </ToggleButton>
+                                            </Grid>
+                                            <Grid ColumnSpacing="4">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <Button
+                                                    Grid.Column="0"
+                                                    HorizontalAlignment="Stretch"
+                                                    Click="ConfigButton_Click">
+                                                    <TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
+                                                </Button>
+                                            </Grid>
                                         </StackPanel>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
                             </ListView>
                         </StackPanel>
 
+                        <dev:SettingsCard x:Uid="SettingsPageMultiNowPlayingWindows">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.MultiNowPlayingWindowMode, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
+                        <dev:SettingsCard x:Uid="SettingsPageMusicGalleryLyrics">
+                            <Button HorizontalAlignment="Stretch" Click="EmbeddedConfigButton_Click">
+                                <TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
+                            </Button>
+                        </dev:SettingsCard>
+
                     </StackPanel>
 
                 </Grid>
@@ -137,8 +155,15 @@
             <Grid.TranslationTransition>
                 <Vector3Transition />
             </Grid.TranslationTransition>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
 
-            <Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
+            <Grid
+                Grid.Row="0"
+                Padding="36,0"
+                Style="{StaticResource SettingsGridStyle}">
                 <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
                     <Grid>
                         <Grid.ColumnDefinitions>
@@ -147,9 +172,9 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <TextBlock
-                            x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig"
                             Grid.Column="0"
-                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                            Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}" />
                         <Button
                             Grid.Column="2"
                             Margin="0,30,0,0"
@@ -160,77 +185,39 @@
                             Style="{StaticResource AccentButtonStyle}" />
                     </Grid>
 
-                    <Pivot SelectionChanged="Pivot_SelectionChanged">
+                    <controls:Segmented
+                        x:Name="ConfigSegmented"
+                        SelectionChanged="ConfigSegmented_SelectionChanged"
+                        Style="{StaticResource PivotSegmentedStyle}">
 
-                        <PivotItem Tag="Window">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="AppSettingsControlGeneral"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
+                        <controls:SegmentedItem x:Name="WindowSegmentedItem" Tag="Window">
+                            <TextBlock x:Uid="AppSettingsControlGeneral" />
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem x:Name="LayoutSegmentedItem" Tag="Layout">
+                            <TextBlock x:Uid="SettingsPageLayout" />
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem x:Name="AlbumArtStyleSegmentedItem" Tag="AlbumArtStyle">
+                            <TextBlock x:Uid="SettingsPageAlbumStyle" />
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem Tag="AlbumArtEffect">
+                            <TextBlock x:Uid="SettingsPageAlbumEffect" />
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem Tag="LyricsStyle">
+                            <TextBlock x:Uid="SettingsPageLyricsStyle" />
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem Tag="LyricsEffect">
+                            <TextBlock x:Uid="SettingsPageLyricsEffect" />
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem Tag="LyricsBackground">
+                            <TextBlock x:Uid="SettingsPageBackgroundOverlay" />
+                        </controls:SegmentedItem>
 
-                        <PivotItem Tag="Layout">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageLayout"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="AlbumArtStyle">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageAlbumStyle"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </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
-                                    x:Uid="SettingsPageLyricsStyle"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="LyricsEffect">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageLyricsEffect"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                        <PivotItem Tag="LyricsBackground">
-                            <PivotItem.Header>
-                                <TextBlock
-                                    x:Uid="SettingsPageBackgroundOverlay"
-                                    VerticalAlignment="Center"
-                                    Style="{StaticResource BodyTextBlockStyle}" />
-                            </PivotItem.Header>
-                        </PivotItem>
-
-                    </Pivot>
+                    </controls:Segmented>
 
                 </StackPanel>
             </Grid>
 
-            <controls:SwitchPresenter Margin="0,110,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
+            <controls:SwitchPresenter Grid.Row="1" Value="{x:Bind ViewModel.SelectorBarSelectedItemTag, Mode=OneWay}">
                 <controls:SwitchPresenter.ContentTransitions>
                     <TransitionCollection>
                         <PopupThemeTransition />
@@ -239,7 +226,7 @@
 
                 <!--  Window  -->
                 <controls:Case Value="Window">
-                    <uc:WindowSettingsControl LyricsWindowStatus="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=OneWay}" />
+                    <uc:WindowSettingsControl LyricsWindowStatus="{x:Bind LyricsWindowStatus, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Layout  -->
@@ -251,14 +238,14 @@
                                 <TextBlock x:Uid="SettingsPageLayout" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                                 <dev:SettingsExpander x:Uid="SettingsPageDisplayTypeSwitcher" IsExpanded="True">
-                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                         <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
                                         <ComboBoxItem x:Uid="MainPageLyriscOnly" />
                                         <ComboBoxItem x:Uid="MainPageSplitView" />
                                     </ComboBox>
                                     <dev:SettingsExpander.Items>
                                         <dev:SettingsCard x:Uid="SettingsPageLayoutOrientation">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                            <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                                 <ComboBoxItem x:Uid="SettingsPageLayoutOrientationHorizontal" />
                                                 <ComboBoxItem x:Uid="SettingsPageLayoutOrientationVertical" />
                                             </ComboBox>
@@ -273,27 +260,27 @@
 
                 <!--  Album art area style  -->
                 <controls:Case Value="AlbumArtStyle">
-                    <uc:AlbumArtAreaStyleSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                    <uc:AlbumArtAreaStyleSettingsControl AlbumArtLayoutSettings="{x:Bind 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}" />
+                    <uc:AlbumArtAreaEffectSettingsControl AlbumArtAreaEffectSettings="{x:Bind LyricsWindowStatus.AlbumArtAreaEffectSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics style  -->
                 <controls:Case Value="LyricsStyle">
-                    <uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
+                    <uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics  effect  -->
                 <controls:Case Value="LyricsEffect">
-                    <uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
+                    <uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics background  -->
                 <controls:Case Value="LyricsBackground">
-                    <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
+                    <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
                 </controls:Case>
 
             </controls:SwitchPresenter>

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

@@ -1,15 +1,16 @@
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Serialization;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using NTextCat.Commons;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -25,7 +26,15 @@ namespace BetterLyrics.WinUI3.Controls
         public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
 
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-        private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
+
+        public LyricsWindowStatus? LyricsWindowStatus
+        {
+            get { return (LyricsWindowStatus?)GetValue(LyricsWindowStatusProperty); }
+            set { SetValue(LyricsWindowStatusProperty, value); }
+        }
+
+        public static readonly DependencyProperty LyricsWindowStatusProperty =
+            DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(LyricsWindowSettingsControl), new PropertyMetadata(null));
 
         public LyricsWindowSettingsControl()
         {
@@ -39,10 +48,9 @@ namespace BetterLyrics.WinUI3.Controls
             {
                 if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
                 {
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus == data)
-                    {
-                        _liveStatesService.LiveStates.LyricsWindowStatus = ViewModel.AppSettings.WindowBoundsRecords.First();
-                    }
+                    var windows = WindowHook.GetWindows<NowPlayingWindow>();
+                    var window = windows.FirstOrDefault(x => x.LyricsWindowStatus == data);
+                    window?.CloseWindow();
                     ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
                 }
             }
@@ -50,12 +58,11 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void SetDefaultMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is MenuFlyoutItem menuFlyoutItem)
+            if (sender is FrameworkElement element)
             {
-                if (menuFlyoutItem.DataContext is LyricsWindowStatus data)
+                if (element.DataContext is LyricsWindowStatus data)
                 {
-                    ViewModel.AppSettings.WindowBoundsRecords.ForEach(x => x.IsDefault = false);
-                    data.IsDefault = true;
+                    data.IsDefault = !data.IsDefault;
                 }
             }
         }
@@ -115,17 +122,6 @@ namespace BetterLyrics.WinUI3.Controls
             }
         }
 
-        private void Pivot_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is Pivot pivot)
-            {
-                if (pivot.SelectedItem is PivotItem pivotItem)
-                {
-                    ViewModel?.ListViewSelectedItemTag = pivotItem.Tag;
-                }
-            }
-        }
-
         private async void ImportButton_Click(object sender, RoutedEventArgs e)
         {
             string[] fileTypeFilter = [".json"];
@@ -154,5 +150,31 @@ namespace BetterLyrics.WinUI3.Controls
         {
             ViewModel.DisplayPanelHeight = e.NewSize.Height;
         }
+
+        private void ConfigButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowSegmentedItem.IsEnabled = LayoutSegmentedItem.IsEnabled = true;
+            ConfigSegmented.SelectedItem = WindowSegmentedItem;
+            LyricsWindowStatus = (LyricsWindowStatus)((Button)sender).DataContext;
+            ViewModel.OpenConfigPanel();
+        }
+
+        private void EmbeddedConfigButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowSegmentedItem.IsEnabled = LayoutSegmentedItem.IsEnabled = false;
+            ConfigSegmented.SelectedItem = AlbumArtStyleSegmentedItem;
+            LyricsWindowStatus = _settingsService.AppSettings.MusicGallerySettings.LyricsWindowStatus;
+            ViewModel.OpenConfigPanel();
+        }
+
+        private void ConfigSegmented_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ViewModel.SelectorBarSelectedItemTag = (string)((SegmentedItem)((Segmented)sender).SelectedItem).Tag;
+        }
+
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            ViewModel.CloseConfigPanelCommand.Execute(null);
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml

@@ -44,8 +44,9 @@
 
             <ListView
                 Margin="48,56"
+                ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
                 ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                SelectionMode="None">
                 <ItemsControl.ItemsPanel>
                     <ItemsPanelTemplate>
                         <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
@@ -54,12 +55,14 @@
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <Grid
-                            Margin="0,10"
-                            Padding="5"
-                            AllowFocusOnInteraction="True"
+                            Margin="16"
                             CornerRadius="4"
                             Tapped="Grid_Tapped">
-                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                            <Border
+                                BorderBrush="{ThemeResource AccentAAFillColorDefaultBrush}"
+                                BorderThickness="4"
+                                Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <uc:DemoWindowGrid Margin="4" LyricsWindowStatus="{Binding}" />
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs

@@ -1,10 +1,13 @@
 using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
+using System.Linq;
 using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -16,6 +19,8 @@ namespace BetterLyrics.WinUI3.Controls
     {
         public LyricsWindowSwitchControlViewModel ViewModel => (LyricsWindowSwitchControlViewModel)DataContext;
 
+        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
         public LyricsWindowSwitchControl()
         {
             InitializeComponent();
@@ -37,7 +42,7 @@ namespace BetterLyrics.WinUI3.Controls
             var lyricsWindowSwitchWindow = WindowHook.GetWindow<LyricsWindowSwitchWindow>();
             lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
             await Task.Delay(300);
-            WindowHook.HideWindow<LyricsWindowSwitchWindow>();
+            lyricsWindowSwitchWindow?.HideWindow();
         }
 
         private void ShadowRect_Loaded(object sender, RoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <UserControl
     x:Class="BetterLyrics.WinUI3.Controls.MediaSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -9,6 +8,7 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     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">
 
@@ -49,25 +49,32 @@
                         ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
                         SelectionMode="None">
                         <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <dev:SettingsExpander>
+                            <DataTemplate x:DataType="models:MediaFolder">
+                                <dev:SettingsExpander Description="{x:Bind ConnectionSummary, Mode=OneWay}" HeaderIcon="{Binding SourceType, Converter={StaticResource FileSourceTypeToIconConverter}}">
+
                                     <dev:SettingsExpander.Header>
                                         <HyperlinkButton
+                                            Padding="0"
                                             Click="LocalFolderHyperlinkButton_Click"
-                                            Content="{Binding Path, Mode=OneWay}"
-                                            Tag="{Binding Path, Mode=OneWay}" />
+                                            Content="{x:Bind Path, Mode=OneWay}"
+                                            Tag="{x:Bind Path, Mode=OneWay}"
+                                            ToolTipService.ToolTip="{x:Bind ConnectionSummary}" />
                                     </dev:SettingsExpander.Header>
-                                    <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+
+                                    <ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
+
                                     <dev:SettingsExpander.Items>
                                         <dev:SettingsCard>
                                             <dev:SettingsCard.Header>
                                                 <HyperlinkButton
                                                     x:Uid="SettingsPageRemovePath"
+                                                    Padding="0"
                                                     Click="SettingsPageRemovePathButton_Click"
                                                     Tag="{Binding}" />
                                             </dev:SettingsCard.Header>
                                         </dev:SettingsCard>
-                                        <dev:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch">
+
+                                        <dev:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch" IsEnabled="{Binding IsLocal, Mode=OneWay}">
                                             <ToggleSwitch IsOn="{Binding IsRealTimeWatchEnabled, Mode=TwoWay}" />
                                         </dev:SettingsCard>
                                     </dev:SettingsExpander.Items>
@@ -76,15 +83,52 @@
                         </ListView.ItemTemplate>
                     </ListView>
 
-                    <dev:SettingsCard x:Uid="SettingsPageAddFolder" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
-                        <Button
-                            x:Uid="SettingsPageAddFolderButton"
-                            Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
-                            CommandParameter="{Binding ElementName=RootGrid}" />
+                    <dev:SettingsCard Style="{StaticResource DefaultSettingsExpanderItemStyle}">
+                        <DropDownButton x:Uid="SettingsPageAddFolderButton">
+                            <DropDownButton.Flyout>
+                                <MenuFlyout>
+                                    <MenuFlyoutItem
+                                        x:Uid="SettingsPageLocalFolder"
+                                        Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
+                                        CommandParameter="{Binding ElementName=RootGrid}"
+                                        Icon="Folder" />
+
+                                    <MenuFlyoutSeparator />
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
+                                        CommandParameter="SMB"
+                                        Text="SMB">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE839;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
+                                        CommandParameter="FTP"
+                                        Text="FTP">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE838;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
+                                        CommandParameter="WebDAV"
+                                        Text="WebDAV">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE774;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                </MenuFlyout>
+                            </DropDownButton.Flyout>
+                        </DropDownButton>
                     </dev:SettingsCard>
 
                 </StackPanel>
             </Grid>
         </ScrollViewer>
     </Grid>
-</UserControl>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs

@@ -22,7 +22,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ViewModel.RemoveFolderAsync((LocalMediaFolder)(sender as HyperlinkButton)!.Tag);
+            ViewModel.RemoveFolderAsync((MediaFolder)(sender as HyperlinkButton)!.Tag);
         }
 
         private async void LocalFolderHyperlinkButton_Click(object sender, RoutedEventArgs e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml

@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.NowPlayingBar"
+    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:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid x:Name="RootGrid">
+
+        <Grid
+            x:Name="BottomCommandGrid"
+            Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
+            Opacity="{x:Bind ViewModel.BottomCommandGridOpacity, Mode=OneWay}"
+            PointerEntered="BottomCommandGrid_PointerEntered"
+            PointerExited="BottomCommandGrid_PointerExited">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+
+            <Grid x:Name="BottomCommandContent">
+
+                <Grid HorizontalAlignment="Left">
+                    <StackPanel
+                        x:Name="BottomLeftCommandStackPanel"
+                        Orientation="Horizontal"
+                        Spacing="3">
+
+                        <StackPanel
+                            x:Name="SongInfoStackPanel"
+                            Margin="8"
+                            Padding="8"
+                            VerticalAlignment="Center"
+                            CornerRadius="4"
+                            Opacity="{x:Bind ShowSongInfo, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
+                            Orientation="Horizontal"
+                            Spacing="12"
+                            Tapped="SongInfoStackPanel_Tapped"
+                            Visibility="{x:Bind ShowSongInfo, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <StackPanel.OpacityTransition>
+                                <ScalarTransition />
+                            </StackPanel.OpacityTransition>
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerExited">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="Transparent" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerPressed">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerReleased">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                            <Grid VerticalAlignment="Center" CornerRadius="4">
+                                <local:ImageSwitcher
+                                    x:Name="AlbumArtImageSwitcher"
+                                    Width="36"
+                                    Height="36" />
+                            </Grid>
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock x:Name="TitleTextBlock" />
+                                <TextBlock
+                                    x:Name="ArtistsTextBlock"
+                                    FontSize="12"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                            </StackPanel>
+                        </StackPanel>
+
+                        <StackPanel
+                            x:Name="TimeStackPanel"
+                            Margin="8"
+                            Padding="8"
+                            VerticalAlignment="Center"
+                            Opacity="{x:Bind ShowTime, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
+                            Orientation="Horizontal"
+                            Spacing="2"
+                            Tapped="TimeStackPanel_Tapped"
+                            Visibility="{x:Bind ShowTime, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <StackPanel.OpacityTransition>
+                                <ScalarTransition />
+                            </StackPanel.OpacityTransition>
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerExited">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="Transparent" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerPressed">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                                <interactivity:EventTriggerBehavior EventName="PointerReleased">
+                                    <interactivity:ChangePropertyAction PropertyName="Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+                                </interactivity:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{Binding ElementName=TimelineSlider, Path=Value, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="/" />
+                            <TextBlock Text="{Binding ElementName=TimelineSlider, Path=Maximum, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                </Grid>
+
+                <Grid HorizontalAlignment="Center">
+                    <StackPanel
+                        x:Name="BottomCenterCommandStackPanel"
+                        Padding="16"
+                        Orientation="Horizontal"
+                        Spacing="3">
+                        <Button
+                            Command="{x:Bind ViewModel.PreviousSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE622;}"
+                            Style="{StaticResource GhostButtonStyle}" />
+                        <Button
+                            Command="{x:Bind ViewModel.PauseSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF8AE;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="True">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                </interactivity:DataTriggerBehavior>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="False">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                </interactivity:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Command="{x:Bind ViewModel.PlaySongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF5B0;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="True">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                </interactivity:DataTriggerBehavior>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.MediaSessionsService.CurrentIsPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="False">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                </interactivity:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Command="{x:Bind ViewModel.NextSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE623;}"
+                            Style="{StaticResource GhostButtonStyle}" />
+                    </StackPanel>
+                </Grid>
+
+                <Grid HorizontalAlignment="Right">
+                    <StackPanel
+                        x:Name="BottomRightCommandStackPanel"
+                        Padding="16"
+                        Orientation="Horizontal"
+                        Spacing="3">
+
+                        <!--  Volume  -->
+                        <Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
+                            <Grid>
+
+                                <!--  Volumn: 0  -->
+                                <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE74F;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="Equal"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="NotEqual"
+                                            Value="0">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+
+                                <!--  Volumn: 1-32  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel1"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE993;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="1">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+
+                                <!--  Volumn: 33-65  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel2"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE994;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="33">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+
+                                <!--  Volumn: 66-100  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel3"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE995;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                    <interactivity:Interaction.Behaviors>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="GreaterThanOrEqual"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                        </interactivity:DataTriggerBehavior>
+                                        <interactivity:DataTriggerBehavior
+                                            Binding="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                                            ComparisonCondition="LessThan"
+                                            Value="66">
+                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                        </interactivity:DataTriggerBehavior>
+                                    </interactivity:Interaction.Behaviors>
+                                </FontIcon>
+                            </Grid>
+
+                            <Button.ContextFlyout>
+                                <Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
+                                    <local:ExtendedSlider
+                                        Frequency="10"
+                                        IsSliderEnabled="False"
+                                        Maximum="100"
+                                        Minimum="0"
+                                        ResetButtonVisibility="Collapsed"
+                                        Unit="%"
+                                        ValueChangedByUser="ExtendedSlider_ValueChangedByUser"
+                                        Value="{x:Bind ViewModel.Volume, Mode=TwoWay}" />
+                                </Flyout>
+                            </Button.ContextFlyout>
+                        </Button>
+
+                        <!--  More  -->
+                        <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE712;}" Style="{StaticResource GhostButtonStyle}">
+                            <Button.Flyout>
+                                <MenuFlyout>
+                                    <!--  Lyrics search window  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPageLyricsSearch"
+                                        Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xE721;}" />
+                                    <!--  Lyrics window manager shortcut settings  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPageLyricsSettings"
+                                        Click="LyricsSettingsShortcutMenuFlyoutItem_Click"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xE61F;}">
+                                        <MenuFlyoutItem.ContextFlyout>
+                                            <Flyout
+                                                x:Name="LyricsSettingsFlyout"
+                                                Closed="LyricsSettingsFlyout_Closed"
+                                                FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
+                                                Placement="Right"
+                                                ShouldConstrainToRootBounds="False" />
+                                        </MenuFlyoutItem.ContextFlyout>
+                                    </MenuFlyoutItem>
+                                    <!--  Playback shortcut settings  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPagePlaybackSource"
+                                        Click="PlaybackSettingsShortcutMenuFlyoutItem_Click"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xEA69;}">
+                                        <MenuFlyoutItem.ContextFlyout>
+                                            <Flyout
+                                                x:Name="PlaybackSettingsFlyout"
+                                                Closed="PlaybackSettingsFlyout_Closed"
+                                                FlyoutPresenterStyle="{StaticResource FlyoutPageStyle}"
+                                                Placement="Right"
+                                                ShouldConstrainToRootBounds="False" />
+                                        </MenuFlyoutItem.ContextFlyout>
+                                    </MenuFlyoutItem>
+                                    <!--  Settings  -->
+                                    <MenuFlyoutItem
+                                        x:Uid="LyricsPageSettings"
+                                        Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
+                                        Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                           Glyph=&#xE713;}" />
+                                </MenuFlyout>
+                            </Button.Flyout>
+                        </Button>
+
+                    </StackPanel>
+                </Grid>
+
+                <Slider
+                    x:Name="TimelineSlider"
+                    Margin="0,-14,0,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Maximum="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DurationMs, Mode=OneWay, Converter={StaticResource MillisecondsToSecondsConverter}}"
+                    Minimum="0"
+                    Style="{StaticResource GhostSliderStyle}"
+                    ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}" />
+
+                <Grid
+                    x:Name="TimelineSliderLyricsLineInfo"
+                    Margin="0,-32,0,0"
+                    Padding="8,4"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
+                    CornerRadius="6"
+                    Opacity="{x:Bind ViewModel.TimelineSliderThumbOpacity, Mode=OneWay}">
+                    <Grid.OpacityTransition>
+                        <ScalarTransition />
+                    </Grid.OpacityTransition>
+                    <Grid.TranslationTransition>
+                        <Vector3Transition />
+                    </Grid.TranslationTransition>
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <TextBlock
+                            Margin="0,0,0,2"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
+                        <!--  TODO 原文翻译共同显示  -->
+                        <TextBlock Margin="0,0,0,2" Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.OriginalText, Mode=OneWay}" />
+                    </StackPanel>
+                </Grid>
+                <Grid
+                    Height="32"
+                    Margin="0,-12,0,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    PointerEntered="TimelineSliderOverlay_PointerEntered"
+                    PointerExited="TimelineSliderOverlay_PointerExited"
+                    PointerMoved="TimelineSliderOverlay_PointerMoved"
+                    PointerPressed="TimelineSliderOverlay_PointerPressed" />
+            </Grid>
+
+        </Grid>
+
+        <!--  Bottom command flyout trigger  -->
+        <Grid
+            x:Name="BottomCommandFlyoutTrigger"
+            Height="12"
+            VerticalAlignment="Bottom"
+            Background="Transparent"
+            CornerRadius="3,3,0,0"
+            Opacity="{x:Bind ViewModel.BottomCommandFlyoutTriggerOpacity, Mode=OneWay}"
+            PointerEntered="BottomCommandFlyoutTrigger_PointerEntered"
+            PointerExited="BottomCommandFlyoutTrigger_PointerExited"
+            Tapped="BottomCommandFlyoutTrigger_Tapped">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <Grid
+                x:Name="BottomCommandFlyoutTriggerHint"
+                Width="150"
+                Margin="4"
+                Background="{ThemeResource TextFillColorPrimaryBrush}"
+                CornerRadius="2"
+                Translation="0,0,0">
+                <Grid.TranslationTransition>
+                    <Vector3Transition />
+                </Grid.TranslationTransition>
+            </Grid>
+            <Grid.ContextFlyout>
+                <Flyout x:Name="BottomCommandFlyout" ShouldConstrainToRootBounds="False">
+                    <Flyout.FlyoutPresenterStyle>
+                        <Style TargetType="FlyoutPresenter">
+                            <Setter Property="Padding" Value="0" />
+                            <Setter Property="MinWidth" Value="400" />
+                            <Setter Property="MinHeight" Value="100" />
+                            <Setter Property="CornerRadius" Value="12" />
+                        </Style>
+                    </Flyout.FlyoutPresenterStyle>
+                    <Grid x:Name="BottomCommandFlyoutContainer" VerticalAlignment="Bottom" />
+                </Flyout>
+            </Grid.ContextFlyout>
+        </Grid>
+
+
+    </Grid>
+
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs

@@ -0,0 +1,298 @@
+using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.MediaSessionsService;
+using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Numerics;
+
+// 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 NowPlayingBar : UserControl,
+    IRecipient<PropertyChangedMessage<SongInfo?>>,
+    IRecipient<PropertyChangedMessage<BitmapImage?>>,
+    IRecipient<PropertyChangedMessage<TimeSpan>>
+{
+    public NowPlayingBarViewModel ViewModel => (NowPlayingBarViewModel)DataContext;
+
+    public event EventHandler? SongInfoTapped;
+    public event EventHandler? TimeTapped;
+
+    public bool ShowTime
+    {
+        get { return (bool)GetValue(ShowTimeProperty); }
+        set { SetValue(ShowTimeProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShowTimeProperty =
+        DependencyProperty.Register(nameof(ShowTime), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
+    public bool ShowSongInfo
+    {
+        get { return (bool)GetValue(ShowSongInfoProperty); }
+        set { SetValue(ShowSongInfoProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShowSongInfoProperty =
+        DependencyProperty.Register(nameof(ShowSongInfo), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
+    public bool IsCompactMode
+    {
+        get { return (bool)GetValue(IsCompactModeProperty); }
+        set { SetValue(IsCompactModeProperty, value); }
+    }
+
+    public static readonly DependencyProperty IsCompactModeProperty =
+        DependencyProperty.Register(nameof(IsCompactMode), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false, OnDependencyPropertyChanged));
+
+    public bool IsAutoHideEnabled
+    {
+        get { return (bool)GetValue(IsAutoHideEnabledProperty); }
+        set { SetValue(IsAutoHideEnabledProperty, value); }
+    }
+
+    public static readonly DependencyProperty IsAutoHideEnabledProperty =
+        DependencyProperty.Register(nameof(IsAutoHideEnabled), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false, OnDependencyPropertyChanged));
+
+    private bool _isPointerInBottomCommandGrid = false;
+
+    public NowPlayingBar()
+    {
+        InitializeComponent();
+        DataContext = Ioc.Default.GetRequiredService<NowPlayingBarViewModel>();
+
+        WeakReferenceMessenger.Default.RegisterAll(this);
+    }
+
+    private static void OnDependencyPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is NowPlayingBar self)
+        {
+            if (e.Property == IsCompactModeProperty)
+            {
+                self.OnIsCompactModeChanged();
+            }
+            else if (e.Property == IsAutoHideEnabledProperty)
+            {
+                self.OnIsAutoHideEnabledChanged();
+            }
+        }
+    }
+
+    private void OnIsAutoHideEnabledChanged()
+    {
+        if (IsAutoHideEnabled)
+        {
+            if (!_isPointerInBottomCommandGrid)
+            {
+                ViewModel.BottomCommandGridOpacity = 0;
+            }
+        }
+        else
+        {
+            ViewModel.BottomCommandGridOpacity = 1;
+        }
+    }
+
+    private void OnIsCompactModeChanged()
+    {
+        if (IsCompactMode)
+        {
+            if (BottomCommandGrid.Children.Count != 0)
+            {
+                BottomCommandGrid.Children.Remove(BottomCommandContent);
+                BottomCommandFlyoutContainer.Children.Add(BottomCommandContent);
+            }
+            BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 0, 0);
+        }
+        else
+        {
+            if (BottomCommandFlyoutContainer.Children.Count != 0)
+            {
+                BottomCommandFlyout.Hide();
+                BottomCommandFlyoutContainer.Children.Remove(BottomCommandContent);
+                BottomCommandGrid.Children.Add(BottomCommandContent);
+            }
+            BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 12, 0);
+        }
+    }
+
+    private void PlaybackSettingsShortcutMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+    {
+        PlaybackSettingsFlyout.Content = new PlaybackSettingsControl
+        {
+            MaxHeight = 500,
+            MaxWidth = 850,
+        };
+        PlaybackSettingsFlyout.ShowAt(BottomRightCommandStackPanel);
+    }
+
+    private void VolumeButton_Click(object sender, RoutedEventArgs e)
+    {
+        VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
+    }
+
+    private void PlaybackSettingsFlyout_Closed(object sender, object e)
+    {
+        PlaybackSettingsFlyout.Content = null;
+    }
+
+    private void LyricsSettingsFlyout_Closed(object sender, object e)
+    {
+        LyricsSettingsFlyout.Content = null;
+    }
+
+    private void LyricsSettingsShortcutMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+    {
+        LyricsSettingsFlyout.Content = new LyricsWindowSettingsControl
+        {
+            MaxHeight = 500,
+            MaxWidth = 850,
+        };
+        LyricsSettingsFlyout.ShowAt(BottomRightCommandStackPanel);
+    }
+
+    private void TimelineSliderOverlay_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        var grid = (Grid)sender;
+        var pos = e.GetCurrentPoint(grid).Position;
+        var ratio = pos.X / grid.ActualWidth;
+        ViewModel.MediaSessionsService.ChangePosition(TimelineSlider.Maximum * ratio);
+    }
+
+    private void TimelineSliderOverlay_PointerMoved(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        float targetX;
+        var grid = (Grid)sender;
+        var pos = e.GetCurrentPoint(grid).Position;
+        var ratio = pos.X / grid.ActualWidth;
+        ViewModel.TimelineSliderThumbSeconds = TimelineSlider.Maximum * ratio;
+        if (pos.X + TimelineSliderLyricsLineInfo.ActualWidth > grid.ActualWidth)
+        {
+            targetX = (float)(grid.ActualWidth - TimelineSliderLyricsLineInfo.ActualWidth);
+        }
+        else
+        {
+            targetX = (float)pos.X;
+        }
+        TimelineSliderLyricsLineInfo.Translation = new Vector3(targetX, 0, 0);
+    }
+
+    private void TimelineSliderOverlay_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        ViewModel.TimelineSliderThumbOpacity = 1f;
+    }
+
+    private void TimelineSliderOverlay_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        ViewModel.TimelineSliderThumbOpacity = 0f;
+    }
+
+    private void ExtendedSlider_ValueChangedByUser(object sender, Events.ExtendedSliderValueChangedByUserEventArgs e)
+    {
+        SystemVolumeHook.MasterVolume = ViewModel.Volume;
+    }
+
+    private void LyricsSearchShortcutButton_Click(object sender, RoutedEventArgs e)
+    {
+        WindowHook.OpenOrShowWindow<LyricsSearchWindow>();
+    }
+
+    private void SongInfoStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        SongInfoTapped?.Invoke(this, EventArgs.Empty);
+    }
+
+    private void TimeStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        TimeTapped?.Invoke(this, EventArgs.Empty);
+    }
+
+    private void BottomCommandGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        _isPointerInBottomCommandGrid = true;
+        if (IsAutoHideEnabled && BottomCommandGrid.Children.Count != 0)
+        {
+            ViewModel.BottomCommandGridOpacity = 1f;
+        }
+        e.Handled = true;
+    }
+
+    private void BottomCommandGrid_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        _isPointerInBottomCommandGrid = false;
+        if (IsAutoHideEnabled && BottomCommandGrid.Children.Count != 0)
+        {
+            ViewModel.BottomCommandGridOpacity = 0f;
+        }
+        e.Handled = true;
+    }
+
+    private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        if (BottomCommandFlyoutContainer.Children.Count != 0)
+        {
+            ViewModel.BottomCommandFlyoutTriggerOpacity = 1f;
+        }
+    }
+
+    private void BottomCommandFlyoutTrigger_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        if (BottomCommandFlyoutContainer.Children.Count != 0)
+        {
+            ViewModel.BottomCommandFlyoutTriggerOpacity = 0f;
+        }
+    }
+
+    private void BottomCommandFlyoutTrigger_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+    {
+        if (BottomCommandFlyoutContainer.Children.Count != 0)
+        {
+            BottomCommandFlyout.ShowAt(BottomCommandFlyoutTrigger);
+        }
+    }
+
+    public void Receive(PropertyChangedMessage<SongInfo?> message)
+    {
+        if (message.Sender is IMediaSessionsService)
+        {
+            if (message.PropertyName == nameof(IMediaSessionsService.CurrentSongInfo))
+            {
+                TitleTextBlock.Text = message.NewValue?.Title;
+                ArtistsTextBlock.Text = message.NewValue?.DisplayArtists;
+            }
+        }
+    }
+    public void Receive(PropertyChangedMessage<BitmapImage?> message)
+    {
+        if (message.Sender is IMediaSessionsService)
+        {
+            if (message.PropertyName == nameof(IMediaSessionsService.AlbumArtBitmapImage))
+            {
+                AlbumArtImageSwitcher.Source = message.NewValue;
+            }
+        }
+    }
+
+    public void Receive(PropertyChangedMessage<TimeSpan> message)
+    {
+        if (message.Sender is IMediaSessionsService)
+        {
+            if (message.PropertyName == nameof(IMediaSessionsService.CurrentPosition))
+            {
+                TimelineSlider.Value = message.NewValue.TotalSeconds;
+            }
+        }
+    }
+
+}

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

@@ -22,8 +22,9 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Column="0" RowSpacing="18">
+        <Grid Grid.Column="0">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
@@ -42,51 +43,53 @@
                 </interactivity:DataTriggerBehavior>
             </interactivity:Interaction.Behaviors>
 
-            <!--  播放源列表  -->
-            <ListView
-                x:Name="MediaSourceProvidersListView"
+            <InfoBar
                 Grid.Row="0"
-                AllowDrop="True"
-                CanDragItems="True"
-                CanReorderItems="True"
-                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
-                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                ScrollViewer.HorizontalScrollMode="Enabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollMode="Disabled"
-                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <ItemsStackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <ToolTipService.ToolTip>
-                                <ToolTip Content="{Binding Provider, Mode=OneWay}" />
-                            </ToolTipService.ToolTip>
-                            <FontIcon
-                                FontFamily="Segoe UI Symbol"
-                                FontSize="12"
-                                Glyph="&#x283F;" />
-                            <Grid
-                                Width="16"
-                                Height="16"
-                                CornerRadius="4">
-                                <ImageIcon Source="{Binding LogoPath}" />
-                            </Grid>
-                            <TextBlock
-                                MaxWidth="200"
-                                Text="{Binding DisplayName, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
+                IsClosable="False"
+                IsOpen="{x:Bind ViewModel.AppSettings.MusicGallerySettings.LyricsWindowStatus.IsOpened, Mode=OneWay}"
+                Message="音乐库窗口已打开，将忽略对其他播放源的监听"
+                Severity="Informational" />
 
-            <ScrollViewer Grid.Row="1" Style="{StaticResource SettingsScrollViewerStyle}">
+            <!--  播放源列表  -->
+            <Grid Grid.Row="1" Margin="36,0,36,4">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                    <TextBlock x:Uid="SettingsPageConfigPlaybackSource" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                    <ComboBox
+                        x:Name="MediaSourceProvidersListView"
+                        HorizontalAlignment="Stretch"
+                        ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
+                        SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                                <Grid Padding="2,4" ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip Content="{Binding Provider, Mode=OneWay}" />
+                                    </ToolTipService.ToolTip>
+                                    <Grid
+                                        Grid.Column="0"
+                                        Width="16"
+                                        Height="16"
+                                        CornerRadius="4">
+                                        <ImageIcon Source="{Binding LogoPath}" />
+                                    </Grid>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        VerticalAlignment="Center"
+                                        Text="{Binding DisplayName, Mode=OneWay}"
+                                        TextWrapping="Wrap" />
+                                </Grid>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </StackPanel>
+            </Grid>
+
+            <!--  播放源配置  -->
+            <ScrollViewer Grid.Row="2" Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
@@ -269,6 +272,7 @@
 
         </Grid>
 
+        <!--  播放源空白占位  -->
         <StackPanel
             Grid.Column="0"
             HorizontalAlignment="Center"
@@ -294,6 +298,8 @@
                 HorizontalAlignment="Center"
                 Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
         </StackPanel>
+
+        <!--  右侧杂项设置  -->
         <Grid Grid.Column="1">
             <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
@@ -342,12 +348,14 @@
                                     x:Uid="LyricsSearchControlDurauion"
                                     Unit="s"
                                     Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="LyricsPageLanguageCode" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsData.LanguageCode, TargetNullValue=N/A, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
                                 <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="LyricsPageTransliterationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.TransliterationProvider, Mode=OneWay, Converter={StaticResource TransliterationSearchProviderToDisplayNameConverter}}" />
+                                <local:PropertyRow x:Uid="LyricsPageTranslationProviderPrefix" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.TranslationProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
                                 <local:PropertyRow
                                     x:Uid="LyricsPageMatchPercentage"
                                     Unit="%"
@@ -359,6 +367,10 @@
                             </StackPanel>
                         </Expander>
 
+                        <dev:SettingsCard x:Uid="SettingsPageListenNewSession">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
                         <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
                         </dev:SettingsCard>
@@ -386,16 +398,23 @@
                                     <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=TwoWay}" />
                                 </dev:SettingsCard>
                                 <dev:SettingsCard x:Uid="SettingsPageLibreTranslateServer" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=OneWay}">
-                                    <StackPanel Orientation="Horizontal" Spacing="12">
+                                    <Grid ColumnSpacing="6">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
                                         <TextBox
                                             x:Uid="LibreTranslateServerTextBox"
+                                            Grid.Column="0"
                                             IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                                            Text="{x:Bind ViewModel.AppSettings.TranslationSettings.LibreTranslateServer, Mode=TwoWay}" />
+                                            Text="{x:Bind ViewModel.AppSettings.TranslationSettings.LibreTranslateServer, Mode=TwoWay}"
+                                            TextWrapping="Wrap" />
                                         <Button
                                             x:Uid="SettingsPageServerTestButton"
+                                            Grid.Column="1"
                                             Command="{x:Bind ViewModel.LibreTranslateServerTestCommand}"
                                             IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-                                    </StackPanel>
+                                    </Grid>
                                 </dev:SettingsCard>
                             </dev:SettingsExpander.Items>
                         </dev:SettingsExpander>
@@ -413,9 +432,33 @@
                                 </dev:SettingsCard>
                             </dev:SettingsExpander.Items>
                         </dev:SettingsExpander>
-                        <dev:SettingsCard x:Uid="SettingsPageJapanese">
+                        <dev:SettingsExpander x:Uid="SettingsPageJapanese" IsExpanded="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=OneWay}">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=TwoWay}" />
-                        </dev:SettingsCard>
+                            <dev:SettingsExpander.Items>
+                                <dev:SettingsCard x:Uid="SettingsPageCutletDockerServer" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=OneWay}">
+                                    <dev:SettingsCard.Description>
+                                        <HyperlinkButton Content="https://github.com/jayfunc/cutlet-docker" NavigateUri="https://github.com/jayfunc/cutlet-docker" />
+                                    </dev:SettingsCard.Description>
+                                    <Grid ColumnSpacing="6">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBox
+                                            x:Uid="CutletServerTextBox"
+                                            Grid.Column="0"
+                                            IsEnabled="{x:Bind ViewModel.IsCutletDockerServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                                            Text="{x:Bind ViewModel.AppSettings.TranslationSettings.CutletDockerServer, Mode=TwoWay}"
+                                            TextWrapping="Wrap" />
+                                        <Button
+                                            x:Uid="SettingsPageServerTestButton"
+                                            Grid.Column="1"
+                                            Command="{x:Bind ViewModel.CutletDockerServerTestCommand}"
+                                            IsEnabled="{x:Bind ViewModel.IsCutletDockerServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+                                    </Grid>
+                                </dev:SettingsCard>
+                            </dev:SettingsExpander.Items>
+                        </dev:SettingsExpander>
 
                         <!--  中文简体繁体偏好  -->
                         <TextBlock x:Uid="SettingsPageChineseLyrics" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
@@ -514,6 +557,7 @@
                 </Grid>
             </ScrollViewer>
         </Grid>
+
     </Grid>
 
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.RemoteServerConfigControl"
+    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"
+    mc:Ignorable="d">
+
+    <Grid>
+        <StackPanel Width="400" Spacing="16">
+            <ProgressBar
+                x:Name="ProgressBar"
+                IsIndeterminate="True"
+                Visibility="Collapsed" />
+            <InfoBar
+                x:Name="ErrorInfoBar"
+                IsClosable="True"
+                IsOpen="False"
+                Severity="Error" />
+
+            <Grid ColumnDefinitions="*, Auto" ColumnSpacing="12">
+                <TextBox
+                    x:Name="HostBox"
+                    x:Uid="RemoteServerConfigControlServerAddress"
+                    Grid.Column="0"
+                    Header="Server Address"
+                    InputScope="Url"
+                    PlaceholderText="192.168.1.x"
+                    TextWrapping="Wrap" />
+
+                <NumberBox
+                    x:Name="PortBox"
+                    x:Uid="RemoteServerConfigControlPort"
+                    Grid.Column="1"
+                    MinWidth="100"
+                    Header="Port"
+                    LargeChange="10"
+                    SmallChange="1"
+                    SpinButtonPlacementMode="Inline"
+                    ToolTipService.ToolTip="80"
+                    Value="80" />
+            </Grid>
+
+            <TextBox
+                x:Name="PathBox"
+                x:Uid="RemoteServerConfigControlPath"
+                TextWrapping="Wrap" />
+
+            <Grid ColumnDefinitions="*, *" ColumnSpacing="12">
+                <TextBox
+                    x:Name="UserBox"
+                    x:Uid="RemoteServerConfigControlUsername"
+                    Grid.Column="0"
+                    TextWrapping="Wrap" />
+
+                <PasswordBox
+                    x:Name="PwdBox"
+                    x:Uid="RemoteServerConfigControlPassword"
+                    Grid.Column="1"
+                    PasswordRevealMode="Peek" />
+            </Grid>
+        </StackPanel>
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs

@@ -0,0 +1,110 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.ResourceService;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using DevWinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Windows.Storage;
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class RemoteServerConfigControl : UserControl
+    {
+        private readonly string _protocolType;
+        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+
+        public RemoteServerConfigControl(string protocolType)
+        {
+            this.InitializeComponent();
+            _protocolType = protocolType;
+
+            SetupDefaults();
+        }
+
+        private void SetupDefaults()
+        {
+            switch (_protocolType.ToUpper())
+            {
+                case "SMB":
+                    PortBox.Value = 445; // SMB Ĭ<>϶˿<CFB6>
+                    PathBox.PlaceholderText = "SharedMusic";
+                    break;
+                case "FTP":
+                    PortBox.Value = 21; // FTP Ĭ<>϶˿<CFB6>
+                    PathBox.PlaceholderText = "/pub/music";
+                    break;
+                case "WEBDAV":
+                    PortBox.Value = 80; // WebDAV Ĭ<>϶˿<CFB6>
+                    PathBox.PlaceholderText = "/dav/music";
+                    break;
+            }
+        }
+
+        public MediaFolder GetConfig()
+        {
+            if (string.IsNullOrWhiteSpace(HostBox.Text))
+                throw new ArgumentException(_resourceService.GetLocalizedString("RemoteServerConfigControlServerAddressRequired"));
+
+            string name = $"{_protocolType} - {HostBox.Text}";
+
+            Enum.TryParse(_protocolType, true, out FileSourceType sourceType);
+
+            var folder = new MediaFolder
+            {
+                Name = name,
+                Path = HostBox.Text, // <20><><EFBFBD><EFBFBD> Path <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IP/Host
+                Port = (int)PortBox.Value,
+                UserName = UserBox.Text,
+                Password = PwdBox.Password, // <20><> PasswordBox <20><>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD>
+                SourceType = sourceType,
+                IsRealTimeWatchEnabled = false
+            };
+
+            // <20><><EFBFBD>⴦<EFBFBD><E2B4A6>·<EFBFBD><C2B7><EFBFBD><EFBFBD>
+            // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA>"Զ<><D4B6>·<EFBFBD><C2B7>"ƴ<>ӵ<EFBFBD> Path <20><EFBFBD><EFA3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD>ֶδ<D6B6>
+            // Ϊ<>˼򵥣<CBBC><F2B5A5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѭ<EFBFBD><D1AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MediaFolder <20><><EFBFBD>壺
+            // <20><><EFBFBD><EFBFBD> MediaFolder <20><><EFBFBD><EFBFBD><EFBFBD>ټ<EFBFBD>һ<EFBFBD><D2BB> RemotePath <20>ֶΣ<D6B6><CEA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Path <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+            // *<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MediaFolder <20><><EFBFBD>壬<EFBFBD><E5A3AC><EFBFBD>ǿ<EFBFBD><C7BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Լ<EFBFBD><D4BC><EFBFBD><EFBFBD>
+            // Path <20>ֶδ洢<CEB4><E6B4A2>ʽ<EFBFBD><CABD> "192.168.1.5/Music"
+
+            var rawPath = PathBox.Text.Trim().TrimStart('/', '\\'); // ȥ<><C8A5><EFBFBD><EFBFBD>ͷ<EFBFBD><CDB7>б<EFBFBD><D0B1>
+            if (!string.IsNullOrEmpty(rawPath))
+            {
+                // <20>򵥵<EFBFBD>·<EFBFBD><C2B7>ƴ<EFBFBD><C6B4><EFBFBD>߼<EFBFBD>
+                if (sourceType == FileSourceType.SMB)
+                {
+                    // SMBLibrary <20><><EFBFBD>߼<EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD> Host <20>ֿ<EFBFBD><D6BF><EFBFBD>ShareName <20>ֿ<EFBFBD>
+                    // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IP <20><><EFBFBD><EFBFBD> Path <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFA3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA> ShareName ƴ<>ں<EFBFBD><DABA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>
+                    // Ϊ<>˷<EFBFBD><CBB7>㣬<EFBFBD><E3A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IP <20><> ShareName ƴ<><C6B4>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Path
+                    // <20><><EFBFBD><EFBFBD>: 192.168.1.5/Music
+                    folder.Path = $"{HostBox.Text}/{rawPath}";
+                }
+                else
+                {
+                    // FTP/WebDAV: 192.168.1.5/pub/music
+                    folder.Path = $"{HostBox.Text}/{rawPath}";
+                }
+            }
+
+            return folder;
+        }
+
+        public void ShowError(string message)
+        {
+            ErrorInfoBar.Message = message;
+            ErrorInfoBar.IsOpen = true;
+        }
+
+        public void SetProgressBarVisibility(Visibility visibility)
+        {
+            ProgressBar.Visibility = visibility;
+        }
+
+    }
+}

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

@@ -1,17 +1,7 @@
 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.
@@ -76,13 +66,13 @@ namespace BetterLyrics.WinUI3.Controls
         private void UpdateShadowCastGridCornerRadius()
         {
             var minSize = Math.Min(ShadowCastGrid.ActualHeight, ShadowCastGrid.ActualWidth);
-            ShadowCastGrid.CornerRadius = new(CornerRadiusAmount / 100.0 * minSize);
+            ShadowCastGrid.CornerRadius = new(CornerRadiusAmount / 100.0 * (minSize / 2));
         }
 
         private void UpdateShadowRectCornerRadius()
         {
             var minSize = Math.Min(ShadowRect.ActualHeight, ShadowRect.ActualWidth);
-            ShadowRect.CornerRadius = new(CornerRadiusAmount / 100.0 * minSize);
+            ShadowRect.CornerRadius = new(CornerRadiusAmount / 100.0 * (minSize / 2));
         }
 
         private void ShadowCastGrid_SizeChanged(object sender, SizeChangedEventArgs e)

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

@@ -14,9 +14,8 @@
         x:Name="TrayIcon"
         x:FieldModifier="public"
         ContextMenuMode="SecondWindow"
-        DoubleClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
         IconSource="ms-appx:///Assets/Logo.ico"
-        LeftClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
+        LeftClickCommand="{x:Bind ViewModel.OpenLyricsWindowSwitchCommand}"
         NoLeftClickDelay="True"
         ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
         <tb:TaskbarIcon.ContextFlyout>
@@ -39,11 +38,6 @@
                     Command="{x:Bind ViewModel.OpenLyricsSearchWindowCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=&#xE721;}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayLyrics"
-                    Command="{x:Bind ViewModel.OpenLyricsCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE90B;}" />
                 <MenuFlyoutItem
                     x:Uid="SystemTrayMusicGallery"
                     Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"

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

@@ -87,38 +87,25 @@
                     </dev:SettingsExpander>
 
                     <dev:SettingsExpander
-                        x:Uid="SettingsPageWindowBounds"
+                        x:Uid="SettingsPagePinToTaskbar"
                         HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xF16B;}"
-                        IsExpanded="True">
+                                                 Glyph=&#xE7C4;}"
+                        IsExpanded="{x:Bind LyricsWindowStatus.IsPinToTaskbar, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsPinToTaskbar, Mode=TwoWay}" />
                         <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 x:Uid="SettingsPageTaskbarPlacement">
+                                <ComboBox SelectedIndex="{x:Bind LyricsWindowStatus.TaskbarPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLeft" />
+                                    <ComboBoxItem x:Uid="SettingsPageRight" />
+                                </ComboBox>
                             </dev:SettingsCard>
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
+                    <dev:SettingsCard x:Uid="SettingsPageAlwaysHideUnlockButton" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE785;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsWindowStatus.IsAlwaysHideUnlockButton, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
                     <dev:SettingsExpander
                         x:Uid="SettingsPageAOT"
                         HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -140,14 +127,6 @@
                         <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" />

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

@@ -1,23 +1,10 @@
 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.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs

@@ -0,0 +1,30 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class FileSourceTypeToIconConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is FileSourceType type)
+            {
+                return type switch
+                {
+                    FileSourceType.Local => new FontIcon { Glyph = "\uE8B7" }, // Folder
+                    FileSourceType.SMB => new FontIcon { Glyph = "\uE839" },   // Network
+                    FileSourceType.FTP => new FontIcon { Glyph = "\uE838" },   // Globe
+                    FileSourceType.WebDav => new FontIcon { Glyph = "\uE753" }, // Cloud
+                    _ => new FontIcon { Glyph = "\uE8B7" }
+                };
+            }
+            return new FontIcon { Glyph = "\uE8B7" };
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs

@@ -11,7 +11,11 @@ namespace BetterLyrics.WinUI3.Converter
         {
             if (value is string langCode)
             {
-                if (PhoneticHelper.IsPhoneticCode(langCode))
+                if (langCode == "N/A")
+                {
+                    return langCode;
+                }
+                else if (PhoneticHelper.IsPhoneticCode(langCode))
                 {
                     return PhoneticHelper.GetDisplayName(langCode);
                 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs

@@ -1,24 +0,0 @@
-using ATL;
-using BetterLyrics.WinUI3.Extensions;
-using Microsoft.UI.Xaml.Data;
-using System;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public partial class TrackToLyricsConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Track track)
-            {
-                return track.GetRawLyrics();
-            }
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TransliterationSearchProviderToDisplayNameConverter.cs

@@ -0,0 +1,42 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services.ResourceService;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class TransliterationSearchProviderToDisplayNameConverter : IValueConverter
+    {
+        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is TransliterationSearchProvider provider)
+            {
+                return provider switch
+                {
+                    TransliterationSearchProvider.LrcLib => "LrcLib",
+                    TransliterationSearchProvider.QQ => "QQ 音乐",
+                    TransliterationSearchProvider.Netease => "网易云音乐",
+                    TransliterationSearchProvider.Kugou => "酷狗音乐",
+                    TransliterationSearchProvider.AmllTtmlDb => "amll-ttml-db",
+                    TransliterationSearchProvider.AppleMusic => "Apple Music",
+                    TransliterationSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
+                    TransliterationSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
+                    TransliterationSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
+                    TransliterationSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
+                    TransliterationSearchProvider.BetterLyrics => "BetterLyrics",
+                    TransliterationSearchProvider.CutletDocker => "cutlet-docker",
+                    _ => "N/A",
+                };
+            }
+            return "N/A";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/FileSourceType.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum FileSourceType
+    {
+        Local,
+        SMB,
+        FTP,
+        WebDav
+    }
+}

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

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum ImageSwitchType
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineMaskType.cs

@@ -1,8 +0,0 @@
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LineMaskType
-    {
-        Glow,
-        Highlight,
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineRenderingType.cs

@@ -1,11 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LineRenderingType
-    {
-        CurrentChar,
-        LineStartToCurrentChar,
-        CurrentLine
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsEffectScope.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsEffectScope
+    {
+        LongDurationSyllable,
+        LineStartToCurrentChar,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ShortcutID.cs

@@ -3,8 +3,6 @@
     public enum ShortcutID
     {
         LyricsWindowShowOrHide,
-        Borderless,
-        ClickThrough,
         LyricsWindowSwitch,
         PlayOrPauseSong,
         NextSong,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TaskbarPlacement.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum TaskbarPlacement
+    {
+        Left,
+        Right,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TransliterationSearchProvider.cs

@@ -0,0 +1,18 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum TransliterationSearchProvider
+    {
+        QQ,
+        Kugou,
+        Netease,
+        LrcLib,
+        AmllTtmlDb,
+        AppleMusic,
+        LocalMusicFile,
+        LocalLrcFile,
+        LocalEslrcFile,
+        LocalTtmlFile,
+        BetterLyrics,
+        CutletDocker
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/InteractiveAreaEventArgs.cs

@@ -0,0 +1,16 @@
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+
+namespace BetterLyrics.WinUI3.Events
+{
+    public class InteractiveAreaEventArgs : EventArgs
+    {
+        public IList<FrameworkElement> Elements { get; set; }
+
+        public InteractiveAreaEventArgs(IList<FrameworkElement> elements)
+        {
+            Elements = elements;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/TaskbarFreeBoundsChangedEventArgs.cs

@@ -0,0 +1,14 @@
+using System;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Events
+{
+    public class TaskbarFreeBoundsChangedEventArgs : EventArgs
+    {
+        public Rect TaskbarFreeBounds { get; }
+        public TaskbarFreeBoundsChangedEventArgs(Rect taskbarBounds)
+        {
+            TaskbarFreeBounds = taskbarBounds;
+        }
+    }
+}

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

@@ -59,6 +59,21 @@ namespace BetterLyrics.WinUI3.Extensions
                 LyricsSearchProvider.LocalTtmlFile => TranslationSearchProvider.LocalTtmlFile,
                 _ => null,
             };
+
+            public TransliterationSearchProvider? ToTransliterationSearchProvider() => provider switch
+            {
+                LyricsSearchProvider.LrcLib => TransliterationSearchProvider.LrcLib,
+                LyricsSearchProvider.QQ => TransliterationSearchProvider.QQ,
+                LyricsSearchProvider.Kugou => TransliterationSearchProvider.Kugou,
+                LyricsSearchProvider.Netease => TransliterationSearchProvider.Netease,
+                LyricsSearchProvider.AmllTtmlDb => TransliterationSearchProvider.AmllTtmlDb,
+                LyricsSearchProvider.AppleMusic => TransliterationSearchProvider.AppleMusic,
+                LyricsSearchProvider.LocalMusicFile => TransliterationSearchProvider.LocalMusicFile,
+                LyricsSearchProvider.LocalLrcFile => TransliterationSearchProvider.LocalLrcFile,
+                LyricsSearchProvider.LocalEslrcFile => TransliterationSearchProvider.LocalEslrcFile,
+                LyricsSearchProvider.LocalTtmlFile => TransliterationSearchProvider.LocalTtmlFile,
+                _ => null,
+            };
         }
     }
 }

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

@@ -1,8 +1,11 @@
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml;
 using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.Extensions
@@ -11,17 +14,17 @@ namespace BetterLyrics.WinUI3.Extensions
     {
         private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
-        public static LyricsWindowStatus DesktopMode()
+        public static LyricsWindowStatus DesktopMode(Window? window = null)
         {
-            return new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("DesktopMode"),
                 LyricsDisplayType = LyricsDisplayType.LyricsOnly,
                 WindowBounds = new Rect(100, 100, 600, 250),
+                IsLocked = true,
                 IsAlwaysOnTop = true,
                 IsAlwaysOnTopPolling = true,
-                IsBorderless = true,
-                IsClickThrough = true,
                 IsAdaptToEnvironment = true,
                 IsShownInSwitchers = false,
                 EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
@@ -36,20 +39,19 @@ namespace BetterLyrics.WinUI3.Extensions
             };
         }
 
-        public static LyricsWindowStatus DockedMode()
+        public static LyricsWindowStatus DockedMode(Window? window = null)
         {
-            var status = new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            var status = new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("DockedMode"),
                 IsWorkArea = true,
                 IsAlwaysOnTop = true,
                 IsAlwaysOnTopPolling = true,
-                IsBorderless = true,
                 IsAdaptToEnvironment = true,
                 IsShownInSwitchers = false,
                 LyricsDisplayType = LyricsDisplayType.LyricsOnly,
                 EnvironmentSampleMode = WindowPixelSampleMode.BelowWindow,
-                TitleBarArea = TitleBarArea.None,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
                     LyricsAlignmentType = TextAlignmentType.Center,
@@ -64,19 +66,18 @@ namespace BetterLyrics.WinUI3.Extensions
             return status;
         }
 
-        public static LyricsWindowStatus FullscreenMode()
+        public static LyricsWindowStatus FullscreenMode(Window? window = null)
         {
-            var status = new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            var status = new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("FullscreenMode"),
-                IsBorderless = true,
-                IsAlwaysOnTop = true,
-                TitleBarArea = TitleBarArea.None,
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
                     LyricsAlignmentType = TextAlignmentType.Center,
                 },
+                IsFullscreen = true,
             };
             status.WindowBounds = new Rect(
                 status.MonitorBounds.X,
@@ -87,22 +88,49 @@ namespace BetterLyrics.WinUI3.Extensions
             return status;
         }
 
-        public static LyricsWindowStatus StandardMode()
+        public static LyricsWindowStatus StandardMode(Window? window = null)
         {
-            return new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("StandardMode"),
             };
         }
 
-        public static LyricsWindowStatus NarrowMode()
+        public static LyricsWindowStatus NarrowMode(Window? window = null)
         {
-            return new LyricsWindowStatus
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
             {
                 Name = _resourceService.GetLocalizedString("NarrowMode"),
                 WindowBounds = new Rect(100, 100, 400, 800),
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
             };
         }
+
+        public static LyricsWindowStatus TaskbarMode(Window? window = null)
+        {
+            window ??= WindowHook.GetWindow<SystemTrayWindow>();
+            return new LyricsWindowStatus(window)
+            {
+                Name = _resourceService.GetLocalizedString("TaskbarMode"),
+                LyricsDisplayType = LyricsDisplayType.LyricsOnly,
+                IsPinToTaskbar = true,
+                IsLocked = true,
+                IsAlwaysOnTop = true,
+                IsAlwaysOnTopPolling = true,
+                IsAdaptToEnvironment = true,
+                IsShownInSwitchers = false,
+                EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
+                LyricsStyleSettings = new()
+                {
+                    LyricsAlignmentType = TextAlignmentType.Center,
+                },
+                LyricsBackgroundSettings = new LyricsBackgroundSettings
+                {
+                    IsFluidOverlayEnabled = false,
+                }
+            };
+        }
     }
 }

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

@@ -1,4 +1,5 @@
-using Windows.Foundation;
+using Vanara.PInvoke;
+using Windows.Foundation;
 using Windows.Graphics;
 
 namespace BetterLyrics.WinUI3.Extensions
@@ -77,5 +78,15 @@ namespace BetterLyrics.WinUI3.Extensions
                 );
             }
         }
+
+        extension(RECT rect)
+        {
+            public Rect ToRect() => new(
+                rect.Left,
+                rect.Top,
+                rect.Right - rect.Left,
+                rect.Bottom - rect.Top
+            );
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/RectangleExtensions.cs

@@ -0,0 +1,18 @@
+using System.Drawing;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class RectangleExtensions
+    {
+        extension(Rectangle rect)
+        {
+            public Rect ToRect() => new(
+                rect.Left,
+                rect.Top,
+                rect.Right - rect.Left,
+                rect.Bottom - rect.Top
+            );
+        }
+    }
+}

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

@@ -1,31 +0,0 @@
-using ATL;
-using System.IO;
-
-namespace BetterLyrics.WinUI3.Extensions
-{
-    public static class TrackExtensions
-    {
-        extension(Track track)
-        {
-            public string GetParentFolderName() => Directory.GetParent(track.Path)?.Name ?? "";
-
-            public string GetParentFolderPath() => Directory.GetParent(track.Path)?.FullName ?? "";
-
-            public string GetRawLyrics()
-            {
-                if (track.Path is string path)
-                {
-                    try
-                    {
-                        return TagLib.File.Create(path).Tag.Lyrics;
-                    }
-                    catch (System.Exception)
-                    {
-                        return "";
-                    }
-                }
-                return "";
-            }
-        }
-    }
-}

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

@@ -1,8 +1,8 @@
 using Microsoft.Graphics.Canvas.Text;
-using Microsoft.UI.Xaml;
-using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Windows.Documents;
 using System.Windows.Markup;
 using System.Windows.Media;
 
@@ -10,8 +10,6 @@ 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 == "")
@@ -35,5 +33,20 @@ namespace BetterLyrics.WinUI3.Helper
 
             return sourceName;
         }
+
+        public static List<string> GetSystemFontFamilies()
+        {
+            List<string> fontFamilies = new();
+
+            foreach (var font in Fonts.SystemFontFamilies)
+            {
+                if (font.FamilyNames.TryGetValue(XmlLanguage.GetLanguage("en-us"), out string englishFamilyName))
+                {
+                    fontFamilies.Add(englishFamilyName);
+                }
+            }
+
+            return fontFamilies.Order().ToList();
+        }
     }
 }

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

@@ -2,7 +2,6 @@
 
 using BetterLyrics.WinUI3.Enums;
 using Impressionist.Abstractions;
-using Microsoft.Graphics.Canvas;
 using System;
 using System.IO;
 using System.Linq;
@@ -53,42 +52,13 @@ namespace BetterLyrics.WinUI3.Helper
             return buffer;
         }
 
-        public static async Task<BitmapDecoder> MakeSquareWithThemeColor(IBuffer buffer, PaletteGeneratorType generatorType)
+        public static async Task<BitmapDecoder> GetBitmapDecoder(IBuffer buffer)
         {
             using var stream = new InMemoryRandomAccessStream();
             await stream.WriteAsync(buffer);
             var decoder = await BitmapDecoder.CreateAsync(stream);
 
-            if (decoder.PixelWidth == decoder.PixelHeight)
-            {
-                // 已经是正方形，直接返回
-                return decoder;
-            }
-
-            using var device = CanvasDevice.GetSharedDevice();
-            using var canvasBitmap = await CanvasBitmap.LoadAsync(device, stream);
-            var size = Math.Max(decoder.PixelWidth, decoder.PixelHeight);
-
-            var result = await GetAccentColorAsync(decoder, generatorType);
-            var color = Windows.UI.Color.FromArgb(255, (byte)result.Color.X, (byte)result.Color.Y, (byte)result.Color.Z);
-            using var renderTarget = new CanvasRenderTarget(device, size, size, 96);
-
-            int offsetX = (int)(size - decoder.PixelWidth) / 2;
-            int offsetY = (int)(size - decoder.PixelHeight) / 2;
-            using (var ds = renderTarget.CreateDrawingSession())
-            {
-                ds.FillRectangle(0, 0, size, size, color);
-                ds.DrawImage(canvasBitmap, offsetX, offsetY);
-            }
-
-            // 保存为 PNG 并转为 byte[]
-            stream.Seek(0);
-            stream.Size = 0;
-            await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
-            stream.Seek(0);
-            var newDecoder = await BitmapDecoder.CreateAsync(stream);
-            return newDecoder;
-
+            return decoder;
         }
 
         public static byte[] GenerateNoiseBGRA(int width, int height)

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

@@ -107,7 +107,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static string? DetectLanguageCode(string? text)
         {
-            if (text == null) return null;
+            if (string.IsNullOrWhiteSpace(text)) return null;
             var guessList = _identifier.Identify(text);
             string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
             code = code switch

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/OverlayInputHelper.cs

@@ -0,0 +1,124 @@
+using BetterLyrics.WinUI3.Events;
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using Vanara.PInvoke;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    /// <summary>
+    /// 用于管理覆盖层窗口的鼠标交互区域检测
+    /// </summary>
+    public class OverlayInputHelper
+    {
+        private readonly Window _window;
+        private readonly IntPtr _hwnd;
+        private readonly DispatcherTimer _timer;
+        private readonly List<FrameworkElement> _interactiveControls = new();
+
+        private bool _wasOverControl = false;
+
+        public Action<InteractiveAreaEventArgs> OnInteractiveAreaEntered;
+        public Action<InteractiveAreaEventArgs> OnInteractiveAreaMoved;
+        public Action OnInteractiveAreaExited;
+
+        public OverlayInputHelper(Window window)
+        {
+            _window = window;
+            _hwnd = WinRT.Interop.WindowNative.GetWindowHandle(_window);
+
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromMilliseconds(50);
+            _timer.Tick += Timer_Tick;
+        }
+
+        public void Register(FrameworkElement element)
+        {
+            if (!_interactiveControls.Contains(element)) _interactiveControls.Add(element);
+        }
+
+        public void Unregister(FrameworkElement element)
+        {
+            if (_interactiveControls.Contains(element)) _interactiveControls.Remove(element);
+        }
+
+        public void Start()
+        {
+            _timer.Start();
+            OnInteractiveAreaExited?.Invoke();
+        }
+
+        public void Stop()
+        {
+            _timer.Stop();
+        }
+
+        private void Timer_Tick(object? sender, object e)
+        {
+            User32.GetCursorPos(out var mousePoint);
+
+            bool isOverAnyControl = false;
+
+            List<FrameworkElement> overlappedElements = new();
+
+            foreach (var control in _interactiveControls)
+            {
+                if (control.XamlRoot == null || !control.XamlRoot.IsHostVisible) continue;
+
+                var bounds = GetElementScreenBounds(control);
+
+                if (mousePoint.X >= bounds.X &&
+                    mousePoint.X <= (bounds.X + bounds.Width) &&
+                    mousePoint.Y >= bounds.Y &&
+                    mousePoint.Y <= (bounds.Y + bounds.Height))
+                {
+                    isOverAnyControl = true;
+                    overlappedElements.Add(control);
+                }
+            }
+
+            if (isOverAnyControl)
+            {
+                OnInteractiveAreaMoved?.Invoke(new InteractiveAreaEventArgs(overlappedElements));
+            }
+
+            if (isOverAnyControl != _wasOverControl)
+            {
+                if (isOverAnyControl)
+                {
+                    OnInteractiveAreaEntered?.Invoke(new InteractiveAreaEventArgs(overlappedElements));
+                }
+                else
+                {
+                    OnInteractiveAreaExited?.Invoke();
+                }
+
+                _wasOverControl = isOverAnyControl;
+            }
+        }
+
+        private Rect GetElementScreenBounds(FrameworkElement element)
+        {
+            try
+            {
+                var transform = element.TransformToVisual(null);
+                var topLeft = transform.TransformPoint(new Point(0, 0));
+                double dpiScale = element.XamlRoot.RasterizationScale;
+
+                int clientX = (int)(topLeft.X * dpiScale);
+                int clientY = (int)(topLeft.Y * dpiScale);
+
+                var point = new POINT { X = clientX, Y = clientY };
+                User32.ClientToScreen(_hwnd, ref point);
+
+                return new Rect(point.X, point.Y, element.ActualWidth * dpiScale, element.ActualHeight * dpiScale);
+            }
+            catch
+            {
+                return Rect.Empty;
+            }
+        }
+
+    }
+}

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

@@ -1,4 +1,5 @@
-using Windows.Security.Credentials;
+using System;
+using Windows.Security.Credentials;
 
 namespace BetterLyrics.WinUI3.Helper
 {
@@ -12,23 +13,13 @@ namespace BetterLyrics.WinUI3.Helper
         /// <param name="value">要保存的值</param>
         public static void Save(string resource, string key, string value)
         {
-            // 删除旧值（避免重复存储）
             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
-            {
-                // 没有旧值就忽略
-            }
+            catch (Exception) { }
         }
 
         /// <summary>
@@ -47,7 +38,7 @@ namespace BetterLyrics.WinUI3.Helper
                 credential.RetrievePassword();
                 return credential.Password;
             }
-            catch
+            catch (Exception)
             {
                 return null;
             }
@@ -65,10 +56,7 @@ namespace BetterLyrics.WinUI3.Helper
                 var credential = vault.Retrieve(resource, key);
                 vault.Remove(credential);
             }
-            catch
-            {
-                // 不存在就忽略
-            }
+            catch (Exception) { }
         }
     }
 }

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

@@ -32,11 +32,6 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static string ToRomaji(string text)
-        {
-            return Kana.Kana.KanaToRomaji(text, Kana.Error.Ignore).ToStr();
-        }
-
         public static string ToPinyin(string text, Pinyin.ManTone.Style style = Pinyin.ManTone.Style.TONE)
         {
             return Pinyin.Pinyin.Instance.HanziToPinyin(text, style).ToStr();

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs

@@ -1,5 +1,6 @@
 using BetterLyrics.WinUI3.Hooks;
 using DevWinUI;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -45,6 +46,12 @@ namespace BetterLyrics.WinUI3.Helper
         public static async Task<StorageFile?> PickSaveFileAsync<T>(IDictionary<string, IList<string>> fileTypeChoices)
         {
             var window = WindowHook.GetWindow<T>();
+
+            return await PickSaveFileAsync(window, fileTypeChoices);
+        }
+
+        public static async Task<StorageFile?> PickSaveFileAsync<T>(T? window, IDictionary<string, IList<string>> fileTypeChoices)
+        {
             if (window == null) return null;
 
             var picker = new Windows.Storage.Pickers.FileSavePicker();

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

@@ -29,6 +29,8 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static bool IsAppleMusic(string? id) => id is PlayerID.AppleMusic or PlayerID.AppleMusicAlternative;
 
+        public static bool IsBetterLyrics(string? id) => id is PlayerID.BetterLyrics or PlayerID.BetterLyricsDebug;
+
         public static string? GetDisplayName(string? id) => id switch
         {
             PlayerID.Spotify => PlayerName.Spotify,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/ForegroundWindowHook.cs

@@ -66,7 +66,7 @@ namespace BetterLyrics.WinUI3.Hooks
 
             _hooks.Clear();
 
-            //_timer.Stop();
+            _timer.Stop();
         }
 
         private void Timer_Tick(object? sender, object e)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/GlobalHotKeyHook.cs

@@ -1,4 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using Vanara.PInvoke;
@@ -19,13 +20,10 @@ namespace BetterLyrics.WinUI3.Hooks
         /// <param name="id"></param>
         /// <param name="keys"></param>
         /// <param name="action"></param>
-        private static void RegisterHotKey<T>(ShortcutID id, List<string> keys, Action action)
+        private static void RegisterHotKey(Window window, ShortcutID id, List<string> keys, Action action)
         {
             if (keys.Count == 0) return;
 
-            var window = WindowHook.GetWindow<T>();
-            if (window == null) return;
-
             HWND hwnd = WindowNative.GetWindowHandle(window);
             User32.HotKeyModifiers modifiers = User32.HotKeyModifiers.MOD_NONE;
             VirtualKey key = VirtualKey.None;
@@ -60,21 +58,18 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        private static void UnregisterHotKey<T>(ShortcutID id)
+        private static void UnregisterHotKey(Window window, ShortcutID id)
         {
-            var window = WindowHook.GetWindow<T>();
-            if (window == null) return;
-
             HWND hwnd = WindowNative.GetWindowHandle(window);
             User32.UnregisterHotKey(hwnd, (int)id);
             _actions.Remove((int)id);
             _keys.Remove((int)id);
         }
 
-        public static void UpdateHotKey<T>(ShortcutID id, List<string> keys, Action action)
+        public static void UpdateHotKey(Window window, ShortcutID id, List<string> keys, Action action)
         {
-            UnregisterHotKey<T>(id);
-            RegisterHotKey<T>(id, keys, action);
+            UnregisterHotKey(window, id);
+            RegisterHotKey(window, id, keys, action);
         }
 
         public static bool IsHotKeyRegistered(ShortcutID id)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs

@@ -0,0 +1,211 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Events;
+using BetterLyrics.WinUI3.Extensions;
+using FlaUI.Core.AutomationElements;
+using FlaUI.Core.Definitions;
+using FlaUI.Core.EventHandlers;
+using FlaUI.UIA3;
+using Microsoft.UI.Dispatching;
+using System;
+using System.Drawing;
+using System.Threading;
+
+namespace BetterLyrics.WinUI3.Hooks
+{
+    public partial class TaskbarHook : IDisposable
+    {
+        private readonly UIA3Automation _automation;
+        private AutomationElement? _taskbar;
+
+        private StructureChangedEventHandlerBase? _structureHandler;
+        private PropertyChangedEventHandlerBase? _propertyHandler;
+
+        private TaskbarPlacement _currentPlacement;
+
+        private readonly DispatcherQueue _dispatcherQueue;
+        private readonly Action<TaskbarFreeBoundsChangedEventArgs> _onLayoutChanged;
+        private Timer? _debounceTimer;
+        private const int DebounceDelay = 150;
+        private bool _isDisposed;
+
+        public TaskbarHook(TaskbarPlacement placement, Action<TaskbarFreeBoundsChangedEventArgs> onLayoutChanged)
+        {
+            _automation = new UIA3Automation();
+            _onLayoutChanged = onLayoutChanged;
+            _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
+            _currentPlacement = placement;
+
+            StartHook();
+        }
+
+        public void UpdatePlacement(TaskbarPlacement newPlacement)
+        {
+            _currentPlacement = newPlacement;
+            RequestUpdate(); // 立即刷新位置
+        }
+
+        private void StartHook()
+        {
+            try
+            {
+                var desktop = _automation.GetDesktop();
+                _taskbar = desktop.FindFirstChild(cf => cf.ByClassName("Shell_TrayWnd"));
+
+                if (_taskbar == null) return;
+
+                // 监听结构变化
+                // 这里的返回值就是一个可以 Dispose 的对象
+                _structureHandler = _taskbar.RegisterStructureChangedEvent(
+                    TreeScope.Descendants,
+                    (element, type, id) => RequestUpdate());
+
+                // 监听属性变化
+                _propertyHandler = _taskbar.RegisterPropertyChangedEvent(
+                    TreeScope.Element,
+                    (element, id, val) => RequestUpdate(),
+                    _automation.PropertyLibrary.Element.BoundingRectangle);
+
+                RequestUpdate();
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Hook Init Failed: {ex.Message}");
+            }
+        }
+
+        private void RequestUpdate()
+        {
+            if (_isDisposed) return;
+            _debounceTimer?.Dispose();
+            _debounceTimer = new Timer(_ =>
+            {
+                Rectangle voidRect = CalculateVoidRect(_currentPlacement);
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    if (!_isDisposed && voidRect != Rectangle.Empty)
+                    {
+                        _onLayoutChanged?.Invoke(new TaskbarFreeBoundsChangedEventArgs(voidRect.ToRect()));
+                    }
+                });
+            }, null, DebounceDelay, Timeout.Infinite);
+        }
+
+        private Rectangle CalculateVoidRect(TaskbarPlacement placement)
+        {
+            try
+            {
+                if (_taskbar == null) return Rectangle.Empty;
+
+                try { var _ = _taskbar.BoundingRectangle; }
+                catch
+                {
+                    var desktop = _automation.GetDesktop();
+                    _taskbar = desktop.FindFirstChild(cf => cf.ByClassName("Shell_TrayWnd"));
+                    if (_taskbar == null) return Rectangle.Empty;
+                }
+
+                Rectangle taskbarRect = _taskbar.BoundingRectangle;
+
+                // 绝对右边界：托盘
+                int barrierRight = taskbarRect.Right;
+                var tray = _taskbar.FindFirstDescendant(cf => cf.ByAutomationId("SystemTrayIcon")); // Win11
+                if (tray == null) tray = _taskbar.FindFirstDescendant(cf => cf.ByClassName("TrayNotifyWnd")); // Win10
+                if (tray != null) barrierRight = tray.BoundingRectangle.Left;
+
+                // 绝对左边界：任务栏左边缘 或 小组件(Win11)
+                int barrierLeft = taskbarRect.Left;
+                var widgets = _taskbar.FindFirstDescendant(cf => cf.ByAutomationId("WidgetsButton"));
+
+                // 只有当小组件确实在最左侧时 (Win11默认)，它才构成左边界
+                // 如果用户把任务栏设为靠左对齐，小组件会在开始按钮右边，这时候不把它当做左边界
+                if (widgets != null && widgets.BoundingRectangle.Left < taskbarRect.Left + 100)
+                {
+                    barrierLeft = (int)widgets.BoundingRectangle.Right;
+                }
+
+
+                // 寻找 中间内容区域 (Start + Search + Apps) 的 左右极值
+                int contentMinLeft = barrierRight;
+                int contentMaxRight = barrierLeft;
+
+                // 定义所有中间元素
+                string[] systemButtonIds = new[] {
+                    "StartButton", "SearchButton", "TaskViewButton", "ChatButton"
+                };
+
+                // 系统按钮
+                foreach (var id in systemButtonIds)
+                {
+                    var btn = _taskbar.FindFirstDescendant(cf => cf.ByAutomationId(id));
+                    if (btn != null)
+                    {
+                        var rect = btn.BoundingRectangle;
+                        // 排除不可见的
+                        if (rect.Width <= 0) continue;
+
+                        // 更新极值
+                        if (rect.Left < contentMinLeft) contentMinLeft = (int)rect.Left;
+                        if (rect.Right > contentMaxRight) contentMaxRight = (int)rect.Right;
+                    }
+                }
+
+                // App 图标
+                var appIcons = _taskbar.FindAllDescendants(cf => cf.ByClassName("Taskbar.TaskListButtonAutomationPeer"));
+                foreach (var icon in appIcons)
+                {
+                    var rect = icon.BoundingRectangle;
+                    if (rect.Width <= 0) continue;
+
+                    if (rect.Left < contentMinLeft) contentMinLeft = (int)rect.Left;
+                    if (rect.Right > contentMaxRight) contentMaxRight = (int)rect.Right;
+                }
+
+                // 如果完全没找到内容，重置为中间
+                if (contentMinLeft == barrierRight) contentMinLeft = taskbarRect.Left;
+                if (contentMaxRight == barrierLeft) contentMaxRight = taskbarRect.Left;
+
+                int finalLeft, finalRight;
+                int padding = 10;
+
+                if (placement == TaskbarPlacement.Left)
+                {
+                    // 【小组件】... [空隙] ...【开始按钮】
+                    // 如果是 Win10 或 Win11左对齐，contentMinLeft 几乎等于 barrierLeft，空隙为0
+                    finalLeft = barrierLeft + padding;
+                    finalRight = contentMinLeft - padding;
+                }
+                else // Right
+                {
+                    // 【最后一个图标】... [空隙] ...【托盘】
+                    finalLeft = contentMaxRight + padding;
+                    finalRight = barrierRight - padding;
+                }
+
+                int width = finalRight - finalLeft;
+
+                if (width < 20) return Rectangle.Empty;
+
+                return new Rectangle(finalLeft, taskbarRect.Top, width, taskbarRect.Height);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Calc Rect Error: {ex.Message}");
+                return Rectangle.Empty;
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_isDisposed) return;
+            _isDisposed = true;
+
+            _debounceTimer?.Dispose();
+
+            _structureHandler?.Dispose();
+            _propertyHandler?.Dispose();
+
+            _automation?.Dispose();
+        }
+    }
+}

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

@@ -1,11 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
-using BetterLyrics.WinUI3.Services.MediaSessionsService;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Views;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
@@ -26,42 +23,31 @@ namespace BetterLyrics.WinUI3.Hooks
         private static List<object> _activeWindows = [];
         private static List<object> _workAreas = [];
 
-        private static readonly Dictionary<HWND, WindowStyle> _defaultWindowStyle = [];
-        private static readonly Dictionary<HWND, ExtendedWindowStyle> _defaultExtendedWindowStyle = [];
+        private static WindowStyle? _defaultWindowStyle;
+        private static ExtendedWindowStyle? _defaultExtendedWindowStyle;
 
-        private static readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
-        private static readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
-
-        private static DispatcherQueueTimer? _setLyricsWindowVisibilityByPlayingStatusTimer;
-
-        public static void HideWindow<T>()
+        public static void HideWindow(this Window window)
         {
-            var window = _activeWindows.Find(w => w is T);
-            var castedWindow = window as Window;
-            castedWindow?.Hide();
+            window.Hide();
         }
 
-        public static void CloseWindow<T>()
+        public static void CloseWindow(this Window window)
         {
-            if (typeof(T) == typeof(NowPlayingWindow))
+            if (window is NowPlayingWindow nowPlayingWindow)
             {
-                EnsureDockModeReleased();
-            }
-            var window = _activeWindows.Find(w => w is T);
-            if (window is Window w)
-            {
-                w.Close();
-                _activeWindows.Remove(w);
+                if (GetWindowHandle(window) is IntPtr hwnd)
+                {
+                    UnregisterWorkArea(hwnd);
+                }
+                nowPlayingWindow.LyricsWindowStatus.IsOpened = false;
             }
+            window.Close();
+            _activeWindows.Remove(window);
         }
 
-        public static void MinimizeWindow<T>()
+        public static void MinimizeWindow(this Window window)
         {
-            var window = _activeWindows.Find(w => w is T);
-            if (window is Window w)
-            {
-                w.Minimize();
-            }
+            window.Minimize();
         }
 
         public static T? GetWindow<T>()
@@ -76,15 +62,28 @@ namespace BetterLyrics.WinUI3.Hooks
             return default;
         }
 
+        public static List<T> GetWindows<T>()
+        {
+            var windows = new List<T>();
+            foreach (var window in _activeWindows)
+            {
+                if (window is T castedWindow)
+                {
+                    windows.Add(castedWindow);
+                }
+            }
+            return windows;
+        }
+
         public static IntPtr? GetWindowHandle(object? obj)
         {
             if (obj is FrameworkElement frameworkElement)
             {
                 return frameworkElement.XamlRoot.ContentIslandEnvironment.AppWindowId.GetWindowHandle();
             }
-            else if (obj != null)
+            else if (obj is Window window)
             {
-                return WindowNative.GetWindowHandle(obj);
+                return WindowNative.GetWindowHandle(window);
             }
             else
             {
@@ -97,16 +96,22 @@ namespace BetterLyrics.WinUI3.Hooks
             return GetWindowHandle(GetWindow<T>());
         }
 
-        public static void OpenOrShowWindow<T>()
+        public static T OpenOrShowWindow<T>(LyricsWindowStatus? status = null)
         {
-            var window = _activeWindows.Find(w => w is T);
-            //window = null;
+            var window = _activeWindows.Find(w =>
+                (typeof(T) != typeof(NowPlayingWindow) && w is T) ||
+                (typeof(T) == typeof(NowPlayingWindow) && w is T && ((NowPlayingWindow)w).LyricsWindowStatus == status)
+            );
+
             if (window == null)
             {
                 if (typeof(T) == typeof(NowPlayingWindow))
                 {
-                    window = new NowPlayingWindow();
-                    ((NowPlayingWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
+                    if (status == null)
+                    {
+                        throw new NullReferenceException(nameof(status));
+                    }
+                    window = new NowPlayingWindow(status);
                 }
                 else if (typeof(T) == typeof(SettingsWindow))
                 {
@@ -135,33 +140,24 @@ namespace BetterLyrics.WinUI3.Hooks
 
                 TrackWindow(window);
                 var castedWindow = (Window)window;
+
                 castedWindow.Restore();
                 castedWindow.Activate();
 
+                if (typeof(T) == typeof(SystemTrayWindow))
+                {
+                    _defaultWindowStyle = castedWindow.GetWindowStyle();
+                    _defaultExtendedWindowStyle = castedWindow.GetExtendedWindowStyle();
+                    castedWindow.HideWindow();
+                }
+
                 if (typeof(T) == typeof(NowPlayingWindow))
                 {
-                    _liveStatesService.InitLyricsWindowStatus();
-
                     var hwnd = WindowNative.GetWindowHandle(castedWindow);
-                    _defaultWindowStyle.Add(hwnd, castedWindow.GetWindowStyle());
-                    _defaultExtendedWindowStyle.Add(hwnd, castedWindow.GetExtendedWindowStyle());
 
                     var lyricsWindow = (NowPlayingWindow)window;
-                    lyricsWindow.ViewModel.InitShortcuts();
-                    lyricsWindow.ViewModel.InitFgWindowWatcher();
-
-                    _mediaSessionsService.InitPlaybackShortcuts();
-
-                    //TaskbarList.ThumbBarAddButtons(hwnd,
-                    //    [
-                    //        new Shell32.THUMBBUTTON()
-                    //        {
-                    //            szTip = "Previous",
-                    //            dwFlags = Shell32.THUMBBUTTONFLAGS.THBF_ENABLED,
-                    //            dwMask = Shell32.THUMBBUTTONMASK.THB_TOOLTIP | Shell32.THUMBBUTTONMASK.THB_FLAGS,
-                    //        }
-                    //    ]
-                    //);
+                    lyricsWindow.InitStatus();
+                    lyricsWindow.InitFgWindowWatcher();
                 }
             }
             else
@@ -170,6 +166,13 @@ namespace BetterLyrics.WinUI3.Hooks
                 castedWindow.Activate();
                 castedWindow.AppWindow.MoveInZOrderAtTop();
             }
+
+            if (typeof(T) == typeof(NowPlayingWindow))
+            {
+                ((NowPlayingWindow)window).LyricsWindowStatus.IsOpened = true;
+            }
+
+            return (T)window;
         }
 
         public static void RestartApp(string args = "")
@@ -194,13 +197,19 @@ namespace BetterLyrics.WinUI3.Hooks
 
         public static void ExitApp()
         {
-            EnsureDockModeReleased();
+            EnsureAllWorkAreasReleased();
             Environment.Exit(0);
         }
 
-        private static void EnsureDockModeReleased()
+        private static void EnsureAllWorkAreasReleased()
         {
-            SetIsWorkArea<NowPlayingWindow>(false);
+            foreach (var item in _workAreas)
+            {
+                if (GetWindowHandle(item) is IntPtr hwnd)
+                {
+                    UnregisterWorkArea(hwnd);
+                }
+            }
         }
 
         private static void TrackWindow(object window)
@@ -215,43 +224,18 @@ namespace BetterLyrics.WinUI3.Hooks
 
         private static void WindowHelper_Closed(object sender, WindowEventArgs args)
         {
-            if (_activeWindows.Contains(sender))
-            {
-                _activeWindows.Remove(sender);
-
-                var hwnd = WindowNative.GetWindowHandle(sender);
-                _defaultWindowStyle.Remove(hwnd);
-                _defaultExtendedWindowStyle.Remove(hwnd);
-            }
+            _activeWindows.Remove(sender);
         }
 
-        public static void SetIsClickThrough<T>(bool enable)
+        public static void SetIsWorkArea(this NowPlayingWindow window, bool enable)
         {
-            Window? window = GetWindow<T>() as Window;
             if (window == null) return;
 
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
 
             if (enable)
             {
-                window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd] | ExtendedWindowStyle.Transparent | ExtendedWindowStyle.Layered);
-            }
-            else
-            {
-                window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd]);
-            }
-        }
-
-        public static void SetIsWorkArea<T>(bool enable)
-        {
-            Window? window = GetWindow<T>() as Window;
-            if (window == null) return;
-
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (enable)
-            {
-                RegisterWorkArea(hwnd);
+                RegisterWorkArea(hwnd, window.LyricsWindowStatus);
             }
             else
             {
@@ -259,35 +243,86 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        public static void SetIsBorderless<T>(bool enable)
+        public static void SetIsLocked(this Window window, bool enable)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            SetIsBorderless(window, enable);
+            SetIsClickThrough(window, enable);
+        }
 
-            var hwnd = WindowNative.GetWindowHandle(window);
-
-            if (enable)
+        public static void SetIsClickThrough(this Window window, bool enable)
+        {
+            if (_defaultExtendedWindowStyle is ExtendedWindowStyle style)
             {
-                window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
-            }
-            else
-            {
-                window.SetWindowStyle(_defaultWindowStyle[hwnd]);
+                if (enable)
+                {
+                    window.SetExtendedWindowStyle(style | ExtendedWindowStyle.Layered | ExtendedWindowStyle.Transparent);
+                }
+                else
+                {
+                    window.SetExtendedWindowStyle(style);
+                }
             }
         }
 
-        public static void SetIsShowInSwitchers<T>(bool enable)
+        public static void SetIsBorderless(this Window window, bool enable)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            if (_defaultWindowStyle is WindowStyle style)
+            {
+                if (enable)
+                {
+                    window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+                }
+                else
+                {
+                    window.SetWindowStyle(style);
+                }
+            }
+        }
+
+        public static bool SetIsFullscreen(this Window window, bool enable, bool defaultExtendsContentIntoTitleBar = true)
+        {
+            if (window.AppWindow == null) return false;
+
+            if (enable)
+            {
+                window.ExtendsContentIntoTitleBar = false;
+                window.AppWindow.SetPresenter(AppWindowPresenterKind.FullScreen);
+            }
+            else
+            {
+                window.ExtendsContentIntoTitleBar = defaultExtendsContentIntoTitleBar;
+                window.AppWindow.SetPresenter(AppWindowPresenterKind.Overlapped);
+            }
+
+            return true;
+        }
+
+        public static bool SetIsMaximized(this Window window, bool enable)
+        {
+            if (window.AppWindow == null) return false;
+
+            if (enable)
+            {
+                window.Maximize();
+            }
+            else
+            {
+                window.Restore();
+            }
+
+            return true;
+        }
+
+        public static void SetIsShowInSwitchers(this Window window, bool enable)
+        {
+            if (window.AppWindow == null) return;
 
             window.AppWindow.IsShownInSwitchers = enable;
         }
 
-        public static void SetIsAlwaysOnTop<T>(bool enable)
+        public static void SetIsAlwaysOnTop(this Window window, bool enable)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            if (window.AppWindow == null) return;
 
             if (window.AppWindow.Presenter is OverlappedPresenter presenter)
             {
@@ -295,36 +330,27 @@ namespace BetterLyrics.WinUI3.Hooks
             }
         }
 
-        public static void MoveAndResize<T>(Rect rect)
+        public static void MoveAndResize(this Window window, Rect rect)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
+            if (window.AppWindow == null) return;
 
             window.AppWindow.Move(new Windows.Graphics.PointInt32((int)rect.X, (int)rect.Y));
             window.AppWindow.Resize(new Windows.Graphics.SizeInt32((int)rect.Width, (int)rect.Height));
         }
 
-        public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
+        public static void SetTitleBarArea(this NowPlayingWindow window, TitleBarArea titleBarArea)
         {
-            if (typeof(T) == typeof(NowPlayingWindow))
-            {
-                NowPlayingWindow? lyricsWindow = GetWindow<NowPlayingWindow>();
-                lyricsWindow?.SetTitleBarArea(titleBarArea);
-            }
-            else
-            {
-                throw new Exception($"Unsupported window type: {typeof(T).FullName}");
-            }
+            window.SetTitleBarArea(titleBarArea);
         }
 
-        private static void RegisterWorkArea(IntPtr hwnd)
+        private static void RegisterWorkArea(IntPtr hwnd, LyricsWindowStatus status)
         {
             if (_workAreas.Contains(hwnd)) return;
 
-            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+            var uEdge = status.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
 
-            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top : _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
-            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            double top = status.DockPlacement == DockPlacement.Top ? status.MonitorBounds.Top : status.MonitorBounds.Bottom - status.DockHeight;
+            double bottom = top + status.DockHeight;
 
             Shell32.APPBARDATA abd = new()
             {
@@ -333,9 +359,9 @@ namespace BetterLyrics.WinUI3.Hooks
                 uEdge = uEdge,
                 rc = new RECT
                 {
-                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Left = (int)status.MonitorBounds.Left,
                     Top = (int)top,
-                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Right = (int)status.MonitorBounds.Right,
                     Bottom = (int)bottom,
                 },
             };
@@ -363,23 +389,22 @@ namespace BetterLyrics.WinUI3.Hooks
             _workAreas.Remove(hwnd);
         }
 
-        public static void UpdateWorkArea<T>()
+        public static void UpdateWorkArea(this NowPlayingWindow window)
         {
-            var window = GetWindow<T>() as Window;
-            if (window == null) return;
-
             var hwnd = WindowNative.GetWindowHandle(window);
 
             if (!_workAreas.Contains(hwnd))
                 return;
 
-            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+            var status = window.LyricsWindowStatus;
 
-            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
-                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
-                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            var uEdge = status.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
 
-            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            double top = status.DockPlacement == DockPlacement.Top ?
+                status.MonitorBounds.Top :
+                status.MonitorBounds.Bottom - status.DockHeight;
+
+            double bottom = top + status.DockHeight;
 
             Shell32.APPBARDATA abd = new()
             {
@@ -388,9 +413,9 @@ namespace BetterLyrics.WinUI3.Hooks
                 uEdge = uEdge,
                 rc = new RECT
                 {
-                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Left = (int)status.MonitorBounds.Left,
                     Top = (int)top,
-                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Right = (int)status.MonitorBounds.Right,
                     Bottom = (int)bottom,
                 },
             };
@@ -403,37 +428,32 @@ namespace BetterLyrics.WinUI3.Hooks
         /// 
         /// </summary>
         /// <param name="dispatcherQueue">请确保此参数指向同一个对象，建议传值 BaseViewModel._dispatcherQueue</param>
-        public static void SetLyricsWindowVisibilityByPlayingStatus(DispatcherQueue dispatcherQueue)
+        public static void SetLyricsWindowVisibilityByPlayingStatus(this NowPlayingWindow window, bool isPlaying, DispatcherQueue dispatcherQueue)
         {
-            _setLyricsWindowVisibilityByPlayingStatusTimer ??= dispatcherQueue.CreateTimer();
+            var status = window.LyricsWindowStatus;
 
-            _setLyricsWindowVisibilityByPlayingStatusTimer.Debounce(() =>
+            status.VisibilityTimer ??= dispatcherQueue.CreateTimer();
+
+            status.VisibilityTimer.Debounce(() =>
             {
-                var window = GetWindow<NowPlayingWindow>();
-                if (window == null) return;
-
-                if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && !_mediaSessionsService.CurrentIsPlaying)
+                if (status.AutoShowOrHideWindow && !isPlaying)
                 {
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                    if (status.IsWorkArea)
                     {
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        SetIsWorkArea<NowPlayingWindow>(false);
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
+                        window.SetIsWorkArea(false);
                     }
-                    HideWindow<NowPlayingWindow>();
+                    window.HideWindow();
                 }
-                else if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && _mediaSessionsService.CurrentIsPlaying)
+                else if (status.AutoShowOrHideWindow && isPlaying)
                 {
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                    if (status.IsWorkArea)
                     {
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = true;
-                        SetIsWorkArea<NowPlayingWindow>(true);
-                        _liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing = false;
+                        window.SetIsWorkArea(true);
                     }
-                    OpenOrShowWindow<NowPlayingWindow>();
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                    OpenOrShowWindow<NowPlayingWindow>(status);
+                    if (status.IsWorkArea)
                     {
-                        MoveAndResize<NowPlayingWindow>(_liveStatesService.LiveStates.LyricsWindowStatus.GetWindowBoundsWhenWorkArea());
+                        window.MoveAndResize(status.GetWindowBoundsWhenWorkArea());
                     }
                 }
             }, Constants.Time.DebounceTimeout);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs

@@ -21,6 +21,7 @@ namespace BetterLyrics.WinUI3.Logic
             double canvasHeight,
             double targetYScrollOffset,
             double playingLineTopOffsetFactor,
+            LyricsStyleSettings lyricsStyle,
             LyricsEffectSettings lyricsEffect,
             ValueTransition<double> canvasYScrollTransition,
             Color bgColor,
@@ -37,6 +38,10 @@ namespace BetterLyrics.WinUI3.Logic
             var currentPlayingLine = lines.ElementAtOrDefault(playingLineIndex);
             if (currentPlayingLine == null) return;
 
+            var phoneticOpacity = lyricsStyle.PhoneticLyricsOpacity / 100.0;
+            var originalOpacity = lyricsStyle.OriginalLyricsOpacity / 100.0;
+            var translatedOpacity = lyricsStyle.TranslatedLyricsOpacity / 100.0;
+
             for (int i = startIndex; i <= endIndex + 1; i++)
             {
                 var line = lines.ElementAtOrDefault(i);
@@ -87,23 +92,30 @@ namespace BetterLyrics.WinUI3.Logic
 
                     line.ScaleTransition.SetDuration(yScrollDuration);
                     line.ScaleTransition.SetDelay(yScrollDelay);
-                    line.ScaleTransition.StartTransition(_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale));
+                    line.ScaleTransition.StartTransition(
+                        lyricsEffect.IsLyricsOutOfSightEffectEnabled ?
+                        (_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale)) :
+                        _highlightedScale);
 
                     line.PhoneticOpacityTransition.SetDuration(yScrollDuration);
                     line.PhoneticOpacityTransition.SetDelay(yScrollDelay);
-                    line.PhoneticOpacityTransition.StartTransition(absLineCountDelta == 0 ? 0.6 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.PhoneticOpacityTransition.StartTransition(
+                        CalculateTargetOpacity(phoneticOpacity, phoneticOpacity, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.PlayedOriginalOpacityTransition.SetDuration(yScrollDuration);
                     line.PlayedOriginalOpacityTransition.SetDelay(yScrollDelay);
-                    line.PlayedOriginalOpacityTransition.StartTransition(absLineCountDelta == 0 ? 1 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.PlayedOriginalOpacityTransition.StartTransition(
+                        CalculateTargetOpacity(originalOpacity, 1.0, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.UnplayedOriginalOpacityTransition.SetDuration(yScrollDuration);
                     line.UnplayedOriginalOpacityTransition.SetDelay(yScrollDelay);
-                    line.UnplayedOriginalOpacityTransition.StartTransition(absLineCountDelta == 0 ? 0.3 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.UnplayedOriginalOpacityTransition.StartTransition(
+                        CalculateTargetOpacity(originalOpacity, originalOpacity, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.TranslatedOpacityTransition.SetDuration(yScrollDuration);
                     line.TranslatedOpacityTransition.SetDelay(yScrollDelay);
-                    line.TranslatedOpacityTransition.StartTransition(absLineCountDelta == 0 ? 0.6 : (isMouseScrolling ? 0.3 : (1 - distanceFactor) * 0.3));
+                    line.TranslatedOpacityTransition.StartTransition(
+                        CalculateTargetOpacity(translatedOpacity, translatedOpacity, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.ColorTransition.SetDuration(yScrollDuration);
                     line.ColorTransition.SetDelay(yScrollDelay);
@@ -112,8 +124,10 @@ namespace BetterLyrics.WinUI3.Logic
                     line.AngleTransition.SetEasingType(canvasYScrollTransition.EasingType);
                     line.AngleTransition.SetDuration(yScrollDuration);
                     line.AngleTransition.SetDelay(yScrollDelay);
-                    line.AngleTransition.StartTransition(lyricsEffect.IsFanLyricsEnabled ?
-                        Math.PI * (lyricsEffect.FanLyricsAngle / 180.0) * distanceFactor * (i > playingLineIndex ? 1 : -1) : 0);
+                    line.AngleTransition.StartTransition(
+                        (lyricsEffect.IsFanLyricsEnabled && !isMouseScrolling) ?
+                        Math.PI * (lyricsEffect.FanLyricsAngle / 180.0) * distanceFactor * (i > playingLineIndex ? 1 : -1) :
+                        0);
 
                     line.YOffsetTransition.SetEasingType(canvasYScrollTransition.EasingType);
                     line.YOffsetTransition.SetDuration(yScrollDuration);
@@ -134,5 +148,33 @@ namespace BetterLyrics.WinUI3.Logic
                 line.ColorTransition.Update(elapsedTime);
             }
         }
+
+        private static double CalculateTargetOpacity(double baseOpacity, double baseOpacityWhenZeroDistanceFactor, double distanceFactor, bool isMouseScrolling, LyricsEffectSettings lyricsEffect)
+        {
+            double targetOpacity;
+            if (distanceFactor == 0)
+            {
+                targetOpacity = baseOpacityWhenZeroDistanceFactor;
+            }
+            else
+            {
+                if (isMouseScrolling)
+                {
+                    targetOpacity = baseOpacity;
+                }
+                else
+                {
+                    if (lyricsEffect.IsLyricsFadeOutEffectEnabled)
+                    {
+                        targetOpacity = (1 - distanceFactor) * baseOpacity;
+                    }
+                    else
+                    {
+                        targetOpacity = baseOpacity;
+                    }
+                }
+            }
+            return targetOpacity;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs

@@ -213,6 +213,17 @@ namespace BetterLyrics.WinUI3.Logic
                 if (value >= mousePosition.Y) { result = mid; right = mid - 1; }
                 else { left = mid + 1; }
             }
+
+            if (result != -1)
+            {
+                var line = lines[result];
+                double lineTopY = offset + line.TopLeftPosition.Y;
+                if (mousePosition.Y < lineTopY)
+                {
+                    result = -1;
+                }
+            }
+
             return result;
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerRequest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json.Serialization;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class CutletDockerRequest
+    {
+        [JsonPropertyName("text")]
+        public string Text { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerResponse.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json.Serialization;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class CutletDockerResponse
+    {
+        [JsonPropertyName("romaji")]
+        public string RomajiText { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs

@@ -0,0 +1,39 @@
+using BetterLyrics.WinUI3.Models.FileSystem;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class ExtendedTrack : ATL.Track
+    {
+        public new string Path { get; private set; } = "";
+        public string RawLyrics { get; set; } = "";
+        public string ParentFolderName => Directory.GetParent(Path)?.Name ?? "";
+        public string ParentFolderPath => Directory.GetParent(Path)?.FullName ?? "";
+        public string FileName => System.IO.Path.GetFileName(Path);
+
+        public ExtendedTrack() : base() { }
+
+        public ExtendedTrack(string path) : base(path)
+        {
+            Path = path;
+        }
+
+        public ExtendedTrack(string path, Stream stream) : base(stream, System.IO.Path.GetExtension(path))
+        {
+            Path = path;
+            SetRawLyrics(new StreamFileAbstraction(path, stream));
+        }
+
+        private void SetRawLyrics(StreamFileAbstraction streamFileAbstraction)
+        {
+            try
+            {
+                RawLyrics = TagLib.File.Create(streamFileAbstraction).Tag.Lyrics;
+            }
+            catch (Exception) { }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs

@@ -0,0 +1,55 @@
+using FluentFTP;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class FTPFileSystem : IUnifiedFileSystem
+    {
+        private readonly AsyncFtpClient _client;
+        private readonly string _rootPath; // 服务器上的根路径 (例如 /pub/music)
+
+        public FTPFileSystem(string host, string user, string pass, int port, string remotePath)
+        {
+            // 如果 path 是 "192.168.1.5/Music"，我们需要把 /Music 拆出来
+            // 但为了简单，假设 host 仅仅是 IP，remotePath 才是路径
+            _rootPath = remotePath ?? "/";
+
+            var config = new FtpConfig { ConnectTimeout = 5000 };
+            _client = new AsyncFtpClient(host, user ?? "anonymous", pass ?? "", port > 0 ? port : 21, config);
+        }
+
+        public async Task<bool> ConnectAsync()
+        {
+            await _client.AutoConnect();
+            return _client.IsConnected;
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            string targetPath = Path.Combine(_rootPath, relativePath).Replace("\\", "/");
+
+            var items = await _client.GetListing(targetPath);
+            return items.Select(i => new UnifiedFileItem
+            {
+                Name = i.Name,
+                FullPath = i.FullName,
+                IsFolder = i.Type == FtpObjectType.Directory,
+                Size = i.Size,
+                LastModified = i.Modified
+            }).ToList();
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            return await _client.OpenRead(fullPath);
+        }
+
+        public async Task DisconnectAsync() => await _client.Disconnect();
+        public void Dispose() => _client?.Dispose();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Storage;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public interface IUnifiedFileSystem : IDisposable
+    {
+        Task<bool> ConnectAsync();
+        Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath);
+        Task<Stream> OpenReadAsync(string fullPath);
+        Task DisconnectAsync();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class LocalFileSystem : IUnifiedFileSystem
+    {
+        private readonly string _rootPath;
+
+        public LocalFileSystem(string rootPath)
+        {
+            _rootPath = rootPath;
+        }
+
+        public Task<bool> ConnectAsync()
+        {
+            return Task.FromResult(Directory.Exists(_rootPath));
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            var result = new List<UnifiedFileItem>();
+
+            var targetPath = string.IsNullOrWhiteSpace(relativePath)
+                ? _rootPath
+                : Path.Combine(_rootPath, relativePath);
+
+            if (!Directory.Exists(targetPath)) return result;
+
+            var dirInfo = new DirectoryInfo(targetPath);
+
+            foreach (var item in dirInfo.GetFileSystemInfos())
+            {
+                bool isDir = (item.Attributes & FileAttributes.Directory) == FileAttributes.Directory;
+                result.Add(new UnifiedFileItem
+                {
+                    Name = item.Name,
+                    FullPath = item.FullName,
+                    IsFolder = isDir,
+                    Size = isDir ? 0 : ((FileInfo)item).Length,
+                    LastModified = item.LastWriteTime
+                });
+            }
+            return result;
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            return new FileStream(fullPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+        }
+
+        public async Task DisconnectAsync() => await Task.CompletedTask;
+        public void Dispose() { }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs

@@ -0,0 +1,131 @@
+using SMBLibrary;
+using SMBLibrary.Client;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class SMBFileSystem : IUnifiedFileSystem
+    {
+        private SMB2Client _client;
+        private ISMBFileStore _fileStore;
+
+        private readonly string _ip;
+        private readonly string _shareName;
+        private readonly string _pathInsideShare; // 共享里的子路径
+        private readonly string _username;
+        private readonly string _password;
+
+        // fullPathInput 例如: "192.168.1.5/Music/Pop"
+        public SMBFileSystem(string fullPathInput, string user, string pass)
+        {
+            _username = user;
+            _password = pass;
+
+            // 解析路径：分离 IP 和 共享名
+            var parts = fullPathInput.Replace("\\", "/").Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+
+            if (parts.Length >= 1) _ip = parts[0];
+            if (parts.Length >= 2) _shareName = parts[1];
+
+            // 剩下的部分重新拼起来作为子路径
+            if (parts.Length > 2)
+                _pathInsideShare = string.Join("\\", parts.Skip(2));
+            else
+                _pathInsideShare = "";
+        }
+
+        public async Task<bool> ConnectAsync()
+        {
+            _client = new SMB2Client();
+            bool connected = _client.Connect(_ip, SMBTransportType.DirectTCPTransport);
+            if (!connected) return false;
+
+            var status = _client.Login(string.Empty, _username, _password);
+            if (status != NTStatus.STATUS_SUCCESS) return false;
+
+            // 连接具体的共享文件夹
+            if (string.IsNullOrEmpty(_shareName)) return true; // 只连了服务器，没连共享
+
+            _fileStore = _client.TreeConnect(_shareName, out status);
+            return status == NTStatus.STATUS_SUCCESS;
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            var result = new List<UnifiedFileItem>();
+            if (_fileStore == null) return result;
+
+            // 拼接完整路径: Root里面的子路径 + 传入的相对路径
+            string queryPath = Path.Combine(_pathInsideShare, relativePath).Replace("/", "\\").TrimStart('\\');
+
+            // 打开目录
+            var statusRet = _fileStore.CreateFile(out object handle, out FileStatus status, queryPath,
+                AccessMask.GENERIC_READ, SMBLibrary.FileAttributes.Directory, ShareAccess.Read,
+                CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, null);
+
+            if (statusRet != NTStatus.STATUS_SUCCESS) return result;
+
+            List<QueryDirectoryFileInformation> fileInfo;
+            do
+            {
+                statusRet = _fileStore.QueryDirectory(out fileInfo, handle, "*", FileInformationClass.FileDirectoryInformation);
+
+                List<FileDirectoryInformation> list = fileInfo.Select(x => (FileDirectoryInformation)x).ToList();
+                foreach (var item in list)
+                {
+                    // 排除当前目录和父目录
+                    if (item.FileName == "." || item.FileName == "..") continue;
+
+                    result.Add(new UnifiedFileItem
+                    {
+                        Name = item.FileName,
+                        FullPath = Path.Combine(queryPath, item.FileName),
+                        IsFolder = (item.FileAttributes & SMBLibrary.FileAttributes.Directory) == SMBLibrary.FileAttributes.Directory,
+                        Size = item.AllocationSize,
+                        LastModified = item.LastWriteTime
+                    });
+                }
+
+                if (statusRet == NTStatus.STATUS_NO_MORE_FILES)
+                {
+                    break;
+                }
+
+                if (statusRet != NTStatus.STATUS_SUCCESS)
+                {
+                    // Log
+                    break;
+                }
+            } while (statusRet == NTStatus.STATUS_SUCCESS);
+
+            _fileStore.CloseFile(handle);
+            return result;
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            var ret = _fileStore.CreateFile(out object handle, out FileStatus status, fullPath,
+                AccessMask.GENERIC_READ | AccessMask.SYNCHRONIZE, 0, ShareAccess.Read, CreateDisposition.FILE_OPEN, 0, null);
+
+            if (ret != NTStatus.STATUS_SUCCESS) throw new IOException($"SMB Open Error: {ret}");
+
+            return new SMBReadOnlyStream(_fileStore, handle);
+        }
+
+        public async Task DisconnectAsync()
+        {
+            _client?.Disconnect();
+            await Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+            _client?.Disconnect();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs

@@ -0,0 +1,116 @@
+using SMBLibrary;
+using SMBLibrary.Client;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class SMBReadOnlyStream : Stream
+    {
+        private readonly ISMBFileStore _store;
+        private readonly object _handle;
+        private long _position;
+        private long _length; // 新增：缓存文件长度
+
+        public SMBReadOnlyStream(ISMBFileStore store, object handle)
+        {
+            _store = store;
+            _handle = handle;
+            _position = 0;
+
+            var status = _store.GetFileInformation(out FileInformation result, handle, FileInformationClass.FileStandardInformation);
+            if (status == NTStatus.STATUS_SUCCESS && result is FileStandardInformation info)
+            {
+                _length = info.EndOfFile;
+            }
+            else
+            {
+                // 如果获取失败，这是一个严重问题，意味着无法 Seek 到末尾
+                // 暂时设为 0，但后续读取可能会出问题
+                _length = 0;
+            }
+        }
+
+        public override bool CanRead => true;
+        public override bool CanSeek => true;
+        public override bool CanWrite => false;
+
+        public override long Length => _length;
+
+        public override long Position
+        {
+            get => _position;
+            set => _position = value;
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            // 保护：如果位置已经超过文件末尾，直接返回 0 (EOF)
+            if (_position >= _length) return 0;
+
+            // 保护：防止读取越界 (请求读取量不能超过剩余量)
+            long remaining = _length - _position;
+            int bytesToRequest = (int)Math.Min(count, remaining);
+
+            // 为了安全，保留对 remaining 的检查是必须的
+            if (bytesToRequest <= 0) return 0;
+
+            var status = _store.ReadFile(out byte[] data, _handle, _position, bytesToRequest);
+
+            if (status == NTStatus.STATUS_END_OF_FILE) return 0;
+
+            if (status != NTStatus.STATUS_SUCCESS)
+            {
+                throw new IOException($"SMB Read failed. Status: {status} (Pos: {_position}, Req: {bytesToRequest})");
+            }
+
+            if (data == null || data.Length == 0) return 0;
+
+            Array.Copy(data, 0, buffer, offset, data.Length);
+            _position += data.Length;
+            return data.Length;
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            long newPos = _position;
+
+            switch (origin)
+            {
+                case SeekOrigin.Begin:
+                    newPos = offset;
+                    break;
+                case SeekOrigin.Current:
+                    newPos = _position + offset;
+                    break;
+                case SeekOrigin.End:
+                    newPos = _length + offset;
+                    break;
+            }
+
+            // 允许 Seek 超过 EOF (标准 Stream 行为)，但在 Read 时会返回 0
+            if (newPos < 0)
+            {
+                throw new IOException("An attempt was made to move the file pointer before the beginning of the file.");
+            }
+
+            _position = newPos;
+            return _position;
+        }
+
+        public override void SetLength(long value) => throw new NotSupportedException();
+        public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
+        public override void Flush() { }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (disposing)
+            {
+                try { _store.CloseFile(_handle); } catch { }
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public class StreamFileAbstraction : TagLib.File.IFileAbstraction
+    {
+        private readonly string _name;
+        private readonly Stream _stream;
+        private readonly bool _closeStreamOnDispose;
+
+        public StreamFileAbstraction(string path, Stream stream, bool closeStreamOnDispose = false)
+        {
+            _name = Path.GetFileName(path);
+            _stream = stream ?? throw new ArgumentNullException(nameof(stream));
+            _closeStreamOnDispose = closeStreamOnDispose;
+        }
+
+        public string Name => _name;
+
+        public Stream ReadStream => _stream;
+
+        public Stream WriteStream
+        {
+            get
+            {
+                if (_stream.CanWrite)
+                {
+                    return _stream;
+                }
+                throw new InvalidOperationException("The underlying stream is read-only. Tag saving is not supported for this source.");
+            }
+        }
+
+        public void CloseStream(Stream stream)
+        {
+            if (_closeStreamOnDispose)
+            {
+                stream?.Dispose();
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public class UnifiedFileItem
+    {
+        public string Name { get; set; }
+        public string FullPath { get; set; }
+        public long Size { get; set; }
+        public bool IsFolder { get; set; }
+        public DateTime? LastModified { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WebDav;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class WebDavFileSystem : IUnifiedFileSystem
+    {
+        private readonly WebDavClient _client;
+        private readonly string _baseUrl;
+        private readonly string _rootPath;
+
+        // host: http://192.168.1.5:5005
+        // path: /music
+        public WebDavFileSystem(string host, string user, string pass, int port, string path)
+        {
+            if (!host.StartsWith("http")) host = $"http://{host}";
+            if (port > 0) host = $"{host}:{port}";
+
+            _baseUrl = host;
+            _rootPath = path ?? "/";
+
+            _client = new WebDavClient(new WebDavClientParams
+            {
+                BaseAddress = new Uri(_baseUrl),
+                Credentials = new System.Net.NetworkCredential(user, pass)
+            });
+        }
+
+        public async Task<bool> ConnectAsync()
+        {
+            // WebDAV 无状态，Propfind 测试根目录连通性
+            var result = await _client.Propfind(_rootPath);
+            return result.IsSuccessful;
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            var targetPath = Path.Combine(_rootPath, relativePath).Replace("\\", "/");
+            var result = await _client.Propfind(targetPath);
+
+            var list = new List<UnifiedFileItem>();
+            if (result.IsSuccessful)
+            {
+                foreach (var res in result.Resources)
+                {
+                    if (res == null || res.Uri == null) continue;
+
+                    // 排除掉文件夹自身 (WebDAV 通常会把当前请求的文件夹作为第一个结果返回)
+                    // 通过判断 URL 结尾是否一致来简单过滤，或者判断 IsCollection 且 Uri 相同
+                    // 这里简单处理：只要名字不为空
+                    var name = System.Net.WebUtility.UrlDecode(res.Uri.Split('/').LastOrDefault());
+                    if (string.IsNullOrEmpty(name)) continue;
+
+                    // 如果名字和请求的目录名一样，可能是它自己，跳过 (这需要根据具体服务器响应调整)
+                    // 更稳妥的是比较 Uri
+
+                    list.Add(new UnifiedFileItem
+                    {
+                        Name = name,
+                        FullPath = res.Uri.ToString(), // WebDAV 需要完整 URI 
+                        IsFolder = res.IsCollection,
+                        Size = res.ContentLength ?? 0,
+                        LastModified = res.LastModifiedDate
+                    });
+                }
+            }
+            return list;
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            // WebDAV 获取流
+            var res = await _client.GetRawFile(fullPath);
+            if (!res.IsSuccessful) throw new IOException($"WebDAV Error: {res.StatusCode}");
+            return res.Stream;
+        }
+
+        public async Task DisconnectAsync() => await Task.CompletedTask;
+
+        public void Dispose() => _client?.Dispose();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LibreTranslateResponse.cs

@@ -2,7 +2,7 @@
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public class TranslateResponse
+    public class LibreTranslateResponse
     {
         [JsonPropertyName("translatedText")]
         public string TranslatedText { get; set; }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LiveStates.cs

@@ -1,19 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class LiveStates : ObservableRecipient
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; }
-
-        /// <summary>
-        /// 在需要暂时禁用监听歌词窗口位置大小变化时使用
-        /// </summary>
-        public bool IsLyricsWindowStatusRefreshing { get; set; } = false;
-
-        public LiveStates()
-        {
-            LyricsWindowStatus = new LyricsWindowStatus();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LocalLyricsFolder.cs

@@ -1,20 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class LocalMediaFolder : ObservableRecipient
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsRealTimeWatchEnabled { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Path { get; set; }
-
-        public LocalMediaFolder() { }
-
-        public LocalMediaFolder(string path)
-        {
-            Path = path;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs

@@ -1,7 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using DevWinUI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +11,7 @@ namespace BetterLyrics.WinUI3.Models
     {
         private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
-        public List<LyricsLine> LyricsLines { get; set; }
+        public List<LyricsLine> LyricsLines { get; set; } = [];
         public string? LanguageCode
         {
             get => field ?? LanguageHelper.DetectLanguageCode(WrappedOriginalText);
@@ -20,11 +19,9 @@ namespace BetterLyrics.WinUI3.Models
         }
         public bool AutoGenerated { get; set; } = false;
         public string WrappedOriginalText => string.Join(StringHelper.NewLine, LyricsLines.Select(line => line.OriginalText));
-        public bool IsWordByWord => LyricsLines.Any(x => x.LyricsSyllables.Count != 0);
 
         public LyricsData()
         {
-            LyricsLines = [];
         }
 
         public LyricsData(List<LyricsLine> lyricsLines)
@@ -32,23 +29,7 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void ClearTranslatedText()
-        {
-            foreach (var line in LyricsLines)
-            {
-                line.TranslatedText = "";
-            }
-        }
-
-        public void ClearPhoneticText()
-        {
-            foreach (var line in LyricsLines)
-            {
-                line.PhoneticText = "";
-            }
-        }
-
-        public void SetTranslatedText(LyricsData translationData, int toleranceMs = 0)
+        public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
         {
             foreach (var line in LyricsLines)
             {
@@ -69,7 +50,7 @@ namespace BetterLyrics.WinUI3.Models
             }
         }
 
-        public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 0)
+        public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
         {
             foreach (var line in LyricsLines)
             {
@@ -108,28 +89,22 @@ namespace BetterLyrics.WinUI3.Models
             }
         }
 
-        public LyricsData CreateLyricsDataFrom(string translation)
+        public void SetTransliteration(string transliteration)
         {
-            var result = new LyricsData(LyricsLines.Select(line => new LyricsLine
-            {
-                StartMs = line.StartMs,
-                EndMs = line.EndMs,
-            }).ToList());
-            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
+            List<string> transliterationArr = transliteration.Split(StringHelper.NewLine).ToList();
             int i = 0;
-            foreach (var line in result.LyricsLines)
+            foreach (var line in LyricsLines)
             {
-                if (i >= translationArr.Count)
+                if (i >= transliterationArr.Count)
                 {
-                    break;
+                    line.PhoneticText = ""; // No transliteration available, keep empty
                 }
                 else
                 {
-                    line.OriginalText = translationArr[i];
+                    line.PhoneticText = transliterationArr[i];
                 }
                 i++;
             }
-            return result;
         }
 
         public static LyricsData GetNotfoundPlaceholder()
@@ -142,26 +117,20 @@ namespace BetterLyrics.WinUI3.Models
             }]);
         }
 
-        public static LyricsData GetParseErrorPlaceholder()
-        {
-            return new LyricsData([new LyricsLine
-            {
-                StartMs = 0,
-                EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                OriginalText = _resourceService.GetLocalizedString("LyricsParseError"),
-            }]);
-        }
-
         public static LyricsData GetLoadingPlaceholder()
         {
-            return new LyricsData([
-                new LyricsLine
-                {
-                    StartMs = 0,
-                    EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                    OriginalText = "● ● ●",
-                },
-            ]);
+            return new LyricsData()
+            {
+                LyricsLines = [
+                    new LyricsLine
+                    {
+                        StartMs = 0,
+                        EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
+                        OriginalText = "● ● ●",
+                    },
+                ],
+                LanguageCode = "N/A",
+            };
         }
 
         public LyricsLine? GetLyricsLine(double sec)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsLine.cs

@@ -1,16 +1,6 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Extensions;
-using BetterLyrics.WinUI3.Helper;
-using Microsoft.Graphics.Canvas.Geometry;
-using Microsoft.Graphics.Canvas.Text;
-using Microsoft.Graphics.Canvas.UI.Xaml;
-using Microsoft.UI;
-using System;
 using System.Collections.Generic;
-using System.Numerics;
-using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs

@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsSearchProvider Provider { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMatchingThresholdOverwritten { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 0;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 40;
 
         public LyricsSearchProviderInfo() { }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs

@@ -3,12 +3,15 @@ using BetterLyrics.WinUI3.Extensions;
 using CommunityToolkit.Mvvm.ComponentModel;
 using NTextCat.Commons;
 using System;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {
     public partial class LyricsSearchResult : ObservableObject, ICloneable
     {
         public LyricsSearchProvider Provider { get; set; }
+        [ObservableProperty] public partial TranslationSearchProvider? TranslationProvider { get; set; }
+        [ObservableProperty] public partial TransliterationSearchProvider? TransliterationProvider { get; set; }
 
         public string? Raw { get; set; }
 
@@ -31,11 +34,11 @@ namespace BetterLyrics.WinUI3.Models
 
         public string? SelfPath { get; set; }
 
-        public bool IsFound => !string.IsNullOrEmpty(Raw);
+        [JsonIgnore] public bool IsFound => !string.IsNullOrEmpty(Raw);
 
-        public LyricsSearchProvider? ProviderIfFound => IsFound ? Provider : null;
+        [JsonIgnore] public LyricsSearchProvider? ProviderIfFound => IsFound ? Provider : null;
 
-        public string? DisplayArtists => Artists?.Join("; ");
+        [JsonIgnore] public string? DisplayArtists => Artists?.Join("; ");
 
         public object Clone()
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsWindowStatus.cs

@@ -3,7 +3,11 @@ using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
 using System;
+using System.Linq;
+using System.Text.Json.Serialization;
 using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.Models
@@ -14,11 +18,17 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty] public partial bool IsDefault { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string MonitorDeviceName { get; set; } = string.Empty;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsWorkArea { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsBorderless { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTopPolling { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsShownInSwitchers { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsClickThrough { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLocked { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysHideUnlockButton { get; set; } = false;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsPinToTaskbar { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TaskbarPlacement TaskbarPlacement { get; set; } = TaskbarPlacement.Right;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMaximized { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsFullscreen { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsLayoutOrientation LyricsLayoutOrientation { get; set; } = LyricsLayoutOrientation.Horizontal;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType LyricsDisplayType { get; set; } = LyricsDisplayType.SplitView;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 800, 500);
@@ -37,77 +47,92 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoShowOrHideWindow { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TitleBarArea TitleBarArea { get; set; } = TitleBarArea.Top;
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowX { get; set; } = 100;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowY { get; set; } = 100;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowWidth { get; set; } = 800;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowHeight { get; set; } = 500;
+        [JsonIgnore][ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsOpened { get; set; } = false;
+
+        [JsonIgnore] public DispatcherQueueTimer? VisibilityTimer { get; set; }
 
         public LyricsWindowStatus()
         {
-            UpdateMonitorNameAndBounds();
+            LyricsStyleSettings.PropertyChanged += LyricsStyleSettings_PropertyChanged;
+            LyricsEffectSettings.PropertyChanged += LyricsEffectSettings_PropertyChanged;
+            LyricsBackgroundSettings.PropertyChanged += LyricsBackgroundSettings_PropertyChanged;
+            AlbumArtLayoutSettings.PropertyChanged += AlbumArtLayoutSettings_PropertyChanged;
+            AlbumArtAreaEffectSettings.PropertyChanged += AlbumArtAreaEffectSettings_PropertyChanged;
+        }
+
+        public LyricsWindowStatus(Window? targetWindow = null) : this()
+        {
+            UpdateMonitorNameAndBounds(targetWindow);
             UpdateDemoWindowAndMonitorBounds();
         }
 
         partial void OnLyricsStyleSettingsChanged(LyricsStyleSettings oldValue, LyricsStyleSettings newValue)
         {
-            oldValue.PropertyChanged -= OldLyricsStyleSettings_PropertyChanged;
-            newValue.PropertyChanged += OldLyricsStyleSettings_PropertyChanged;
+            oldValue.PropertyChanged -= LyricsStyleSettings_PropertyChanged;
+            newValue.PropertyChanged += LyricsStyleSettings_PropertyChanged;
+        }
+
+        private void LyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(LyricsStyleSettings));
         }
 
         partial void OnLyricsEffectSettingsChanged(LyricsEffectSettings oldValue, LyricsEffectSettings newValue)
         {
-            oldValue.PropertyChanged -= OldLyricsEffectSettings_PropertyChanged;
-            newValue.PropertyChanged += OldLyricsEffectSettings_PropertyChanged;
+            oldValue.PropertyChanged -= LyricsEffectSettings_PropertyChanged;
+            newValue.PropertyChanged += LyricsEffectSettings_PropertyChanged;
+        }
+
+        private void LyricsEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(LyricsEffectSettings));
         }
 
         partial void OnLyricsBackgroundSettingsChanged(LyricsBackgroundSettings oldValue, LyricsBackgroundSettings newValue)
         {
-            oldValue.PropertyChanged -= OldLyricsBackgroundSettings_PropertyChanged;
-            newValue.PropertyChanged += OldLyricsBackgroundSettings_PropertyChanged;
+            oldValue.PropertyChanged -= LyricsBackgroundSettings_PropertyChanged;
+            newValue.PropertyChanged += LyricsBackgroundSettings_PropertyChanged;
+        }
+
+        private void LyricsBackgroundSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(LyricsBackgroundSettings));
         }
 
         partial void OnAlbumArtLayoutSettingsChanged(AlbumArtAreaStyleSettings oldValue, AlbumArtAreaStyleSettings newValue)
         {
-            oldValue.PropertyChanged -= OldAlbumArtLayoutSettings_PropertyChanged;
-            newValue.PropertyChanged += OldAlbumArtLayoutSettings_PropertyChanged;
+            oldValue.PropertyChanged -= AlbumArtLayoutSettings_PropertyChanged;
+            newValue.PropertyChanged += AlbumArtLayoutSettings_PropertyChanged;
+        }
+
+        private void AlbumArtLayoutSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(AlbumArtLayoutSettings));
+        }
+
+        partial void OnAlbumArtAreaEffectSettingsChanged(AlbumArtAreaEffectSettings oldValue, AlbumArtAreaEffectSettings newValue)
+        {
+            oldValue.PropertyChanged -= AlbumArtAreaEffectSettings_PropertyChanged;
+            newValue.PropertyChanged += AlbumArtAreaEffectSettings_PropertyChanged;
+        }
+
+        private void AlbumArtAreaEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(AlbumArtAreaEffectSettings));
         }
 
         partial void OnWindowBoundsChanged(Rect value)
         {
             UpdateMonitorNameAndBounds();
             UpdateDemoWindowAndMonitorBounds();
-            WindowX = WindowBounds.X;
-            WindowY = WindowBounds.Y;
-            WindowWidth = WindowBounds.Width;
-            WindowHeight = WindowBounds.Height;
         }
 
-        private void OldLyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private void UpdateMonitorNameAndBounds(Window? targetWindow = null)
         {
-            this.OnPropertyChanged(nameof(LyricsStyleSettings));
-        }
+            targetWindow ??= WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == this);
+            if (targetWindow == null) return;
 
-        private void OldLyricsEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            this.OnPropertyChanged(nameof(LyricsEffectSettings));
-        }
-
-        private void OldLyricsBackgroundSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            this.OnPropertyChanged(nameof(LyricsBackgroundSettings));
-        }
-
-        private void OldAlbumArtLayoutSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            this.OnPropertyChanged(nameof(AlbumArtLayoutSettings));
-        }
-
-        public void UpdateMonitorNameAndBounds()
-        {
-            var lyricsWindow = WindowHook.GetWindow<NowPlayingWindow>();
-            if (lyricsWindow == null) return;
-
-            var mointor = MonitorHook.GetMonitorInfoExFromWindow(lyricsWindow);
+            var mointor = MonitorHook.GetMonitorInfoExFromWindow(targetWindow);
             MonitorDeviceName = mointor.szDevice;
             MonitorBounds = new Rect(
                 mointor.rcMonitor.Left,
@@ -166,17 +191,24 @@ namespace BetterLyrics.WinUI3.Models
 
         public object Clone()
         {
-            return new LyricsWindowStatus
+            return new LyricsWindowStatus(null)
             {
                 Name = this.Name,
                 IsDefault = this.IsDefault,
                 MonitorDeviceName = this.MonitorDeviceName,
                 IsWorkArea = this.IsWorkArea,
-                IsBorderless = this.IsBorderless,
                 IsAlwaysOnTop = this.IsAlwaysOnTop,
                 IsAlwaysOnTopPolling = this.IsAlwaysOnTopPolling,
                 IsShownInSwitchers = this.IsShownInSwitchers,
-                IsClickThrough = this.IsClickThrough,
+                IsLocked = this.IsLocked,
+                IsAlwaysHideUnlockButton = this.IsAlwaysHideUnlockButton,
+
+                IsPinToTaskbar = this.IsPinToTaskbar,
+                TaskbarPlacement = this.TaskbarPlacement,
+
+                IsMaximized = this.IsMaximized,
+                IsFullscreen = this.IsFullscreen,
+
                 LyricsLayoutOrientation = this.LyricsLayoutOrientation,
                 LyricsDisplayType = this.LyricsDisplayType,
                 WindowBounds = this.WindowBounds,
@@ -196,11 +228,6 @@ namespace BetterLyrics.WinUI3.Models
                 EnvironmentSampleMode = this.EnvironmentSampleMode,
                 AutoShowOrHideWindow = this.AutoShowOrHideWindow,
                 TitleBarArea = this.TitleBarArea,
-
-                WindowX = this.WindowX,
-                WindowY = this.WindowY,
-                WindowWidth = this.WindowWidth,
-                WindowHeight = this.WindowHeight,
             };
 
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs

@@ -0,0 +1,73 @@
+// 2025/6/23 by Zhe Fang
+
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.FileSystem;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Text.Json.Serialization;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class MediaFolder : ObservableRecipient
+    {
+        [ObservableProperty] public partial string Id { get; set; } = Guid.NewGuid().ToString();
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsRealTimeWatchEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients][NotifyPropertyChangedFor(nameof(ConnectionSummary))] public partial string Path { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        [NotifyPropertyChangedFor(nameof(IsLocal))]
+        [NotifyPropertyChangedFor(nameof(ConnectionSummary))]
+        public partial FileSourceType SourceType { get; set; } = FileSourceType.Local;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Name { get; set; }
+
+        [ObservableProperty] public partial string UserName { get; set; }
+
+        [ObservableProperty] public partial int Port { get; set; } = -1;
+
+        [JsonIgnore] public string Password { get; set; }
+
+        [JsonIgnore] public bool IsLocal => SourceType == FileSourceType.Local;
+
+        [JsonIgnore]
+        public string ConnectionSummary
+        {
+            get
+            {
+                if (IsLocal) return Path;
+                return $"{SourceType} - {Path} {(string.IsNullOrEmpty(UserName) ? "" : $"({UserName})")}";
+            }
+        }
+
+        [JsonIgnore] public string VaultKey => $"{Id}-{UserName}";
+
+        public MediaFolder() { }
+
+        public MediaFolder(string path)
+        {
+            Path = path;
+        }
+
+        public IUnifiedFileSystem? CreateFileSystem()
+        {
+            if (!IsEnabled) return null;
+            if (string.IsNullOrEmpty(Password) && !IsLocal)
+            {
+                Password = PasswordVaultHelper.Get(Constants.App.AppName, VaultKey) ?? "";
+            }
+
+            return SourceType switch
+            {
+                FileSourceType.Local => new LocalFileSystem(Path),
+                FileSourceType.SMB => new SMBFileSystem(Path, UserName, Password),
+                FileSourceType.FTP => new FTPFileSystem(Path, UserName, Password, Port, Path),
+                FileSourceType.WebDav => new WebDavFileSystem(Path, UserName, Password, Port, Path),
+                _ => throw new NotImplementedException()
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs

@@ -6,6 +6,7 @@ using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Linq;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {
@@ -32,13 +33,13 @@ namespace BetterLyrics.WinUI3.Models
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; } = [.. Enum.GetValues<AlbumArtSearchProvider>().Select(p => new AlbumArtSearchProviderInfo(p, true))];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsSearchType LyricsSearchType { get; set; } = LyricsSearchType.Sequential;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 0;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 40;
 
-        public string LogoPath => PlayerIDHelper.GetLogoPath(Provider);
+        [JsonIgnore] public string LogoPath => PlayerIDHelper.GetLogoPath(Provider);
 
-        public string? DisplayName => PlayerIDHelper.GetDisplayName(Provider);
+        [JsonIgnore] public string? DisplayName => PlayerIDHelper.GetDisplayName(Provider);
 
-        public bool IsLXMusic => PlayerIDHelper.IsLXMusic(Provider);
+        [JsonIgnore] public bool IsLXMusic => PlayerIDHelper.IsLXMusic(Provider);
 
         public MediaSourceProviderInfo()
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs

@@ -4,9 +4,9 @@ namespace BetterLyrics.WinUI3.Models
 {
     public class PlayQueueItem
     {
-        public Track Track { get; set; }
+        public ExtendedTrack Track { get; set; }
 
-        public PlayQueueItem(Track track)
+        public PlayQueueItem(ExtendedTrack track)
         {
             Track = track;
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/RenderLyricsLine.cs

@@ -5,10 +5,7 @@ using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
-using System;
-using System.Collections.Generic;
 using System.Numerics;
-using System.Text;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtAreaEffectSettings.cs

@@ -1,8 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs

@@ -12,7 +12,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial MusicGallerySettings MusicGallerySettings { get; set; } = new MusicGallerySettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial AdvancedSettings AdvancedSettings { get; set; } = new AdvancedSettings();
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; } = [];
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaFolder> LocalMediaFolders { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MappedSongSearchQuery> MappedSongSearchQueries { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LyricsWindowStatus> WindowBoundsRecords { get; set; } = [];

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/GeneralSettings.cs

@@ -13,13 +13,15 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IgnoreCacheWhenSearching { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> BorderlessShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "B" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ClickThroughShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "C" };
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> LyricsWindowSwitchShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "S" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> PlayOrPauseShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "P" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> NextSongShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "Right" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> PreviousSongShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "Left" };
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool MultiNowPlayingWindowMode { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoStartLyricsWindow { get; set; } = true;
+
         public GeneralSettings() { }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsBackgroundSettings.cs

@@ -12,6 +12,11 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsPureColorOverlayEnabled { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PureColorOverlayOpacity { get; set; } = 100; // 100 % = 1.0
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsCoverOverlayEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlayOpacity { get; set; } = 100; // 100 % = 1.0
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlaySpeed { get; set; } = 50;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlayBlurAmount { get; set; } = 100;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsFluidOverlayEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int FluidOverlayOpacity { get; set; } = 100;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial PaletteGeneratorType PaletteGeneratorType { get; set; } = PaletteGeneratorType.MedianCut;
@@ -39,14 +44,25 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 IsPureColorOverlayEnabled = this.IsPureColorOverlayEnabled,
                 PureColorOverlayOpacity = this.PureColorOverlayOpacity,
 
+                IsCoverOverlayEnabled = this.IsCoverOverlayEnabled,
+                CoverOverlayOpacity = this.CoverOverlayOpacity,
+                CoverOverlaySpeed = this.CoverOverlaySpeed,
+                CoverOverlayBlurAmount = this.CoverOverlayBlurAmount,
+
                 IsFluidOverlayEnabled = this.IsFluidOverlayEnabled,
                 FluidOverlayOpacity = this.FluidOverlayOpacity,
                 PaletteGeneratorType = this.PaletteGeneratorType,
 
                 IsSpectrumOverlayEnabled = this.IsSpectrumOverlayEnabled,
+                SpectrumPlacement = this.SpectrumPlacement,
+                SpectrumStyle = this.SpectrumStyle,
+                SpectrumCount = this.SpectrumCount,
 
                 IsSnowFlakeOverlayEnabled = this.IsSnowFlakeOverlayEnabled,
                 SnowFlakeOverlayAmount = this.SnowFlakeOverlayAmount,
+                SnowFlakeOverlaySpeed = this.SnowFlakeOverlaySpeed,
+
+                IsFogOverlayEnabled = this.IsFogOverlayEnabled,
             };
         }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs

@@ -7,9 +7,23 @@ namespace BetterLyrics.WinUI3.Models.Settings
     public partial class LyricsEffectSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsBlurEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFadeOutEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsOutOfSightEffectEnabled { get; set; } = true;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectScope LyricsGlowEffectScope { get; set; } = LyricsEffectScope.LongDurationSyllable;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectLongSyllableDuration { get; set; } = 700; // 700ms
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectAmountAutoAdjust { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsGlowEffectAmount { get; set; } = 8;
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsScaleEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScaleEffectLongSyllableDuration { get; set; } = 700; // 700ms
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsScaleEffectAmountAutoAdjust { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScaleEffectAmount { get; set; } = 115; // 115%
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFloatAnimationEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFloatAnimationAmountAutoAdjust { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFloatAnimationAmount { get; set; } = 8;
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial EasingType LyricsScrollEasingType { get; set; }
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScrollDuration { get; set; }
@@ -40,9 +54,23 @@ namespace BetterLyrics.WinUI3.Models.Settings
             return new LyricsEffectSettings(this.LyricsScrollTopDuration, this.LyricsScrollDuration, this.LyricsScrollBottomDuration, this.LyricsScrollEasingType)
             {
                 IsLyricsBlurEffectEnabled = this.IsLyricsBlurEffectEnabled,
+                IsLyricsFadeOutEffectEnabled = this.IsLyricsFadeOutEffectEnabled,
+                IsLyricsOutOfSightEffectEnabled = this.IsLyricsOutOfSightEffectEnabled,
+
                 IsLyricsGlowEffectEnabled = this.IsLyricsGlowEffectEnabled,
+                LyricsGlowEffectLongSyllableDuration = this.LyricsGlowEffectLongSyllableDuration,
+                IsLyricsGlowEffectAmountAutoAdjust = this.IsLyricsGlowEffectAmountAutoAdjust,
+                LyricsGlowEffectAmount = this.LyricsGlowEffectAmount,
+                LyricsGlowEffectScope = this.LyricsGlowEffectScope,
+
                 IsLyricsScaleEffectEnabled = this.IsLyricsScaleEffectEnabled,
+                LyricsScaleEffectLongSyllableDuration = this.LyricsScaleEffectLongSyllableDuration,
+                IsLyricsScaleEffectAmountAutoAdjust = this.IsLyricsScaleEffectAmountAutoAdjust,
+                LyricsScaleEffectAmount = this.LyricsScaleEffectAmount,
+
                 IsLyricsFloatAnimationEnabled = this.IsLyricsFloatAnimationEnabled,
+                IsLyricsFloatAnimationAmountAutoAdjust = this.IsLyricsFloatAnimationAmountAutoAdjust,
+                LyricsFloatAnimationAmount = this.LyricsFloatAnimationAmount,
 
                 LyricsScrollEasingType = this.LyricsScrollEasingType,
                 LyricsScrollDuration = this.LyricsScrollDuration,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs

@@ -15,23 +15,27 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsFontSize { get; set; } = 24;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsFontSize { get; set; } = 12;
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PhoneticLyricsOpacity { get; set; } = 60; // 60 %
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsOpacity { get; set; } = 30; // 30 %
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsOpacity { get; set; } = 60; // 60 %
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; } = TextAlignmentType.Left;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontStrokeWidth { get; set; } = 0;
-        
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomBgFontColor { get; set; } = Colors.White;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomFgFontColor { get; set; } = Colors.White;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomStrokeFontColor { get; set; } = Colors.White;
-        
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsBgFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsFgFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontColorType LyricsStrokeFontColorType { get; set; } = LyricsFontColorType.AdaptiveGrayed;
-        
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontWeight LyricsFontWeight { get; set; } = LyricsFontWeight.Bold;
-        
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial double LyricsLineSpacingFactor { get; set; } = 0.5;
-        
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsCJKFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWesternFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsCJKFontFamily { get; set; } = "Arial";
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWesternFontFamily { get; set; } = "Arial";
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PlayingLineTopOffset { get; set; } = 50; // 50 %
 
@@ -45,6 +49,11 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 PhoneticLyricsFontSize = this.PhoneticLyricsFontSize,
                 OriginalLyricsFontSize = this.OriginalLyricsFontSize,
                 TranslatedLyricsFontSize = this.TranslatedLyricsFontSize,
+
+                PhoneticLyricsOpacity = this.PhoneticLyricsOpacity,
+                OriginalLyricsOpacity = this.OriginalLyricsOpacity,
+                TranslatedLyricsOpacity = this.TranslatedLyricsOpacity,
+
                 LyricsAlignmentType = this.LyricsAlignmentType,
                 LyricsFontStrokeWidth = this.LyricsFontStrokeWidth,
                 LyricsCustomBgFontColor = this.LyricsCustomBgFontColor,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/MusicGallerySettings.cs

@@ -11,6 +11,9 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PlayQueueIndex { get; set; } = -1;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoOpen { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoPlay { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; } = new();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnWindowClosed { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool StopOnWindowClosed { get; set; } = false;
 
         public MusicGallerySettings() { }
     }