Merge pull request #7 from jayfunc/dev

update to v1.0.5.0

.github/FUNDING.yml

@@ -1,15 +0,0 @@
-# These are supported funding model platforms
-
-github: [jayfunc]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-buy_me_a_coffee: founchoo
-thanks_dev: # Replace with a single thanks.dev username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/releases-to-discord.yml

@@ -1,20 +0,0 @@
-on:
-  release:
-    types: [published]
-
-jobs:
-  github-releases-to-discord:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: GitHub Releases to Discord
-        uses: SethCohen/github-releases-to-discord@v1
-        with:
-          webhook_url: ${{ secrets.WEBHOOK_URL }}
-          color: "2105893"
-          username: "Release Changelog"
-          avatar_url: "https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png"
-          content: "||@everyone||"
-          footer_title: "Changelog"
-          reduce_headings: true

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

@@ -5,62 +5,52 @@
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
   xmlns:uap18="http://schemas.microsoft.com/appx/manifest/uap/windows10/18"
   IgnorableNamespaces="uap rescap uap18">
 
-	<Identity
-	  Name="37412.BetterLyrics"
-	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.15.0" />
+  <Identity
+    Name="37412.BetterLyrics"
+    Publisher="CN=Zhe"
+    Version="1.0.5.0" />
 
-	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
-	<Properties>
-		<DisplayName>BetterLyrics</DisplayName>
-		<PublisherDisplayName>founchoo</PublisherDisplayName>
-		<Logo>Images\StoreLogo.png</Logo>
-	</Properties>
+  <Properties>
+    <DisplayName>BetterLyrics</DisplayName>
+    <PublisherDisplayName>founchoo</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
 
-	<Dependencies>
-		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
-		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
-	</Dependencies>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+  </Dependencies>
 
-	<Resources>
-		<Resource Language="en-US"/>
-		<Resource Language="zh-CN"/>
-		<Resource Language="zh-TW"/>
-		<Resource Language="ja-JP"/>
-		<Resource Language="ko-KR"/>
-	</Resources>
+  <Resources>
+	  <Resource Language="en-US"/>
+	  <Resource Language="zh-CN"/>
+	  <Resource Language="zh-TW"/>
+	  <Resource Language="ja-JP"/>
+	  <Resource Language="ko-KR"/>
+  </Resources>
 
-	<Applications>
-		<Application Id="App"
-		  Executable="$targetnametoken$.exe"
-		  EntryPoint="$targetentrypoint$">
-			<uap:VisualElements
-			  DisplayName="BetterLyrics"
-			  Description="BetterLyrics.WinUI3 (Package)"
-			  BackgroundColor="transparent"
-			  Square150x150Logo="Images\Square150x150Logo.png"
-			  Square44x44Logo="Images\Square44x44Logo.png">
-				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
-				<uap:SplashScreen Image="Images\SplashScreen.png" />
-			</uap:VisualElements>
-			<Extensions>
-				<uap5:Extension
-				  Category="windows.startupTask">
-					<uap5:StartupTask
-					  TaskId="AutoStartup"
-					  Enabled="false"
-					  DisplayName="BetterLyrics" />
-				</uap5:Extension>
-			</Extensions>
-		</Application>
-	</Applications>
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="BetterLyrics"
+        Description="BetterLyrics.WinUI3 (Package)"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
 
-	<Capabilities>
-		<rescap:Capability Name="runFullTrust" />
-	</Capabilities>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
 </Package>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -45,16 +45,14 @@
             <converter:ColorToBrushConverter x:Key="ColorToBrushConverter" />
             <converter:MatchedLocalFilesPathToVisibilityConverter x:Key="MatchedLocalFilesPathToVisibilityConverter" />
             <converter:IntToCornerRadius x:Key="IntToCornerRadius" />
-            <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
-            <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
             <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
 
             <x:Double x:Key="SettingsCardSpacing">4</x:Double>
 
-            <!--  Style  -->
+            <!--  Style (inc. the correct spacing) of a section header  -->
             <Style
                 x:Key="SettingsSectionHeaderTextBlockStyle"
                 BasedOn="{StaticResource BodyStrongTextBlockStyle}"
@@ -64,16 +62,14 @@
                 </Style.Setters>
             </Style>
             <Style x:Key="TitleBarButtonStyle" TargetType="Button">
-                <Setter Property="VerticalAlignment" Value="Top" />
+                <Setter Property="VerticalAlignment" Value="Stretch" />
                 <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="16,0" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostButtonStyle" TargetType="Button">
                 <Setter Property="VerticalAlignment" Value="Stretch" />
-                <Setter Property="Padding" Value="8" />
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Background" Value="Transparent" />
@@ -82,31 +78,18 @@
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="10,0" />
+                <Setter Property="Padding" Value="16,0" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="8" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
-            <Style x:Key="CardGridStyle" TargetType="Grid">
-                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
-                <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="CornerRadius" Value="6" />
-            </Style>
-
-            <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="TextFillColorPrimaryBrush" />
 
             <!--  Dimensions  -->
 
-            <!--  Fonts  -->
-            <FontFamily x:Key="IconFontFamily">ms-appx:///Assets/Segoe Fluent Icons.ttf#Segoe Fluent Icons</FontFamily>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

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

@@ -1,10 +1,11 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using BetterInAppLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Services.BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -12,27 +13,30 @@ using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
-using ShadowViewer.Controls;
-using System;
-using System.Linq;
-using System.Text;
-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.
 
 namespace BetterLyrics.WinUI3
 {
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
     public partial class App : Application
     {
-
         private readonly ILogger<App> _logger;
 
         public static new App Current => (App)Application.Current;
-        public static DispatcherQueue? DispatcherQueue { get; private set; }
-        public static DispatcherQueueTimer? DispatcherQueueTimer { get; private set; }
+
         public static ResourceLoader? ResourceLoader { get; private set; }
 
-        public NotificationPanel? LyricsWindowNotificationPanel { get; set; }
-        public NotificationPanel? SettingsWindowNotificationPanel { get; set; }
+        public static DispatcherQueue? DispatcherQueue { get; private set; }
+        public static DispatcherQueueTimer? DispatcherQueueTimer { get; private set; }
 
+        /// <summary>
+        /// Initializes the singleton application object.  This is the first line of authored code
+        /// executed, and as such is the logical equivalent of main() or WinMain().
+        /// </summary>
         public App()
         {
             this.InitializeComponent();
@@ -42,10 +46,10 @@ namespace BetterLyrics.WinUI3
             ResourceLoader = new ResourceLoader();
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-            PathHelper.EnsureDirectories();
+            AppInfo.EnsureDirectories();
             ConfigureServices();
 
-            _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
+            _logger = Ioc.Default.GetService<ILogger<App>>()!;
 
             UnhandledException += App_UnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
@@ -53,21 +57,35 @@ namespace BetterLyrics.WinUI3
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
         }
 
-        protected override void OnLaunched(LaunchActivatedEventArgs args)
+        private void CurrentDomain_FirstChanceException(
+            object? sender,
+            System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e
+        )
         {
-            WindowHelper.OpenOrShowWindow<LyricsWindow>();
-            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow == null) return;
+            _logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
+        }
 
-            lyricsWindow.ViewModel.InitLockHotKey();
-            lyricsWindow.AutoSelectLyricsMode();
+        private void TaskScheduler_UnobservedTaskException(
+            object? sender,
+            UnobservedTaskExceptionEventArgs e
+        )
+        {
+            _logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
+        }
+
+        private void CurrentDomain_UnhandledException(
+            object sender,
+            System.UnhandledExceptionEventArgs e
+        )
+        {
+            _logger.LogError(e.ExceptionObject.ToString(), "CurrentDomain_UnhandledException");
         }
 
         private static void ConfigureServices()
         {
             Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Is(Serilog.Events.LogEventLevel.Verbose)
-                .WriteTo.File(PathHelper.LogFilePattern, rollingInterval: RollingInterval.Day)
+                .MinimumLevel.Debug()
+                .WriteTo.File(AppInfo.LogFilePattern, rollingInterval: RollingInterval.Day)
                 .CreateLogger();
 
             // Register services
@@ -81,41 +99,34 @@ namespace BetterLyrics.WinUI3
                     // Services
                     .AddSingleton<ISettingsService, SettingsService>()
                     .AddSingleton<IPlaybackService, PlaybackService>()
-                    .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
-                    .AddSingleton<ILyricsSearchService, LyricsSearchService>()
+                    .AddSingleton<IMusicSearchService, MusicSearchService>()
                     .AddSingleton<ILibWatcherService, LibWatcherService>()
-                    .AddSingleton<ITranslateService, TranslateService>()
-                    // Manager
                     // ViewModels
-                    .AddSingleton<LyricsWindowViewModel>()
-                    .AddSingleton<SettingsWindowViewModel>()
-                    .AddSingleton<SystemTrayViewModel>()
-                    .AddSingleton<SettingsPageViewModel>()
+                    .AddTransient<HostWindowViewModel>()
+                    .AddSingleton<SettingsViewModel>()
                     .AddSingleton<LyricsPageViewModel>()
                     .AddSingleton<LyricsRendererViewModel>()
+                    .AddSingleton<LyricsSettingsControlViewModel>()
                     .BuildServiceProvider()
             );
         }
 
-        private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
+        private void App_UnhandledException(
+            object sender,
+            Microsoft.UI.Xaml.UnhandledExceptionEventArgs e
+        )
         {
             _logger.LogError(e.Exception, "App_UnhandledException");
             e.Handled = true;
         }
 
-        private void CurrentDomain_FirstChanceException(object? sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
+        /// <summary>
+        /// Invoked when the application is launched.
+        /// </summary>
+        /// <param name="args">Details about the launch request and process.</param>
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            _logger.LogError(e.Exception, "CurrentDomain_FirstChanceException");
-        }
-
-        private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
-        {
-            _logger.LogError(e.ExceptionObject.ToString(), "CurrentDomain_UnhandledException");
-        }
-
-        private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
-        {
-            _logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
+            WindowHelper.OpenLyricsWindow();
         }
     }
 }

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

@@ -1,126 +1,101 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-		<RootNamespace>BetterLyrics.WinUI3</RootNamespace>
-		<Platforms>x86;x64;ARM64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<UseWinUI>true</UseWinUI>
-		<Nullable>enable</Nullable>
-		<LangVersion>preview</LangVersion>
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Remove="ViewModels\Lyrics\**" />
-		<Content Remove="ViewModels\Lyrics\**" />
-		<EmbeddedResource Remove="ViewModels\Lyrics\**" />
-		<None Remove="ViewModels\Lyrics\**" />
-		<Page Remove="ViewModels\Lyrics\**" />
-		<PRIResource Remove="ViewModels\Lyrics\**" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Remove="Assets\Core14.profile.xml" />
-		<None Remove="Assets\Segoe Fluent Icons.ttf" />
-		<None Remove="Controls\SystemTray.xaml" />
-		<None Remove="Views\SettingsWindow.xaml" />
-	</ItemGroup>
-	<ItemGroup>
-		<Content Include="Logo.ico" />
-	</ItemGroup>
-	<ItemGroup>
-		<Manifest Include="$(ApplicationManifest)" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="3v.EvtSource" Version="2.0.0" />
-		<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
-		<PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250513-build.2126" />
-		<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.Controls.SettingsControls" 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="Dubya.WindowsMediaController" Version="2.5.5" />
-		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
-		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
-		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-		<PackageReference Include="NTextCat" Version="0.3.65" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
-		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-		<PackageReference Include="ShadowViewer.Controls.Notification" Version="1.2.1" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
-		<PackageReference Include="System.Drawing.Common" Version="9.0.6" />
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.6" />
-		<PackageReference Include="TagLibSharp" Version="2.3.0" />
-		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
-		<PackageReference Include="Vanara.PInvoke.CoreAudio" Version="4.1.6" />
-		<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.6" />
-		<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.1.6" />
-		<PackageReference Include="Vanara.PInvoke.User32" Version="4.1.6" />
-		<PackageReference Include="WinUIEx" Version="2.6.0" />
-		<PackageReference Include="z440.atl.core" Version="7.0.0" />
-	</ItemGroup>
-	<ItemGroup>
-		<Page Update="Rendering\InAppLyricsRenderer.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-	<ItemGroup>
-		<Page Update="Rendering\DesktopLyricsRenderer.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-	<!--Disable Trimming for Specific Packages-->
-	<ItemGroup>
-		<TrimmerRootAssembly Include="TagLibSharp" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Content Update="Assets\Segoe Fluent Icons.ttf">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
-	<ItemGroup>
-		<Page Update="Views\SettingsWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-	<ItemGroup>
-		<Page Update="Controls\SystemTray.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-	<!-- Publish Properties -->
-	<PropertyGroup>
-		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-		<PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
-		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
-		<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
-	</PropertyGroup>
-	<PropertyGroup>
-		<DefineConstants>$(DefineConstants)</DefineConstants>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<ApplicationIcon>Logo.ico</ApplicationIcon>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<ShouldCreateLogs>True</ShouldCreateLogs>
-		<AdvancedSettingsExpanded>True</AdvancedSettingsExpanded>
-		<UpdateAssemblyVersion>False</UpdateAssemblyVersion>
-		<UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
-		<UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-		<UpdatePackageVersion>True</UpdatePackageVersion>
-		<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
-		<InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
-		<PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
-		<Version>2025.6.0</Version>
-		<AssemblyVersion>2025.6.18.0110</AssemblyVersion>
-		<FileVersion>2025.6.18.0110</FileVersion>
-	</PropertyGroup>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <RootNamespace>BetterLyrics.WinUI3</RootNamespace>
+    <Platforms>x86;x64;ARM64</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <UseWinUI>true</UseWinUI>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="Logo.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
+    <PackageReference
+      Include="CommunityToolkit.Labs.WinUI.OpacityMaskView"
+      Version="0.1.250513-build.2126"
+    />
+    <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.Controls.SettingsControls"
+      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="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.6" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.6" />
+    <PackageReference Include="TagLibSharp" Version="2.3.0" />
+    <PackageReference Include="Ude.NetStandard" Version="1.2.0" />
+    <PackageReference Include="WinUIEx" Version="2.5.1" />
+    <PackageReference Include="z440.atl.core" Version="6.26.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Update="Assets\AI - 甜度爆表.mp3">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Rendering\InAppLyricsRenderer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Rendering\DesktopLyricsRenderer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Controls\" />
+    <Folder Include="ViewModels\Lyrics\" />
+  </ItemGroup>
+  <!--Disable Trimming for Specific Packages-->
+  <ItemGroup>
+    <TrimmerRootAssembly Include="TagLibSharp" />
+  </ItemGroup>
+  <!-- Publish Properties -->
+  <PropertyGroup>
+    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
+    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>Logo.ico</ApplicationIcon>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ShouldCreateLogs>True</ShouldCreateLogs>
+    <AdvancedSettingsExpanded>True</AdvancedSettingsExpanded>
+    <UpdateAssemblyVersion>False</UpdateAssemblyVersion>
+    <UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
+    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
+    <UpdatePackageVersion>True</UpdatePackageVersion>
+    <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
+    <InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
+    <PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
+    <Version>2025.6.0</Version>
+    <AssemblyVersion>2025.6.18.0110</AssemblyVersion>
+    <FileVersion>2025.6.18.0110</FileVersion>
+  </PropertyGroup>
 </Project>

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.SystemTray"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tb="using:H.NotifyIcon"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <tb:TaskbarIcon
-        x:Name="TrayIcon"
-        x:FieldModifier="public"
-        ContextMenuMode="SecondWindow"
-        IconSource="ms-appx:///Assets/Logo.ico"
-        NoLeftClickDelay="True"
-        ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
-        <tb:TaskbarIcon.ContextFlyout>
-            <MenuFlyout
-                AreOpenCloseAnimationsEnabled="True"
-                LightDismissOverlayMode="On"
-                ShowMode="TransientWithDismissOnPointerMoveAway">
-                <MenuFlyoutItem x:Uid="SystemTraySettings" Command="{x:Bind ViewModel.OpenSettingsCommand}" />
-                <MenuFlyoutItem x:Uid="SystemTrayExit" Command="{x:Bind ViewModel.ExitAppCommand}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayUnlock"
-                    Command="{x:Bind ViewModel.UnlockWindowCommand}"
-                    Visibility="{x:Bind ViewModel.IsLyricsWindowLocked, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-            </MenuFlyout>
-        </tb:TaskbarIcon.ContextFlyout>
-    </tb:TaskbarIcon>
-</UserControl>

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

@@ -1,17 +0,0 @@
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml.Controls;
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class SystemTray : UserControl
-    {
-        public SystemTrayViewModel ViewModel => (SystemTrayViewModel)DataContext;
-
-        public SystemTray()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetService<SystemTrayViewModel>();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs

@@ -1,33 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is AlbumArtSearchProvider provider)
-            {
-                return provider switch
-                {
-                    AlbumArtSearchProvider.Local => App.ResourceLoader!.GetString("AlbumArtSearchLocalProvider"),
-                    AlbumArtSearchProvider.SMTC => App.ResourceLoader!.GetString("AlbumArtSearchSMTCProvider"),
-                    AlbumArtSearchProvider.iTunes => "iTunes",
-                    _ => throw new Exception($"Unknown AlbumArtSearchProvider: {provider}"),
-                };
-            }
-            throw new ArgumentException("Value must be of type AlbumArtSearchProvider", nameof(value));
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ColorToBrushConverter.cs

@@ -1,13 +1,15 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class ColorToBrushConverter : IValueConverter
+    public class ColorToBrushConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/CornerRadiusToDoubleConverter.cs

@@ -1,22 +0,0 @@
-using System;
-using Microsoft.UI.Xaml.Data;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    internal partial class CornerRadiusToDoubleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Microsoft.UI.Xaml.CornerRadius cornerRadius)
-            {
-                return (double)cornerRadius.TopLeft;
-            }
-            return .0;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/EnumToIntConverter.cs

@@ -1,11 +1,14 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    internal partial class EnumToIntConverter : IValueConverter
+    internal class EnumToIntConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToCornerRadius.cs

@@ -1,11 +1,14 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BetterLyrics.WinUI3.ViewModels;
 using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class IntToCornerRadius : IValueConverter
+    public class IntToCornerRadius : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LyricsSearchProviderToDisplayNameConverter.cs

@@ -1,12 +1,14 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Enums;
 using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class LyricsSearchProviderToDisplayNameConverter : IValueConverter
+    public class LyricsSearchProviderToDisplayNameConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
@@ -14,16 +16,22 @@ namespace BetterLyrics.WinUI3.Converter
             {
                 return provider switch
                 {
-                    LyricsSearchProvider.LrcLib => App.ResourceLoader!.GetString("LyricsSearchProviderLrcLib"),
-                    LyricsSearchProvider.QQ => App.ResourceLoader!.GetString("LyricsSearchProviderQQ"),
-                    LyricsSearchProvider.Netease => App.ResourceLoader!.GetString("LyricsSearchProviderNetease"),
-                    LyricsSearchProvider.Kugou => App.ResourceLoader!.GetString("LyricsSearchProviderKugou"),
-                    LyricsSearchProvider.AmllTtmlDb => App.ResourceLoader!.GetString("LyricsSearchProviderAmllTtmlDb"),
-                    LyricsSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
-                    LyricsSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),
-                    LyricsSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderEslrcFile"),
-                    LyricsSearchProvider.LocalTtmlFile => App.ResourceLoader!.GetString("LyricsSearchProviderTtmlFile"),
-                    _ => "",
+                    LyricsSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString(
+                        "LyricsSearchProviderLocalLrcFile"
+                    ),
+                    LyricsSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString(
+                        "LyricsSearchProviderLocalMusicFile"
+                    ),
+                    LyricsSearchProvider.LrcLib => App.ResourceLoader!.GetString(
+                        "LyricsSearchProviderLrcLib"
+                    ),
+                    LyricsSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString(
+                        "LyricsSearchProviderEslrcFile"
+                    ),
+                    LyricsSearchProvider.LocalTtmlFile => App.ResourceLoader!.GetString(
+                        "LyricsSearchProviderTtmlFile"
+                    ),
+                    _ => throw new ArgumentOutOfRangeException(nameof(provider), provider, null),
                 };
             }
             return "";

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MatchedLocalFilesPathToVisibilityConverter.cs

@@ -1,12 +1,10 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public partial class MatchedLocalFilesPathToVisibilityConverter : IValueConverter
+    public class MatchedLocalFilesPathToVisibilityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoStartWindowType.cs

@@ -1,4 +1,8 @@
-// 2025/6/23 by Zhe Fang
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
@@ -6,6 +10,5 @@ namespace BetterLyrics.WinUI3.Enums
     {
         StandardMode,
         DockMode,
-        DesktopMode,
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/BackdropType.cs

@@ -1,4 +1,8 @@
-// 2025/6/23 by Zhe Fang
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/DockPlacement.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum DockPlacement
-    {
-        Top,
-        Bottom
-    }
-
-    public static class DockPlacementExtensions
-    {
-        public static WindowPixelSampleMode ToWindowPixelSampleMode(this DockPlacement placement)
-        {
-            return placement switch
-            {
-                DockPlacement.Top => WindowPixelSampleMode.BelowWindow,
-                DockPlacement.Bottom => WindowPixelSampleMode.AboveWindow,
-                _ => throw new ArgumentOutOfRangeException(nameof(placement), placement, null)
-            };
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/EasingType.cs

@@ -1,20 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum EasingType
-    {
-        Linear,
-        SmoothStep,
-        EaseInOutSine,
-        EaseInOutQuad,
-        EaseInOutCubic,
-        EaseInOutQuart,
-        EaseInOutQuint,
-        EaseInOutExpo,
-        EaseInOutCirc,
-        EaseInOutBack,
-        EaseInOutElastic,
-        EaseInOutBounce,
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/Language.cs

@@ -1,6 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

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/LocalSearchTargetProps.cs

@@ -1,4 +1,8 @@
-// 2025/6/23 by Zhe Fang
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsAlignmentType.cs

@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    public enum AlbumArtSearchProvider
+    public enum LyricsAlignmentType
     {
-        Local,
-        SMTC,
-        iTunes,
+        Left,
+        Center,
+        Right,
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsDisplayType.cs

@@ -1,11 +1,10 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum LyricsDisplayType
     {
         AlbumArtOnly,
         LyricsOnly,
         SplitView,
+        PlaceholderOnly,
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontColorType.cs

@@ -1,11 +1,14 @@
-// 2025/6/23 by Zhe Fang
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
     public enum LyricsFontColorType
     {
-        AdaptiveColored,
-        AdaptiveGrayed,
-        Custom,
+        Default,
+        Dominant,
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFontWeight.cs

@@ -1,6 +1,8 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using Microsoft.UI.Text;
 using Windows.UI.Text;
 
@@ -38,7 +40,11 @@ namespace BetterLyrics.WinUI3.Enums
                 LyricsFontWeight.ExtraBold => FontWeights.ExtraBold,
                 LyricsFontWeight.Black => FontWeights.Black,
                 LyricsFontWeight.ExtraBlack => FontWeights.ExtraBlack,
-                LyricsFontWeight _ => throw new ArgumentOutOfRangeException(nameof(weight), weight, null),
+                LyricsFontWeight _ => throw new ArgumentOutOfRangeException(
+                    nameof(weight),
+                    weight,
+                    null
+                ),
             };
         }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFormat.cs

@@ -1,4 +1,8 @@
-// 2025/6/23 by Zhe Fang
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
@@ -7,45 +11,38 @@ namespace BetterLyrics.WinUI3.Enums
         Lrc,
         Eslrc,
         Ttml,
-        Qrc,
-        Krc,
-        NotSpecified,
     }
 
     public static class LyricsFormatExtensions
     {
-        public static LyricsFormat? DetectFormat(this string content)
+        public static string ToFileExtension(this LyricsFormat format)
         {
-            if (string.IsNullOrWhiteSpace(content))
-                return null;
+            return format switch
+            {
+                LyricsFormat.Lrc => ".lrc",
+                LyricsFormat.Eslrc => ".eslrc",
+                LyricsFormat.Ttml => ".ttml",
+                _ => throw new ArgumentOutOfRangeException(nameof(format), format, null),
+            };
+        }
 
-            // TTML: 检查 <tt ... xmlns="http://www.w3.org/ns/ttml"
-            if (System.Text.RegularExpressions.Regex.IsMatch(
-                    content,
-                    @"<tt\b[^>]*\bxmlns\s*=\s*[""']http://www\.w3\.org/ns/ttml[""']",
-                    System.Text.RegularExpressions.RegexOptions.IgnoreCase))
+        public static LyricsFormat? Detect(string content)
+        {
+            if (
+                content.StartsWith("<?xml")
+                && System.Text.RegularExpressions.Regex.IsMatch(content, @"<tt(:\w+)?\b")
+            )
             {
                 return LyricsFormat.Ttml;
             }
-            // KRC: 检测主内容格式 [start,duration]<offset,duration,0>字...
-            else if (System.Text.RegularExpressions.Regex.IsMatch(
-                         content,
-                         @"^\[\d+,\d+\](<\d+,\d+,0>.+)+",
-                         System.Text.RegularExpressions.RegexOptions.Multiline))
-            {
-                return LyricsFormat.Krc;
-            }
-            // QRC: 检测主内容格式 [start,duration]字(offset,duration)
-            else if (System.Text.RegularExpressions.Regex.IsMatch(
-                         content,
-                         @"^\[\d+,\d+\].*?\(\d+,\d+\)",
-                         System.Text.RegularExpressions.RegexOptions.Multiline))
-            {
-                return LyricsFormat.Qrc;
-            }
-            // 标准LRC和增强型LRC
-            else if (System.Text.RegularExpressions.Regex.IsMatch(content, @"\[\d{1,2}:\d{2}") ||
-                     System.Text.RegularExpressions.Regex.IsMatch(content, @"<\d{1,2}:\d{2}\.\d{2,3}>"))
+            // 检测标准LRC和增强型LRC
+            else if (
+                System.Text.RegularExpressions.Regex.IsMatch(content, @"\[\d{1,2}:\d{2}")
+                || System.Text.RegularExpressions.Regex.IsMatch(
+                    content,
+                    @"<\d{1,2}:\d{2}\.\d{2,3}>"
+                )
+            )
             {
                 return LyricsFormat.Lrc;
             }
@@ -54,18 +51,5 @@ namespace BetterLyrics.WinUI3.Enums
                 return null;
             }
         }
-
-        public static string ToFileExtension(this LyricsFormat format)
-        {
-            return format switch
-            {
-                LyricsFormat.Lrc => ".lrc",
-                LyricsFormat.Qrc => ".qrc",
-                LyricsFormat.Krc => ".krc",
-                LyricsFormat.Eslrc => ".eslrc",
-                LyricsFormat.Ttml => ".ttml",
-                _ => ".*",
-            };
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsGlowEffectScope.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsGlowEffectScope
+    {
+        WholeLyrics,
+        CurrentLine,
+        CurrentChar,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsHighlightType.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsHighlightType
+    {
+        LineByLine,
+        CharByChar,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsPlayingState.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsPlayingState
+    {
+        /// <summary>
+        /// Not played yet, will be playing in the future
+        /// </summary>
+        NotPlayed,
+
+        /// <summary>
+        /// Playing
+        /// </summary>
+        Playing,
+
+        /// <summary>
+        /// Has already played
+        /// </summary>
+        Played,
+    }
+}

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

@@ -1,65 +1,11 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Helper;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum LyricsSearchProvider
     {
-        QQ,
-        Kugou,
-        Netease,
         LrcLib,
-        AmllTtmlDb,
         LocalMusicFile,
         LocalLrcFile,
         LocalEslrcFile,
         LocalTtmlFile,
     }
-
-    public static class LyricsSearchProviderExtensions
-    {
-        public static string GetCacheDirectory(this LyricsSearchProvider provider)
-        {
-            return provider switch
-            {
-                LyricsSearchProvider.LrcLib => PathHelper.LrcLibLyricsCacheDirectory,
-                LyricsSearchProvider.QQ => PathHelper.QQLyricsCacheDirectory,
-                LyricsSearchProvider.Netease => PathHelper.NeteaseLyricsCacheDirectory,
-                LyricsSearchProvider.Kugou => PathHelper.KugouLyricsCacheDirectory,
-                LyricsSearchProvider.AmllTtmlDb => PathHelper.AmllTtmlDbLyricsCacheDirectory,
-                _ => throw new System.ArgumentOutOfRangeException(nameof(provider)),
-            };
-        }
-
-        public static LyricsFormat GetLyricsFormat(this LyricsSearchProvider provider)
-        {
-            return provider switch
-            {
-                LyricsSearchProvider.LrcLib => LyricsFormat.Lrc,
-                LyricsSearchProvider.QQ => LyricsFormat.Qrc,
-                LyricsSearchProvider.Kugou => LyricsFormat.Krc,
-                LyricsSearchProvider.Netease => LyricsFormat.Lrc,
-                LyricsSearchProvider.AmllTtmlDb => LyricsFormat.Ttml,
-                LyricsSearchProvider.LocalLrcFile => LyricsFormat.Lrc,
-                LyricsSearchProvider.LocalEslrcFile => LyricsFormat.Eslrc,
-                LyricsSearchProvider.LocalTtmlFile => LyricsFormat.Ttml,
-                _ => LyricsFormat.NotSpecified,
-            };
-        }
-
-        public static bool IsLocal(this LyricsSearchProvider provider)
-        {
-            return provider
-                is LyricsSearchProvider.LocalMusicFile
-                    or LyricsSearchProvider.LocalLrcFile
-                    or LyricsSearchProvider.LocalEslrcFile
-                    or LyricsSearchProvider.LocalTtmlFile;
-        }
-
-        public static bool IsRemote(this LyricsSearchProvider provider)
-        {
-            return !provider.IsLocal();
-        }
-    }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsStatus.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum LyricsStatus
+    {
+        NotFound,
+        Found,
+        Loading,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsType.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    public enum LineMaskType
+    public enum LyricsType
     {
-        Glow,
-        Highlight,
+        InAppLyrics,
+        DesktopLyrics,
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/MusicSearchMatchMode.cs

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum MusicSearchMatchMode
+    {
+        TitleAndArtist,
+        TitleArtistAlbumAndDuration,
+    }
+}

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarType.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum TitleBarType
+    {
+        Compact,
+        Extended,
+    }
+
+    public static class TitleBarTypeExtensions
+    {
+        public static double GetHeight(this TitleBarType titleBarType)
+        {
+            return titleBarType switch
+            {
+                TitleBarType.Compact => 32.0,
+                TitleBarType.Extended => 48.0,
+                _ => throw new ArgumentOutOfRangeException(
+                    nameof(titleBarType),
+                    titleBarType,
+                    null
+                ),
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/WindowPixelSampleMode.cs

@@ -1,10 +0,0 @@
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum WindowPixelSampleMode
-    {
-        BelowWindow,
-        AboveWindow,
-        WindowArea,
-        WindowEdge,
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/AlbumArtChangedEventArgs.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Graphics.Imaging;
-using Windows.UI;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class AlbumArtChangedEventArgs : EventArgs
-    {
-        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = null;
-        public Color? AlbumArtAccentColor { get; set; } = null;
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/IsPlayingChangedEventArgs.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LibChangedEventArgs.cs

@@ -1,6 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -9,10 +7,17 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class LibChangedEventArgs(string folder, string filePath, WatcherChangeTypes changeType) : EventArgs
+    public class LibChangedEventArgs : EventArgs
     {
-        public WatcherChangeTypes ChangeType { get; } = changeType;
-        public string FilePath { get; } = filePath;
-        public string Folder { get; } = folder;
+        public string Folder { get; }
+        public string FilePath { get; }
+        public WatcherChangeTypes ChangeType { get; }
+
+        public LibChangedEventArgs(string folder, string filePath, WatcherChangeTypes changeType)
+        {
+            Folder = folder;
+            FilePath = filePath;
+            ChangeType = changeType;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/MediaSourceProvidersInfoEventArgs.cs

@@ -1,14 +0,0 @@
-using BetterLyrics.WinUI3.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class MediaSourceProvidersInfoEventArgs(List<MediaSourceProviderInfo> sessionIds):EventArgs
-    {
-        public List<MediaSourceProviderInfo> MediaSourceProviersInfo { get; set; } = sessionIds;
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/PositionChangedEventArgs.cs

@@ -1,11 +1,13 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Events
 {
     public class PositionChangedEventArgs(TimeSpan position) : EventArgs()
     {
         public TimeSpan Position { get; set; } = position;
-    }
+}
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/SongInfoChangedEventArgs.cs

@@ -1,6 +1,8 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Events
@@ -8,5 +10,5 @@ namespace BetterLyrics.WinUI3.Events
     public class SongInfoChangedEventArgs(SongInfo? songInfo) : EventArgs
     {
         public SongInfo? SongInfo { get; set; } = songInfo;
-    }
+}
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AnimationHelper.cs

@@ -0,0 +1,79 @@
+using System;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class AnimationHelper
+    {
+        public const int StackedNotificationsShowingDuration = 3900;
+        public const int StoryboardDefaultDuration = 200;
+        public const int DebounceDefaultDuration = 200;
+    }
+
+    public class ValueTransition<T>
+        where T : struct
+    {
+        private T _currentValue;
+        private T _startValue;
+        private T _targetValue;
+        private float _progress;
+        private float _durationSeconds;
+        private bool _isTransitioning;
+        private Func<T, T, float, T> _interpolator;
+
+        public ValueTransition(
+            T initialValue,
+            float durationSeconds,
+            Func<T, T, float, T> interpolator
+        )
+        {
+            _currentValue = initialValue;
+            _startValue = initialValue;
+            _targetValue = initialValue;
+            _durationSeconds = durationSeconds;
+            _progress = 1f;
+            _isTransitioning = false;
+            _interpolator = interpolator;
+        }
+
+        public T Value => _currentValue;
+        public bool IsTransitioning => _isTransitioning;
+
+        public void StartTransition(T targetValue)
+        {
+            if (!targetValue.Equals(_currentValue))
+            {
+                _startValue = _currentValue;
+                _targetValue = targetValue;
+                _progress = 0f;
+                _isTransitioning = true;
+            }
+        }
+
+        public void Update(TimeSpan elapsedTime)
+        {
+            if (!_isTransitioning)
+                return;
+
+            _progress += (float)elapsedTime.TotalSeconds / _durationSeconds;
+            if (_progress >= 1f)
+            {
+                _progress = 1f;
+                _currentValue = _targetValue;
+                _isTransitioning = false;
+            }
+            else
+            {
+                _currentValue = _interpolator(_startValue, _targetValue, _progress);
+            }
+        }
+
+        public void Reset(T value)
+        {
+            _currentValue = value;
+            _startValue = value;
+            _targetValue = value;
+            _progress = 0f;
+            _isTransitioning = false;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppInfo.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    using System;
+    using System.IO;
+    using Windows.ApplicationModel;
+    using Windows.Storage;
+
+    public static class AppInfo
+    {
+        // App Metadata
+        public const string AppName = "BetterLyrics";
+        public const string AppDisplayName = "Better Lyrics";
+        public const string AppAuthor = "Zhe Fang";
+        public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
+        public static string AppVersion
+        {
+            get
+            {
+                var version = Package.Current.Id.Version;
+                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
+            }
+        }
+
+        // Environment Info
+        public static bool IsDebug =>
+#if DEBUG
+            true;
+#else
+            false;
+#endif
+
+        // Base Folders
+        private static string LocalFolder => ApplicationData.Current.LocalFolder.Path;
+        public static string CacheFolder => ApplicationData.Current.LocalCacheFolder.Path;
+        public static string AssetsFolder => Path.Combine(Package.Current.InstalledPath, "Assets");
+
+        // Data Files
+
+        public static string LogDirectory => Path.Combine(CacheFolder, "logs");
+        public static string LogFilePattern => Path.Combine(LogDirectory, "log-.txt");
+
+        public static string OnlineLyricsCacheDirectory =>
+            Path.Combine(CacheFolder, "online-lyrics");
+
+        private static string TestMusicFileName => "AI - 甜度爆表.mp3";
+        public static string TestMusicPath => Path.Combine(AssetsFolder, TestMusicFileName);
+
+        public static void EnsureDirectories()
+        {
+            Directory.CreateDirectory(LocalFolder);
+            Directory.CreateDirectory(LogDirectory);
+            Directory.CreateDirectory(OnlineLyricsCacheDirectory);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CollectionHelper.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class CollectionHelper
+    {
+        public static T? SafeGet<T>(this IList<T> list, int index)
+        {
+            if (list == null || index < 0 || index >= list.Count)
+                return default;
+            return list[index];
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs

@@ -1,58 +1,24 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI;
-using Microsoft.UI.Xaml;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using Vanara.PInvoke;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using Windows.UI;
 
-using Color = Windows.UI.Color;
-
 namespace BetterLyrics.WinUI3.Helper
 {
     public static class ColorHelper
     {
-        public static ElementTheme GetElementThemeFromBackgroundColor(Color backgroundColor)
+        public static Windows.UI.Color ToWindowsUIColor(this System.Drawing.Color color)
         {
-            // 计算亮度（YIQ公式）
-            double yiq =
-                ((backgroundColor.R * 299) + (backgroundColor.G * 587) + (backgroundColor.B * 114))
-                / 1000.0;
-            return yiq >= 128 ? ElementTheme.Light : ElementTheme.Dark;
+            return Windows.UI.Color.FromArgb(color.A, color.R, color.G, color.B);
         }
 
-        public static Color GetForegroundColor(Color background)
-        {
-            // 转为 HSL
-            var hsl = CommunityToolkit.WinUI.Helpers.ColorHelper.ToHsl(background);
-            double h = hsl.H;
-            double s = hsl.S;
-            double l = hsl.L;
-
-            // 目标亮度与背景错开，但不极端
-            double targetL;
-            if (l >= 0.7)
-                targetL = 0.35; // 背景很亮，前景适中偏暗
-            else if (l <= 0.3)
-                targetL = 0.75; // 背景很暗，前景适中偏亮
-            else
-                targetL = l > 0.5 ? l - 0.35 : l + 0.35; // 其余情况适度错开
-
-            // 保持色相，适当提升饱和度
-            double targetS = Math.Min(1.0, s + 0.2);
-
-            // 转回 Color
-            var fg = CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, targetS, targetL);
-
-            // 保持不透明
-            return Color.FromArgb(255, fg.R, fg.G, fg.B);
-        }
-
-        public static Color GetInterpolatedColor(float progress, Color startColor, Color targetColor)
+        public static Color GetInterpolatedColor(
+            float progress,
+            Color startColor,
+            Color targetColor
+        )
         {
             byte Lerp(byte a, byte b) => (byte)(a + (progress * (b - a)));
             return Color.FromArgb(
@@ -62,190 +28,5 @@ namespace BetterLyrics.WinUI3.Helper
                 Lerp(startColor.B, targetColor.B)
             );
         }
-
-        public static Color ToColor(this int argb)
-        {
-            byte a = (byte)(argb >> 24);
-            byte r = (byte)(argb >> 16);
-            byte g = (byte)(argb >> 8);
-            byte b = (byte)argb;
-
-            // 还原非预乘分量
-            if (a == 0)
-                return Color.FromArgb(0, 0, 0, 0);
-
-            // 预乘解码
-            // 这里 a+1 是编码时的分母
-            int ap1 = a + 1;
-            r = (byte)Math.Min(255, (r * 255 + (ap1 / 2)) / ap1);
-            g = (byte)Math.Min(255, (g * 255 + (ap1 / 2)) / ap1);
-            b = (byte)Math.Min(255, (b * 255 + (ap1 / 2)) / ap1);
-
-            return Color.FromArgb(a, r, g, b);
-        }
-
-        public static Color ToColor(this System.Drawing.Color color)
-        {
-            return Color.FromArgb(color.A, color.R, color.G, color.B);
-        }
-
-        public static Color WithAlpha(this Color color, byte alpha)
-        {
-            return Color.FromArgb(alpha, color.R, color.G, color.B);
-        }
-
-        public static Color WithBrightness(this Color color, double brightness)
-        {
-            // 确保亮度因子在合理范围内
-            brightness = Math.Max(0, Math.Min(1, brightness));
-
-            var hsl = CommunityToolkit.WinUI.Helpers.ColorHelper.ToHsl(color);
-            double h = hsl.H;
-            double s = hsl.S;
-
-            return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
-        }
-
-        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, WindowPixelSampleMode mode)
-        {
-            if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
-
-            switch (mode)
-            {
-                case WindowPixelSampleMode.BelowWindow:
-                    {
-                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Bottom + 1;
-                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
-                    }
-                case WindowPixelSampleMode.AboveWindow:
-                    {
-                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Top - 1;
-                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
-                    }
-                case WindowPixelSampleMode.WindowArea:
-                    {
-                        int width = myRect.Right - myRect.Left;
-                        int height = myRect.Bottom - myRect.Top;
-                        if (width <= 0 || height <= 0)
-                            return System.Drawing.Color.Transparent;
-                        // 采集窗口区域的平均色
-                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top, width, height);
-                    }
-                case WindowPixelSampleMode.WindowEdge:
-                    {
-                        int width = myRect.Right - myRect.Left;
-                        int height = myRect.Bottom - myRect.Top;
-                        if (width <= 0 || height <= 0)
-                            return System.Drawing.Color.Transparent;
-
-                        var edgeThickness = new Thickness(36, 0, 36, 0);
-                        List<System.Drawing.Color> edgeColors = [];
-
-                        // Top edge
-                        if (edgeThickness.Top > 0 && edgeThickness.Top < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top,
-                                    width,
-                                    (int)edgeThickness.Top
-                                )
-                            );
-                        // Bottom edge
-                        if (edgeThickness.Bottom > 0 && edgeThickness.Bottom < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Bottom - (int)edgeThickness.Bottom,
-                                    width,
-                                    (int)edgeThickness.Bottom
-                                )
-                            );
-                        // Left edge
-                        if (edgeThickness.Left > 0 && edgeThickness.Left < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Left,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
-                        // Right edge
-                        if (edgeThickness.Right > 0 && edgeThickness.Right < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Right - (int)edgeThickness.Right,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Right,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
-
-                        // 合并四边平均色
-                        if (edgeColors.Count == 0)
-                            return System.Drawing.Color.Transparent;
-                        long r = 0,
-                            g = 0,
-                            b = 0;
-                        foreach (var c in edgeColors)
-                        {
-                            r += c.R;
-                            g += c.G;
-                            b += c.B;
-                        }
-                        return System.Drawing.Color.FromArgb(
-                            255,
-                            (int)(r / edgeColors.Count),
-                            (int)(g / edgeColors.Count),
-                            (int)(b / edgeColors.Count)
-                        );
-                    }
-                default:
-                    return System.Drawing.Color.Transparent;
-            }
-        }
-
-        private static System.Drawing.Color GetAverageColorFromScreenRegion(int x, int y, int width, int height)
-        {
-            using Bitmap bmp = new(width, height, PixelFormat.Format32bppArgb);
-            using Graphics gDest = Graphics.FromImage(bmp);
-
-            IntPtr hdcDest = gDest.GetHdc();
-            IntPtr hdcSrc = (nint)User32.GetDC(IntPtr.Zero); // Entire screen
-
-            Gdi32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, Gdi32.RasterOperationMode.SRCCOPY);
-
-            gDest.ReleaseHdc(hdcDest);
-            User32.ReleaseDC(IntPtr.Zero, hdcSrc);
-
-            return ComputeAverageColor(bmp);
-        }
-
-        private static System.Drawing.Color ComputeAverageColor(Bitmap bmp)
-        {
-            long r = 0, g = 0, b = 0;
-            int count = 0;
-
-            for (int y = 0; y < bmp.Height; y++)
-            {
-                for (int x = 0; x < bmp.Width; x++)
-                {
-                    System.Drawing.Color pixel = bmp.GetPixel(x, y);
-                    r += pixel.R;
-                    g += pixel.G;
-                    b += pixel.B;
-                    count++;
-                }
-            }
-
-            if (count == 0) return System.Drawing.Color.Transparent;
-            return System.Drawing.Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
-        }
-
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DesktopModeHelper.cs

@@ -1,173 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class DesktopModeHelper
-    {
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
-        private static readonly Dictionary<IntPtr, bool> _originalTopmostStates = [];
-        private static readonly Dictionary<IntPtr, nint> _oldWndProcs = new();
-        private static readonly Dictionary<IntPtr, (double X, double Y, double Width, double Height)> _originalWindowBounds = [];
-        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
-        private static List<Rectangle> _interactiveRects = new();
-
-        private delegate nint WndProcDelegate(nint hWnd, uint msg, nint wParam, nint lParam);
-
-        public static void Disable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20>ָ<EFBFBD>TopMost״̬
-            if (_originalTopmostStates.TryGetValue(hwnd, out var wasTopMost))
-            {
-                window.SetIsAlwaysOnTop(wasTopMost);
-                _originalTopmostStates.Remove(hwnd);
-            }
-
-            // <20>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            if (_originalWindowBounds.TryGetValue(hwnd, out var bounds))
-            {
-                window.AppWindow.MoveAndResize(
-                    new Windows.Graphics.RectInt32(
-                        (int)bounds.X,
-                        (int)bounds.Y,
-                        (int)bounds.Width,
-                        (int)bounds.Height
-                    )
-                );
-                _originalWindowBounds.Remove(hwnd);
-            }
-
-            window.SetIsShownInSwitchers(true);
-        }
-
-        public static void Enable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20><>¼ԭʼ<D4AD><CABC><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            if (!_originalWindowBounds.ContainsKey(hwnd))
-            {
-                _originalWindowBounds[hwnd] = (
-                    window.AppWindow.Position.X,
-                    window.AppWindow.Position.Y,
-                    window.AppWindow.Size.Width,
-                    window.AppWindow.Size.Height
-                );
-            }
-
-            // <20>Ӵ洢<D3B4><E6B4A2><EFBFBD><EFBFBD>ȡĿ<C8A1><C4BF><EFBFBD><EFBFBD><EFBFBD>ߺ<EFBFBD>λ<EFBFBD><CEBB>
-            int targetWidth = _settingsService.DesktopWindowWidth;
-            int targetHeight = _settingsService.DesktopWindowHeight;
-            int targetX = _settingsService.DesktopWindowLeft;
-            int targetY = _settingsService.DesktopWindowTop;
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
-            window.AppWindow.MoveAndResize(
-                new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
-            );
-
-            // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
-            if (!_originalTopmostStates.ContainsKey(hwnd))
-                _originalTopmostStates[hwnd] = window.GetIsAlwaysOnTop();
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>ö<EFBFBD>
-            window.SetIsAlwaysOnTop(true);
-
-            window.SetIsShownInSwitchers(false);
-        }
-
-        public static void SetClickThrough(Window window, bool enable)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-            int exStyle = User32.GetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE);
-
-            if (enable)
-            {
-                // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
-                if (!_originalWindowStyles.ContainsKey(hwnd))
-                    _originalWindowStyles[hwnd] = window.GetWindowStyle();
-
-                window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
-                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle | (int)User32.WindowStylesEx.WS_EX_TRANSPARENT | (int)User32.WindowStylesEx.WS_EX_LAYERED);
-
-                //// <20><>װ<EFBFBD>Զ<EFBFBD><D4B6><EFBFBD>WndProc
-                //if (!_oldWndProcs.ContainsKey(hwnd))
-                //{
-                //    nint newWndProc = Marshal.GetFunctionPointerForDelegate((WndProcDelegate)((hWnd, msg, wParam, lParam) =>
-                //        CustomWndProc(hWnd, msg, wParam, lParam, hwnd)
-                //    ));
-                //    nint oldWndProc = User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWLP_WNDPROC, newWndProc);
-                //    _oldWndProcs[hwnd] = oldWndProc;
-                //}
-            }
-            else
-            {
-                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle & ~(int)User32.WindowStylesEx.WS_EX_TRANSPARENT);
-                // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
-                if (_originalWindowStyles.TryGetValue(hwnd, out var style))
-                {
-                    window.SetWindowStyle(style);
-                    _originalWindowStyles.Remove(hwnd);
-                }
-
-                //// <20>ָ<EFBFBD>ԭWndProc
-                //if (_oldWndProcs.TryGetValue(hwnd, out var oldWndProc))
-                //{
-                //    User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWLP_WNDPROC, oldWndProc);
-                //    _oldWndProcs.Remove(hwnd);
-                //}
-            }
-        }
-
-        private static nint CustomWndProc(nint hWnd, uint msg, nint wParam, nint lParam, IntPtr hwnd)
-        {
-            const int WM_NCHITTEST = 0x84;
-            const int HTCLIENT = 1;
-            const int HTTRANSPARENT = -1;
-
-            if (msg == WM_NCHITTEST)
-            {
-                int x = (short)(lParam.ToInt32() & 0xFFFF);
-                int y = (short)((lParam.ToInt32() >> 16) & 0xFFFF);
-
-                // תΪ<D7AA><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                POINT pt = new() { x = x, y = y };
-                User32.ScreenToClient(hWnd, ref pt);
-
-                foreach (var rect in _interactiveRects)
-                {
-                    if (rect.Contains(pt.x, pt.y))
-                        return HTCLIENT;
-                }
-                return HTTRANSPARENT;
-            }
-
-            // <20><><EFBFBD><EFBFBD>ԭWndProc
-            if (_oldWndProcs.TryGetValue(hwnd, out var oldWndProc))
-            {
-                return User32.CallWindowProc(oldWndProc, hWnd, msg, wParam, lParam);
-            }
-            return User32.DefWindowProc(hWnd, msg, wParam, lParam);
-        }
-
-        public static void SetInteractiveRects(IEnumerable<Rectangle> rects)
-        {
-            _interactiveRects = rects.ToList();
-        }
-
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DockHelper.cs

@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using WinRT.Interop;
+using WinUIEx;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class DockHelper
+    {
+        private static readonly HashSet<IntPtr> _registered = [];
+
+        private static readonly Dictionary<IntPtr, RECT> _originalPositions = [];
+
+        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyle = [];
+
+        public static void Disable(Window window)
+        {
+            window.SetIsShownInSwitchers(true);
+            window.ExtendsContentIntoTitleBar = true;
+            window.SetIsAlwaysOnTop(false);
+
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            window.SetWindowStyle(_originalWindowStyle[hwnd]);
+            _originalWindowStyle.Remove(hwnd);
+
+            if (_originalPositions.TryGetValue(hwnd, out var rect))
+            {
+                SetWindowPos(
+                    hwnd,
+                    IntPtr.Zero,
+                    rect.left,
+                    rect.top,
+                    rect.right - rect.left,
+                    rect.bottom - rect.top,
+                    SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_SHOWWINDOW
+                );
+                _originalPositions.Remove(hwnd);
+            }
+
+            UnregisterAppBar(hwnd);
+        }
+
+        public static void Enable(Window window, int appBarHeight)
+        {
+            window.SetIsShownInSwitchers(false);
+            window.ExtendsContentIntoTitleBar = false;
+            window.SetIsAlwaysOnTop(true);
+
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_originalWindowStyle.ContainsKey(hwnd))
+            {
+                _originalWindowStyle[hwnd] = window.GetWindowStyle();
+            }
+            window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+
+            if (!_originalPositions.ContainsKey(hwnd))
+            {
+                if (GetWindowRect(hwnd, out var rect))
+                {
+                    _originalPositions[hwnd] = rect;
+                }
+            }
+
+            RegisterAppBar(hwnd, appBarHeight);
+
+            int screenWidth = GetSystemMetrics(SM_CXSCREEN);
+            int screenHeight = GetSystemMetrics(SM_CYSCREEN);
+            SetWindowPos(
+                hwnd,
+                IntPtr.Zero,
+                0,
+                0,
+                screenWidth,
+                appBarHeight,
+                SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_SHOWWINDOW
+            );
+        }
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+        #region AppBar registration
+        private const uint ABM_NEW = 0x00000000;
+        private const uint ABM_REMOVE = 0x00000001;
+        private const uint ABM_SETPOS = 0x00000003;
+        private const int ABE_TOP = 1;
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct APPBARDATA
+        {
+            public int cbSize;
+            public IntPtr hWnd;
+            public uint uCallbackMessage;
+            public uint uEdge;
+            public RECT rc;
+            public int lParam;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct RECT
+        {
+            public int left,
+                top,
+                right,
+                bottom;
+        }
+
+        [DllImport("shell32.dll", SetLastError = true)]
+        private static extern uint SHAppBarMessage(uint dwMessage, ref APPBARDATA pData);
+
+        private static void RegisterAppBar(IntPtr hwnd, int height)
+        {
+            if (_registered.Contains(hwnd))
+                return;
+
+            APPBARDATA abd = new()
+            {
+                cbSize = Marshal.SizeOf<APPBARDATA>(),
+                hWnd = hwnd,
+                uEdge = ABE_TOP,
+                rc = new RECT
+                {
+                    left = 0,
+                    top = 0,
+                    right = GetSystemMetrics(SM_CXSCREEN),
+                    bottom = height,
+                },
+            };
+
+            SHAppBarMessage(ABM_NEW, ref abd);
+            SHAppBarMessage(ABM_SETPOS, ref abd);
+
+            _registered.Add(hwnd);
+        }
+
+        private static void UnregisterAppBar(IntPtr hwnd)
+        {
+            if (!_registered.Contains(hwnd))
+                return;
+
+            APPBARDATA abd = new() { cbSize = Marshal.SizeOf<APPBARDATA>(), hWnd = hwnd };
+
+            SHAppBarMessage(ABM_REMOVE, ref abd);
+            _registered.Remove(hwnd);
+        }
+        #endregion
+
+        #region Win32 Helper and Constants
+
+        private const int SWP_NOACTIVATE = 0x0010;
+        private const int SWP_NOOWNERZORDER = 0x0200;
+        private const int SWP_SHOWWINDOW = 0x0040;
+
+        private const int SM_CXSCREEN = 0;
+        private const int SM_CYSCREEN = 0;
+
+        [DllImport("user32.dll")]
+        private static extern int GetSystemMetrics(int nIndex);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool SetWindowPos(
+            IntPtr hWnd,
+            IntPtr hWndInsertAfter,
+            int X,
+            int Y,
+            int cx,
+            int cy,
+            uint uFlags
+        );
+
+        /// <summary>
+        /// 更改已注册 AppBar 的高度。
+        /// </summary>
+        /// <param name="window">目标窗口</param>
+        /// <param name="newHeight">新的高度</param>
+        public static void UpdateAppBarHeight(IntPtr hwnd, int newHeight)
+        {
+            if (!_registered.Contains(hwnd))
+                return;
+
+            APPBARDATA abd = new()
+            {
+                cbSize = Marshal.SizeOf<APPBARDATA>(),
+                hWnd = hwnd,
+                uEdge = ABE_TOP,
+                rc = new RECT
+                {
+                    left = 0,
+                    top = 0,
+                    right = GetSystemMetrics(SM_CXSCREEN),
+                    bottom = newHeight,
+                },
+            };
+
+            SHAppBarMessage(ABM_SETPOS, ref abd);
+
+            // 同步窗口实际高度
+            SetWindowPos(
+                hwnd,
+                IntPtr.Zero,
+                0,
+                0,
+                GetSystemMetrics(SM_CXSCREEN),
+                newHeight,
+                SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_SHOWWINDOW
+            );
+        }
+        #endregion
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DockModeHelper.cs

@@ -1,188 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class DockModeHelper
-    {
-        private static readonly HashSet<IntPtr> _registered = [];
-        private static readonly Dictionary<IntPtr, RECT> _originalPositions = [];
-        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyle = [];
-
-        public static void Disable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (!_registered.Contains(hwnd)) return;
-
-            window.SetIsShownInSwitchers(true);
-            window.ExtendsContentIntoTitleBar = true;
-            window.SetIsAlwaysOnTop(false);
-
-            UnregisterAppBar(hwnd);
-            RefreshWorkArea();
-
-            window.SetWindowStyle(_originalWindowStyle[hwnd]);
-            _originalWindowStyle.Remove(hwnd);
-
-            if (_originalPositions.TryGetValue(hwnd, out var rect))
-            {
-                User32.SetWindowPos(
-                    hwnd,
-                    IntPtr.Zero,
-                    rect.Left,
-                    rect.Top,
-                    rect.Right - rect.Left,
-                    rect.Bottom - rect.Top,
-                    User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                );
-                _originalPositions.Remove(hwnd);
-            }
-        }
-
-        public static void Enable(Window window, int appBarHeight, DockPlacement dockPlacement)
-        {
-            window.SetIsShownInSwitchers(false);
-            window.ExtendsContentIntoTitleBar = false;
-            window.SetIsAlwaysOnTop(true);
-
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (!_originalWindowStyle.ContainsKey(hwnd))
-            {
-                _originalWindowStyle[hwnd] = window.GetWindowStyle();
-            }
-            window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
-
-            if (!_originalPositions.ContainsKey(hwnd))
-            {
-                if (User32.GetWindowRect(hwnd, out var rect))
-                {
-                    _originalPositions[hwnd] = rect;
-                }
-            }
-
-            RegisterAppBar(hwnd, appBarHeight, dockPlacement);
-
-            int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
-            int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
-            int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - appBarHeight;
-            User32.SetWindowPos(
-                hwnd,
-                IntPtr.Zero,
-                0,
-                y,
-                screenWidth,
-                appBarHeight,
-                User32.SetWindowPosFlags.SWP_SHOWWINDOW
-            );
-
-            RefreshWorkArea();
-        }
-
-        private static void RegisterAppBar(IntPtr hwnd, int height, DockPlacement dockPlacement)
-        {
-            if (_registered.Contains(hwnd)) return;
-
-            var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-            int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
-            int top = dockPlacement == DockPlacement.Top ? 0 : screenHeight - height;
-            int bottom = dockPlacement == DockPlacement.Top ? height : screenHeight;
-
-            Shell32.APPBARDATA abd = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd,
-                uEdge = uEdge,
-                rc = new RECT
-                {
-                    Left = 0,
-                    Top = top,
-                    Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
-                    Bottom = bottom,
-                },
-            };
-
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
-
-            _registered.Add(hwnd);
-        }
-
-        private static void UnregisterAppBar(IntPtr hwnd)
-        {
-            if (!_registered.Contains(hwnd))
-                return;
-
-            Shell32.APPBARDATA abd = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd
-            };
-
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
-
-            _registered.Remove(hwnd);
-        }
-
-        private static void RefreshWorkArea()
-        {
-            User32.SendMessage(HWND.HWND_BROADCAST, User32.WindowMessage.WM_SETTINGCHANGE, IntPtr.Zero, IntPtr.Zero);
-        }
-
-        public static void UpdateAppBarHeight(IntPtr hwnd, int newHeight, DockPlacement dockPlacement)
-        {
-            App.DispatcherQueueTimer?.Debounce(() =>
-            {
-                if (!_registered.Contains(hwnd))
-                    return;
-
-                var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-                int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
-                int top = dockPlacement == DockPlacement.Top ? 0 : screenHeight - newHeight;
-                int bottom = dockPlacement == DockPlacement.Top ? newHeight : screenHeight;
-
-                Shell32.APPBARDATA abd = new()
-                {
-                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                    hWnd = hwnd,
-                    uEdge = uEdge,
-                    rc = new RECT
-                    {
-                        Left = 0,
-                        Top = top,
-                        Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
-                        Bottom = bottom,
-                    },
-                };
-
-                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
-
-                // 同步窗口实际高度和位置
-                int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - newHeight;
-                User32.SetWindowPos(
-                    hwnd,
-                    IntPtr.Zero,
-                    0,
-                    y,
-                    User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
-                    newHeight,
-                    User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                );
-
-                RefreshWorkArea();
-            }, TimeSpan.FromMilliseconds(100));
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/EasingHelper.cs

@@ -1,6 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,103 +8,43 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class EasingHelper
     {
-        public static float EaseInOutSine(float t)
-        {
-            return -(MathF.Cos(MathF.PI * t) - 1f) / 2f;
-        }
+        /// <summary>
+        /// No easing
+        /// </summary>
+        public static float Linear(float t) => t;
+
+        /// <summary>
+        /// Accelerating from 0
+        /// </summary>
+        public static float EaseInQuad(float t) => t * t;
+
+        /// <summary>
+        /// Decelerating to 0
+        /// </summary>
+        public static float EaseOutQuad(float t) => t * (2 - t);
+
+        /// <summary>
+        /// Acceleration until halfway then deceleration
+        /// </summary>
         public static float EaseInOutQuad(float t)
         {
             return t < 0.5f ? 2 * t * t : -1 + (4 - 2 * t) * t;
         }
 
-        public static float EaseInOutCubic(float t)
-        {
-            return t < 0.5f ? 4 * t * t * t : 1 - MathF.Pow(-2 * t + 2, 3) / 2;
-        }
-        public static float EaseInOutQuart(float t)
-        {
-            return t < 0.5f ? 8 * t * t * t * t : 1 - MathF.Pow(-2 * t + 2, 4) / 2;
-        }
-
-        public static float EaseInOutQuint(float t)
-        {
-            return t < 0.5f ? 16 * t * t * t * t * t : 1 - MathF.Pow(-2 * t + 2, 5) / 2;
-        }
-
-        public static float EaseInOutExpo(float t)
-        {
-            return t == 0
-              ? 0
-              : t == 1
-              ? 1
-              : t < 0.5 ? MathF.Pow(2, 20 * t - 10) / 2
-              : (2 - MathF.Pow(2, -20 * t + 10)) / 2;
-        }
-
-        public static float EaseInOutCirc(float t)
-        {
-            return t < 0.5f
-              ? (1 - MathF.Sqrt(1 - MathF.Pow(2 * t, 2))) / 2
-              : (MathF.Sqrt(1 - MathF.Pow(-2 * t + 2, 2)) + 1) / 2;
-        }
-
-        public static float EaseInOutBack(float t)
-        {
-            float c1 = 1.70158f;
-            float c2 = c1 * 1.525f;
-
-            return t < 0.5
-              ? (MathF.Pow(2 * t, 2) * ((c2 + 1) * 2 * t - c2)) / 2
-              : (MathF.Pow(2 * t - 2, 2) * ((c2 + 1) * (t * 2 - 2) + c2) + 2) / 2;
-        }
-
-        public static float EaseInOutElastic(float t)
-        {
-            if (t == 0 || t == 1) return t;
-            float p = 0.3f;
-            float s = p / 4;
-            return t < 0.5f
-              ? -(MathF.Pow(2, 20 * t - 10) * MathF.Sin((20 * t - 11.125f) * (2 * MathF.PI) / p)) / 2
-              : (MathF.Pow(2, -20 * t + 10) * MathF.Sin((20 * t - 11.125f) * (2 * MathF.PI) / p)) / 2 + 1;
-        }
-
-        private static float EaseOutBounce(float t)
-        {
-            if (t < 4 / 11f)
-            {
-                return (121 * t * t) / 16f;
-            }
-            else if (t < 8 / 11f)
-            {
-                return (363 / 40f * t * t) - (99 / 10f * t) + 17 / 5f;
-            }
-            else if (t < 9 / 10f)
-            {
-                return (4356 / 361f * t * t) - (35442 / 1805f * t) + 16061 / 1805f;
-            }
-            else
-            {
-                return (54 / 5f * t * t) - (513 / 25f * t) + 268 / 25f;
-            }
-        }
-
-        public static float EaseInOutBounce(float t)
-        {
-            if (t < 0.5f)
-            {
-                return (1 - EaseOutBounce(1 - 2 * t)) / 2;
-            }
-            else
-            {
-                return (1 + EaseOutBounce(2 * t - 1)) / 2;
-            }
-        }
-
+        /// <summary>
+        /// Smoother transition than linear
+        /// </summary>
         public static float SmoothStep(float t)
         {
-            return t * t * (3f - 2f * t);
+            return t * t * (3 - 2 * t);
         }
 
-        public static float Linear(float t) => t;
+        /// <summary>
+        /// Even smoother transition with continuous first and second derivatives
+        /// </summary>
+        public static float SmootherStep(float t)
+        {
+            return t * t * t * (t * (6 * t - 15) + 10);
+        }
     }
 }

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

@@ -1,9 +1,9 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using System;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using Ude;
 
 namespace BetterLyrics.WinUI3.Helper
@@ -23,60 +23,5 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return Encoding.GetEncoding(encoding);
         }
-
-        public static string SanitizeFileName(string fileName, char replacement = '_')
-        {
-            var invalidChars = Path.GetInvalidFileNameChars();
-            var sb = new StringBuilder(fileName.Length);
-            foreach (var c in fileName)
-            {
-                sb.Append(Array.IndexOf(invalidChars, c) >= 0 ? replacement : c);
-            }
-            return sb.ToString();
-        }
-
-        public static string? ReadLyricsCache(string title, string artist, LyricsFormat format, string cacheFolderPath)
-        {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
-            if (File.Exists(cacheFilePath))
-            {
-                return File.ReadAllText(cacheFilePath);
-            }
-            return null;
-        }
-
-        public static byte[]? ReadAlbumArtCache(string album, string artist, string format, string cacheFolderPath)
-        {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {album}{format}"));
-            if (File.Exists(cacheFilePath))
-            {
-                return File.ReadAllBytes(cacheFilePath);
-            }
-            return null;
-        }
-
-        public static void WriteLyricsCache(string title, string artist, string lyrics, LyricsFormat format, string cacheFolderPath)
-        {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
-            File.WriteAllText(cacheFilePath, lyrics);
-        }
-
-        public static void WriteAlbumArtCache(string album, string artist, byte[] img, string format, string cacheFolderPath)
-        {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {album}{format}"));
-            File.WriteAllBytes(cacheFilePath, img);
-        }
-
-        public static bool IsSwitchableNormalizedMatch(string fileName, string q1, string q2)
-        {
-            var normFileName = StringHelper.Normalize(fileName.Normalize());
-            var normQ1 = StringHelper.Normalize(q1);
-            var normQ2 = StringHelper.Normalize(q2);
-
-            // 常见两种顺序
-            return normFileName == normQ1 + normQ2
-                || normFileName == normQ2 + normQ1;
-        }
-
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcher.cs

@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.UI.Xaml;
-using Vanara.PInvoke;
-using Windows.System;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class ForegroundWindowWatcher
-    {
-        private readonly User32.WinEventProc _winEventDelegate;
-        private readonly List<User32.HWINEVENTHOOK> _hooks = new();
-        private HWND _currentForeground = HWND.NULL;
-        private readonly IntPtr _selfHwnd;
-
-        public delegate void WindowChangedHandler(HWND hwnd);
-        private readonly WindowChangedHandler _onWindowChanged;
-
-        private readonly DispatcherTimer _timer;
-
-        public ForegroundWindowWatcher(IntPtr selfHwnd, WindowChangedHandler onWindowChanged)
-        {
-            _selfHwnd = selfHwnd;
-            _onWindowChanged = onWindowChanged;
-            _winEventDelegate = new User32.WinEventProc(WinEventProc);
-
-            _timer = new DispatcherTimer();
-            _timer.Interval = TimeSpan.FromSeconds(1);
-            _timer.Tick += Timer_Tick;
-        }
-
-        public void Start()
-        {
-            // Hook: foreground changes and minimize end
-            _hooks.Add(
-                User32.SetWinEventHook(
-                    User32.EventConstants.EVENT_SYSTEM_FOREGROUND,
-                    User32.EventConstants.EVENT_SYSTEM_MINIMIZEEND,
-                    HINSTANCE.NULL,
-                    _winEventDelegate,
-                    0,
-                    0,
-                    User32.WINEVENT.WINEVENT_OUTOFCONTEXT
-                )
-            );
-
-            // Hook: window move/resize (location change)
-            _hooks.Add(
-                User32.SetWinEventHook(
-                    User32.EventConstants.EVENT_OBJECT_LOCATIONCHANGE,
-                    User32.EventConstants.EVENT_OBJECT_LOCATIONCHANGE,
-                    HINSTANCE.NULL,
-                    _winEventDelegate,
-                    0,
-                    0,
-                    User32.WINEVENT.WINEVENT_OUTOFCONTEXT
-                )
-            );
-
-            _timer.Start();
-        }
-
-        public void Stop()
-        {
-            foreach (var hook in _hooks)
-                User32.UnhookWinEvent(hook);
-
-            _hooks.Clear();
-
-            _timer.Stop();
-        }
-
-        private void Timer_Tick(object? sender, object e)
-        {
-            if (_currentForeground != HWND.NULL)
-            {
-                _onWindowChanged?.Invoke(_currentForeground);
-            }
-        }
-
-        private void WinEventProc(
-            User32.HWINEVENTHOOK hWinEventHook,
-            uint eventType,
-            HWND hwnd,
-            int idObject,
-            int idChild,
-            uint dwEventThread,
-            uint dwmsEventTime
-        )
-        {
-            if (hwnd == IntPtr.Zero)
-                return;
-
-            if (eventType == User32.EventConstants.EVENT_SYSTEM_FOREGROUND)
-            {
-                _currentForeground = hwnd;
-                _onWindowChanged?.Invoke(hwnd);
-            }
-            else if ((eventType == User32.EventConstants.EVENT_OBJECT_LOCATIONCHANGE || eventType == User32.EventConstants.EVENT_SYSTEM_MINIMIZEEND) && hwnd == _currentForeground)
-            {
-                _onWindowChanged?.Invoke(hwnd);
-            }
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ForegroundWindowWatcherHelper.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class ForegroundWindowWatcherHelper
+    {
+        private readonly WinEventDelegate _winEventDelegate;
+        private readonly List<IntPtr> _hooks = new();
+        private IntPtr _currentForeground = IntPtr.Zero;
+        private readonly IntPtr _selfHwnd;
+        private readonly DispatcherTimer _pollingTimer;
+        private DateTime _lastEventTime = DateTime.MinValue;
+        private const int ThrottleIntervalMs = 100;
+
+        public delegate void WindowChangedHandler(IntPtr hwnd);
+        private readonly WindowChangedHandler _onWindowChanged;
+
+        private const uint EVENT_SYSTEM_FOREGROUND = 0x0003;
+        private const uint EVENT_SYSTEM_MINIMIZEEND = 0x0017;
+        private const uint EVENT_OBJECT_LOCATIONCHANGE = 0x800B;
+        private const uint WINEVENT_OUTOFCONTEXT = 0x0000;
+
+        public ForegroundWindowWatcherHelper(IntPtr selfHwnd, WindowChangedHandler onWindowChanged)
+        {
+            _selfHwnd = selfHwnd;
+            _onWindowChanged = onWindowChanged;
+            _winEventDelegate = new WinEventDelegate(WinEventProc);
+
+            _pollingTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(200) };
+            _pollingTimer.Tick += (_, _) =>
+            {
+                if (_currentForeground != IntPtr.Zero && _currentForeground != _selfHwnd)
+                    _onWindowChanged?.Invoke(_currentForeground);
+            };
+        }
+
+        public void Start()
+        {
+            // Hook: foreground changes and minimize end
+            _hooks.Add(
+                SetWinEventHook(
+                    EVENT_SYSTEM_FOREGROUND,
+                    EVENT_SYSTEM_MINIMIZEEND,
+                    IntPtr.Zero,
+                    _winEventDelegate,
+                    0,
+                    0,
+                    WINEVENT_OUTOFCONTEXT
+                )
+            );
+
+            // Hook: window move/resize (location change)
+            _hooks.Add(
+                SetWinEventHook(
+                    EVENT_OBJECT_LOCATIONCHANGE,
+                    EVENT_OBJECT_LOCATIONCHANGE,
+                    IntPtr.Zero,
+                    _winEventDelegate,
+                    0,
+                    0,
+                    WINEVENT_OUTOFCONTEXT
+                )
+            );
+
+            _pollingTimer.Start();
+        }
+
+        public void Stop()
+        {
+            foreach (var hook in _hooks)
+                UnhookWinEvent(hook);
+
+            _hooks.Clear();
+            _pollingTimer.Stop();
+        }
+
+        private void WinEventProc(
+            IntPtr hWinEventHook,
+            uint eventType,
+            IntPtr hwnd,
+            int idObject,
+            int idChild,
+            uint dwEventThread,
+            uint dwmsEventTime
+        )
+        {
+            if (hwnd == IntPtr.Zero || hwnd == _selfHwnd)
+                return;
+
+            var now = DateTime.Now;
+            if ((now - _lastEventTime).TotalMilliseconds < ThrottleIntervalMs)
+                return;
+
+            _lastEventTime = now;
+
+            if (eventType == EVENT_SYSTEM_FOREGROUND)
+            {
+                _currentForeground = hwnd;
+                _onWindowChanged?.Invoke(hwnd);
+            }
+            else if (
+                (eventType == EVENT_OBJECT_LOCATIONCHANGE || eventType == EVENT_SYSTEM_MINIMIZEEND)
+                && hwnd == _currentForeground
+            )
+            {
+                _onWindowChanged?.Invoke(hwnd);
+            }
+        }
+
+        #region WinAPI
+        private delegate void WinEventDelegate(
+            IntPtr hWinEventHook,
+            uint eventType,
+            IntPtr hwnd,
+            int idObject,
+            int idChild,
+            uint dwEventThread,
+            uint dwmsEventTime
+        );
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetWinEventHook(
+            uint eventMin,
+            uint eventMax,
+            IntPtr hmodWinEventProc,
+            WinEventDelegate lpfnWinEventProc,
+            uint idProcess,
+            uint idThread,
+            uint dwFlags
+        );
+
+        [DllImport("user32.dll")]
+        private static extern bool UnhookWinEvent(IntPtr hWinEventHook);
+        #endregion
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/GlobalHotKeyHelper.cs

@@ -1,46 +0,0 @@
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Vanara.PInvoke;
-using Windows.System;
-using WinRT.Interop;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class GlobalHotKeyHelper
-    {
-        private static Dictionary<int, Action> _hotKeyActions = [];
-        private static int _nextId = 0;
-
-        public static void RegisterHotKey(Window window, User32.HotKeyModifiers modifiers, uint key, Action action)
-        {
-            HWND hwnd = WindowNative.GetWindowHandle(window);
-            int id = _nextId++;
-            User32.RegisterHotKey(hwnd, id, modifiers, key);
-            _hotKeyActions[id] = action;
-        }
-
-        public static void UnregisterAllHotKeys(Window window)
-        {
-            HWND hwnd = WindowNative.GetWindowHandle(window);
-            foreach (var id in _hotKeyActions.Keys.ToList())
-            {
-                User32.UnregisterHotKey(hwnd, id);
-                _hotKeyActions.Remove(id);
-            }
-        }
-
-        public static bool TryInvokeAction(int id)
-        {
-            if (_hotKeyActions.TryGetValue(id, out var action))
-            {
-                action?.Invoke();
-                return true;
-            }
-            return false;
-        }
-    }
-}

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

@@ -1,22 +1,18 @@
-// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.WinUI.Helpers;
-using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Text;
-using Microsoft.UI;
-using Microsoft.UI.Xaml.Media.Imaging;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
+using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Text;
+using Microsoft.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Graphics.Imaging;
+using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.UI;
 
@@ -24,7 +20,33 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class ImageHelper
     {
-        private const int _accentColorCount = 1;
+        private static readonly ColorThief _colorThief = new();
+        public const int AccentColorCount = 3;
+
+        public static async Task<InMemoryRandomAccessStream> GetStreamFromBytesAsync(
+            byte[] imageBytes
+        )
+        {
+            if (imageBytes == null || imageBytes.Length == 0)
+                return null;
+
+            InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
+            await stream.WriteAsync(imageBytes.AsBuffer());
+
+            return stream;
+        }
+
+        public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
+        {
+            var stream = new InMemoryRandomAccessStream();
+            await stream.WriteAsync(imageBytes.AsBuffer());
+            stream.Seek(0);
+
+            var bitmapImage = new BitmapImage();
+            await bitmapImage.SetSourceAsync(stream);
+
+            return bitmapImage;
+        }
 
         public static async Task<InMemoryRandomAccessStream> ByteArrayToStream(byte[] bytes)
         {
@@ -35,33 +57,86 @@ namespace BetterLyrics.WinUI3.Helper
             return stream;
         }
 
-        public static async Task<byte[]> CreateTextPlaceholderBytesAsync(int width, int height)
+        public static async Task<byte[]> ToByteArrayAsync(IRandomAccessStreamReference streamRef)
+        {
+            using IRandomAccessStream stream = await streamRef.OpenReadAsync();
+            using var memoryStream = new MemoryStream();
+            await stream.AsStreamForRead().CopyToAsync(memoryStream);
+            return memoryStream.ToArray();
+        }
+
+        public static async Task<List<Color>> GetAccentColorsFromByte(byte[] bytes) =>
+            [
+                .. (
+                    await _colorThief.GetPalette(await GetDecoderFromByte(bytes), AccentColorCount)
+                ).Select(color =>
+                    Color.FromArgb(color.Color.A, color.Color.R, color.Color.G, color.Color.B)
+                ),
+            ];
+
+        public static async Task<BitmapDecoder> GetDecoderFromByte(byte[] bytes) =>
+            await BitmapDecoder.CreateAsync(await ByteArrayToStream(bytes));
+
+        public static async Task<byte[]> CreateTextPlaceholderBytesAsync(
+            string text,
+            int width,
+            int height
+        )
         {
             var device = CanvasDevice.GetSharedDevice();
             var renderTarget = new CanvasRenderTarget(device, width, height, 96);
 
-            // 随机生成渐变色
-            Windows.UI.Color RandomColor()
-            {
-                var rand = new Random(Guid.NewGuid().GetHashCode());
-                double h = rand.NextDouble() * 360;
-                double s = 0.35 + rand.NextDouble() * 0.3; // 0.35~0.65，适中饱和度
-                double l = 0.5 + rand.NextDouble() * 0.3;  // 0.5~0.8，明亮
-                return HslToColor(h, s, l);
-            }
-
-            Windows.UI.Color color1 = RandomColor();
-            Windows.UI.Color color2 = RandomColor();
-
+            // 居中绘制文字
             using (var ds = renderTarget.CreateDrawingSession())
             {
-                // 绘制线性渐变背景
-                var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
+                // 背景色
+                ds.Clear(Colors.LightGray);
+
+                // 文字格式
+                var format = new CanvasTextFormat
                 {
-                    StartPoint = new System.Numerics.Vector2(0, 0),
-                    EndPoint = new System.Numerics.Vector2(width, height)
+                    FontSize = Math.Min(width, height) / 6f,
+                    FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
+                    HorizontalAlignment = CanvasHorizontalAlignment.Center,
+                    VerticalAlignment = CanvasVerticalAlignment.Center,
+                    WordWrapping = CanvasWordWrapping.Wrap,
+                    TrimmingGranularity = CanvasTextTrimmingGranularity.Character,
+                    Options = CanvasDrawTextOptions.Default,
                 };
-                ds.FillRectangle(0, 0, width, height, gradientBrush);
+
+                // 设定边距
+                float margin = Math.Min(width, height) / 12f;
+                float availableWidth = width - 2 * margin;
+                float availableHeight = height - 2 * margin;
+
+                // 计算合适的字体大小以适应内容区域
+                float fontSize = format.FontSize;
+                float minFontSize = 8f;
+                float maxFontSize = format.FontSize;
+                CanvasTextLayout layout;
+                do
+                {
+                    format.FontSize = fontSize;
+                    layout = new CanvasTextLayout(
+                        ds,
+                        text,
+                        format,
+                        availableWidth,
+                        availableHeight
+                    );
+                    if (
+                        layout.LayoutBounds.Width <= availableWidth
+                        && layout.LayoutBounds.Height <= availableHeight
+                    )
+                        break;
+                    fontSize -= 1f;
+                } while (fontSize >= minFontSize);
+
+                // 居中绘制文字（在内容区域内居中）
+                var bounds = layout.LayoutBounds;
+                var x = margin + (availableWidth - (float)bounds.Width) / 2f - (float)bounds.X;
+                var y = margin + (availableHeight - (float)bounds.Height) / 2f - (float)bounds.Y;
+                ds.DrawTextLayout(layout, new Vector2(x, y), Colors.DarkGray);
             }
 
             // 保存为 PNG 并转为 byte[]
@@ -76,147 +151,6 @@ namespace BetterLyrics.WinUI3.Helper
                 }
                 return buffer;
             }
-
-            // HSL转Color
-            static Windows.UI.Color HslToColor(double h, double s, double l)
-            {
-                h = h / 360.0;
-                double r = l, g = l, b = l;
-                if (s != 0)
-                {
-                    double q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-                    double p = 2 * l - q;
-                    r = HueToRgb(p, q, h + 1.0 / 3.0);
-                    g = HueToRgb(p, q, h);
-                    b = HueToRgb(p, q, h - 1.0 / 3.0);
-                }
-                return Windows.UI.Color.FromArgb(255, (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
-            }
-            static double HueToRgb(double p, double q, double t)
-            {
-                if (t < 0) t += 1;
-                if (t > 1) t -= 1;
-                if (t < 1.0 / 6.0) return p + (q - p) * 6 * t;
-                if (t < 1.0 / 2.0) return q;
-                if (t < 2.0 / 3.0) return p + (q - p) * (2.0 / 3.0 - t) * 6;
-                return p;
-            }
-        }
-
-        public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes)
-        {
-            // 使用 ImageSharp 读取图片
-            using var image = SixLabors.ImageSharp.Image.Load<SixLabors.ImageSharp.PixelFormats.Rgba32>(bytes);
-
-            // 简单聚类法：统计所有像素出现频率，取出现最多的前 AccentColorCount 个颜色
-            var colorCount = new Dictionary<SixLabors.ImageSharp.PixelFormats.Rgba32, int>();
-
-            for (int y = 0; y < image.Height; y++)
-            {
-                for (int x = 0; x < image.Width; x++)
-                {
-                    var color = image[x, y];
-                    // 可选：忽略透明像素
-                    if (color.A < 32) continue;
-                    if (colorCount.ContainsKey(color))
-                        colorCount[color]++;
-                    else
-                        colorCount[color] = 1;
-                }
-            }
-
-            // 按出现次数排序，取前 AccentColorCount 个
-            var topColors = colorCount
-                .OrderByDescending(kv => kv.Value)
-                .Take(_accentColorCount)
-                .Select(kv => kv.Key)
-                .ToList();
-
-            // 转换为 Windows.UI.Color
-            return topColors
-                .Select(c => Windows.UI.Color.FromArgb(c.A, c.R, c.G, c.B))
-                .ToList();
-        }
-
-        //public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
-        //{
-        //    var stream = new InMemoryRandomAccessStream();
-        //    await stream.WriteAsync(imageBytes.AsBuffer());
-        //    stream.Seek(0);
-
-        //    var bitmapImage = new BitmapImage();
-        //    await bitmapImage.SetSourceAsync(stream);
-
-        //    return bitmapImage;
-        //}
-
-        //public static async Task<BitmapDecoder> GetDecoderFromByte(byte[] bytes) =>
-        //    await BitmapDecoder.CreateAsync(await ByteArrayToStream(bytes));
-
-        //public static async Task<InMemoryRandomAccessStream> GetStreamFromBytesAsync(byte[] imageBytes)
-        //{
-        //    if (imageBytes == null || imageBytes.Length == 0)
-        //        return null;
-
-        //    InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
-        //    await stream.WriteAsync(imageBytes.AsBuffer());
-
-        //    return stream;
-        //}
-
-        public static async Task<byte[]> ToByteArrayAsync(IRandomAccessStreamReference streamRef)
-        {
-            using IRandomAccessStream stream = await streamRef.OpenReadAsync();
-            using var memoryStream = new MemoryStream();
-            await stream.AsStreamForRead().CopyToAsync(memoryStream);
-            return memoryStream.ToArray();
-        }
-
-        public static float GetAverageLuminance(CanvasBitmap bitmap)
-        {
-            var pixels = bitmap.GetPixelBytes();
-            double sum = 0;
-            for (int i = 0; i < pixels.Length; i += 4)
-            {
-                // BGRA
-                byte b = pixels[i];
-                byte g = pixels[i + 1];
-                byte r = pixels[i + 2];
-                // 忽略A
-                double y = 0.299 * r + 0.587 * g + 0.114 * b;
-                sum += y / 255.0;
-            }
-            return (float)(sum / (pixels.Length / 4));
-        }
-
-        public static byte[] MakeSquareWithThemeColor(byte[] imageBytes)
-        {
-            using var image = Image.Load<Rgba32>(imageBytes);
-
-            if (image.Width == image.Height)
-            {
-                // 已经是正方形，直接返回
-                return imageBytes;
-            }
-
-            int size = Math.Max(image.Width, image.Height);
-
-            var themeColor = Rgba32.ParseHex(GetAccentColorsFromByte(imageBytes).FirstOrDefault().ToHex());
-
-            // 新建正方形画布
-            using var square = new Image<Rgba32>(size, size, themeColor);
-
-            // 计算居中位置
-            int offsetX = (size - image.Width) / 2;
-            int offsetY = (size - image.Height) / 2;
-
-            // 绘制原图到正方形画布
-            square.Mutate(ctx => ctx.DrawImage(image, new Point(offsetX, offsetY), 1f));
-
-            // 保存为 PNG 字节流
-            using var ms = new MemoryStream();
-            square.Save(ms, new PngEncoder());
-            return ms.ToArray();
         }
     }
 }

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

@@ -1,128 +0,0 @@
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Lyricify.Lyrics.Helpers.General;
-using NTextCat;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Windows.Globalization;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public class LanguageHelper
-    {
-        private static readonly RankedLanguageIdentifierFactory _factory = new();
-        private static readonly RankedLanguageIdentifier _identifier;
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
-        public static List<Models.LanguageInfo> SupportedTargetLanguages =>
-        [
-            new Models.LanguageInfo("ar", "العربية"),
-            new Models.LanguageInfo("az", "Azərbaycan dili"),
-            new Models.LanguageInfo("zh-Hans", "简体中文"),
-            new Models.LanguageInfo("zh-Hant", "繁體中文"),
-            new Models.LanguageInfo("cs", "Čeština"),
-            new Models.LanguageInfo("da", "Dansk"),
-            new Models.LanguageInfo("nl", "Nederlands"),
-            new Models.LanguageInfo("en", "English"),
-            new Models.LanguageInfo("eo", "Esperanto"),
-            new Models.LanguageInfo("fi", "Suomi"),
-            new Models.LanguageInfo("fr", "Français"),
-            new Models.LanguageInfo("de", "Deutsch"),
-            new Models.LanguageInfo("el", "Ελληνικά"),
-            new Models.LanguageInfo("he", "עברית"),
-            new Models.LanguageInfo("hi", "हिन्दी"),
-            new Models.LanguageInfo("hu", "Magyar"),
-            new Models.LanguageInfo("id", "Bahasa Indonesia"),
-            new Models.LanguageInfo("ga", "Gaeilge"),
-            new Models.LanguageInfo("it", "Italiano"),
-            new Models.LanguageInfo("ja", "日本語"),
-            new Models.LanguageInfo("ko", "한국어"),
-            new Models.LanguageInfo("fa", "فارسی"),
-            new Models.LanguageInfo("pl", "Polski"),
-            new Models.LanguageInfo("pt", "Português"),
-            new Models.LanguageInfo("ru", "Русский"),
-            new Models.LanguageInfo("sk", "Slovenčina"),
-            new Models.LanguageInfo("es", "Español"),
-            new Models.LanguageInfo("sv", "Svenska"),
-            new Models.LanguageInfo("tr", "Türkçe"),
-            new Models.LanguageInfo("uk", "Українська"),
-            new Models.LanguageInfo("vi", "Tiếng Việt"),
-        ];
-
-        static LanguageHelper()
-        {
-            _identifier = _factory.Load(PathHelper.LanguageProfilePath);
-        }
-
-        private static string? ThreeLetterToTwoLetter(string? threeLetterCode)
-        {
-            if (threeLetterCode == null) return null;
-
-            foreach (var ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
-            {
-                if (string.Equals(ci.ThreeLetterISOLanguageName, threeLetterCode, StringComparison.OrdinalIgnoreCase))
-                {
-                    return ci.TwoLetterISOLanguageName;
-                }
-            }
-            return null;
-        }
-
-        public static string? DetectLanguageCode(string? text)
-        {
-            if (text == null) return null;
-
-            string? code = ThreeLetterToTwoLetter(_identifier.Identify(text).FirstOrDefault()?.Item1.Iso639_2T);
-            if (code != null && code == "zh")
-            {
-                if (ChineseConverter.ConvertToTraditionalChinese(text) == text)
-                {
-                    return "zh-Hant";
-                }
-                else
-                {
-                    return "zh-Hans";
-                }
-            }
-            return code;
-        }
-
-        public static bool IsCJK(string text)
-        {
-            return DetectLanguageCode(text)?.Substring(0, 2) switch
-            {
-                "zh" or "ja" or "ko" => true,
-                _ => false
-            };
-        }
-
-        public static string ConvertToCountryCode(string? languageCode)
-        {
-            if (languageCode == null) return "us";
-
-            return languageCode switch
-            {
-                "zh" => "cn",
-                "zh-Hans" => "cn",
-                "zh-Hant" => "tw",
-                "ja" => "jp",
-                "ko" => "kr",
-                _ => "us"
-            };
-        }
-
-        public static string GetUserTargetLanguageCode()
-        {
-            return SupportedTargetLanguages[_settingsService.SelectedTargetLanguageIndex].Code;
-        }
-
-        public static int GetDefaultTargetLanguageIndex()
-        {
-            int found = SupportedTargetLanguages.FindIndex(x => ApplicationLanguages.Languages.FirstOrDefault()?.Contains(x.Code) == true);
-            if (found == -1) found = 7; // 默认使用英语
-            return found;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LatestOnlyTaskRunner.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class LatestOnlyTaskRunner
-    {
-        private CancellationTokenSource? _cts;
-
-        public async Task RunAsync(Func<CancellationToken, Task> func)
-        {
-            _cts?.Cancel();
-            _cts = new CancellationTokenSource();
-            var token = _cts.Token;
-            try
-            {
-                await func(token);
-            }
-            catch (OperationCanceledException) { }
-        }
-
-        public void Cancel()
-        {
-            _cts?.Cancel();
-        }
-    }
-}

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

@@ -1,59 +1,62 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services;
-using Lyricify.Lyrics.Models;
-using System;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
-using Windows.Globalization.Fonts;
-using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Helper
 {
     public class LyricsParser
     {
-        private List<LyricsData> _lyricsDataArr = [];
+        private List<List<LyricsLine>> _multiLangLyricsLines = [];
 
-        public List<LyricsData> Parse(string? raw, int? durationMs)
+        public List<List<LyricsLine>> Parse(
+            string raw,
+            LyricsFormat? lyricsFormat = null,
+            string? title = null,
+            string? artist = null,
+            int durationMs = 0
+        )
         {
-            durationMs ??= (int)TimeSpan.FromMinutes(99).TotalMilliseconds;
-            _lyricsDataArr = [];
-            if (raw == null)
+            _multiLangLyricsLines = [];
+            switch (lyricsFormat)
             {
-                _lyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder(durationMs.Value));
+                case LyricsFormat.Lrc:
+                case LyricsFormat.Eslrc:
+                    ParseLrc(raw, durationMs);
+                    break;
+                case LyricsFormat.Ttml:
+                    ParseTtml(raw, durationMs);
+                    break;
+                default:
+                    break;
             }
-            else
-            {
-                switch (raw.DetectFormat())
-                {
-                    case LyricsFormat.Lrc:
-                    case LyricsFormat.Eslrc:
-                        ParseLrc(raw);
-                        break;
-                    case LyricsFormat.Qrc:
-                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines);
-                        break;
-                    case LyricsFormat.Krc:
-                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines);
-                        break;
-                    case LyricsFormat.Ttml:
-                        ParseTtml(raw);
-                        break;
-                    default:
-                        break;
-                }
-            }
-            PostProcessLyricsLines(durationMs.Value);
-            return _lyricsDataArr;
+            return _multiLangLyricsLines;
         }
 
-        private void ParseLrc(string raw)
+        private void PostProcessLyricsLines(List<LyricsLine> lines)
         {
-            var lines = raw.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries);
+            if (lines.Count > 0 && lines[0].StartMs > 0)
+            {
+                lines.Insert(
+                    0,
+                    new LyricsLine
+                    {
+                        StartMs = 0,
+                        EndMs = lines[0].StartMs,
+                        Text = "",
+                        CharTimings = [],
+                    }
+                );
+            }
+        }
+
+        private void ParseLrc(string raw, int durationMs)
+        {
+            var lines = raw.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
             var lrcLines =
                 new List<(int time, string text, List<(int time, string text)> syllables)>();
 
@@ -101,7 +104,7 @@ namespace BetterLyrics.WinUI3.Helper
                         int sec = int.Parse(m.Groups[2].Value);
                         int ms = int.Parse(m.Groups[3].Value.PadRight(3, '0'));
                         lineStartTime = min * 60_000 + sec * 1000 + ms;
-                        content = bracketRegex.Replace(line, "");
+                        content = bracketRegex.Replace(line, "").Trim();
                         lrcLines.Add((lineStartTime.Value, content, new List<(int, string)>()));
                     }
                 }
@@ -112,9 +115,9 @@ namespace BetterLyrics.WinUI3.Helper
             int languageCount = grouped.Max(g => g.Count());
 
             // 初始化每种语言的歌词列表
-            _lyricsDataArr.Clear();
+            _multiLangLyricsLines.Clear();
             for (int i = 0; i < languageCount; i++)
-                _lyricsDataArr.Add(new LyricsData());
+                _multiLangLyricsLines.Add(new List<LyricsLine>());
 
             // 遍历每个时间分组
             foreach (var group in grouped)
@@ -128,41 +131,62 @@ namespace BetterLyrics.WinUI3.Helper
                     var line = new LyricsLine
                     {
                         StartMs = start,
-                        OriginalText = text,
-                        LyricsChars = [],
+                        EndMs = 0, // 稍后统一修正
+                        Text = text,
+                        CharTimings = [],
                     };
                     if (syllables != null && syllables.Count > 0)
                     {
-                        int currentIndex = 0;
                         for (int j = 0; j < syllables.Count; j++)
                         {
                             var (charStart, charText) = syllables[j];
-                            int startIndex = currentIndex;
-                            line.LyricsChars.Add(
-                                new LyricsChar
-                                {
-                                    StartMs = charStart,
-                                    Text = charText ?? "",
-                                    StartIndex = startIndex,
-                                }
+                            int charEnd = (j + 1 < syllables.Count) ? syllables[j + 1].Item1 : 0;
+                            line.CharTimings.Add(
+                                new CharTiming { StartMs = charStart, EndMs = charEnd }
                             );
-                            currentIndex += charText?.Length ?? 0;
                         }
                     }
-                    _lyricsDataArr[langIdx].LyricsLines.Add(line);
+                    _multiLangLyricsLines[langIdx].Add(line);
                 }
             }
+
+            // 修正 EndMs
+            for (int langIdx = 0; langIdx < languageCount; langIdx++)
+            {
+                var linesInSingleLang = _multiLangLyricsLines[langIdx];
+                for (int i = 0; i < linesInSingleLang.Count; i++)
+                {
+                    if (i + 1 < linesInSingleLang.Count)
+                        linesInSingleLang[i].EndMs = linesInSingleLang[i + 1].StartMs;
+                    else
+                        linesInSingleLang[i].EndMs = durationMs;
+
+                    // 修正 CharTimings 的最后一个 EndMs
+                    var timings = linesInSingleLang[i].CharTimings;
+                    if (timings.Count > 0)
+                    {
+                        for (int j = 0; j < timings.Count; j++)
+                        {
+                            if (j + 1 < timings.Count)
+                                timings[j].EndMs = timings[j + 1].StartMs;
+                            else
+                                timings[j].EndMs = linesInSingleLang[i].EndMs;
+                        }
+                    }
+                }
+                PostProcessLyricsLines(linesInSingleLang);
+            }
         }
 
-        private void ParseTtml(string raw)
+        private void ParseTtml(string raw, int durationMs)
         {
             try
             {
-                List<LyricsLine> originalLines = [];
-                List<LyricsLine> translationLines = [];
+                List<LyricsLine> singleLangLyricsLine = [];
                 var xdoc = XDocument.Parse(raw);
                 var body = xdoc.Descendants().FirstOrDefault(e => e.Name.LocalName == "body");
-                if (body == null) return;
+                if (body == null)
+                    return;
                 var ps = body.Descendants().Where(e => e.Name.LocalName == "p");
                 foreach (var p in ps)
                 {
@@ -172,92 +196,53 @@ namespace BetterLyrics.WinUI3.Helper
                     int pStartMs = ParseTtmlTime(pBegin);
                     int pEndMs = ParseTtmlTime(pEnd);
 
-                    // 只获取一级span，且排除ttm:role="x-bg"的span
+                    // 处理分词分时
                     var spans = p.Elements()
-                        .Where(s => s.Name.LocalName == "span" &&
-                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg")
+                        .Where(s =>
+                            s.Name.LocalName == "span"
+                            && s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))
+                                == null
+                        )
                         .ToList();
 
-                    // 原文和翻译分离
-                    var originalTextSpans = spans
-                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-translation")
-                        .ToList();
-                    var translationTextSpans = spans
-                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value == "x-translation")
-                        .ToList();
+                    string text = string.Concat(spans.Select(s => s.Value));
+                    var charTimings = new List<CharTiming>();
 
-                    // 原文（非 CJK 语言添加空格）
-                    string originalText = string.Concat(originalTextSpans.Select(s => s.Value));
-                    if (!LanguageHelper.IsCJK(originalText))
-                    {
-                        foreach (var span in originalTextSpans)
-                        {
-                            span.Value += " ";
-                        }
-                        originalText = string.Concat(originalTextSpans.Select(s => s.Value));
-                    }
-
-                    var originalCharTimings = new List<LyricsChar>();
-                    int originalStartIndex = 0;
-                    foreach (var span in originalTextSpans)
+                    for (int i = 0; i < spans.Count; i++)
                     {
+                        var span = spans[i];
                         string? sBegin = span.Attribute("begin")?.Value;
                         string? sEnd = span.Attribute("end")?.Value;
                         int sStartMs = ParseTtmlTime(sBegin);
                         int sEndMs = ParseTtmlTime(sEnd);
-                        originalCharTimings.Add(new LyricsChar
-                        {
-                            StartMs = sStartMs,
-                            EndMs = sEndMs,
-                            StartIndex = originalStartIndex,
-                            Text = span.Value
-                        });
-                        originalStartIndex += span.Value.Length;
-                    }
-                    if (originalTextSpans.Count == 0)
-                        originalText = p.Value;
 
-                    originalLines.Add(new LyricsLine
-                    {
-                        StartMs = pStartMs,
-                        EndMs = pEndMs,
-                        OriginalText = originalText,
-                        LyricsChars = originalCharTimings,
-                    });
+                        if (sStartMs == 0 && sEndMs == 0)
+                            continue;
 
-                    // 翻译
-                    string translationText = string.Concat(translationTextSpans.Select(s => s.Value));
-                    var translationCharTimings = new List<LyricsChar>();
-                    int translationStartIndex = 0;
-                    foreach (var span in translationTextSpans)
-                    {
-                        string? sBegin = span.Attribute("begin")?.Value;
-                        string? sEnd = span.Attribute("end")?.Value;
-                        int sStartMs = ParseTtmlTime(sBegin);
-                        int sEndMs = ParseTtmlTime(sEnd);
-                        translationCharTimings.Add(new LyricsChar
-                        {
-                            StartMs = sStartMs,
-                            EndMs = sEndMs,
-                            StartIndex = translationStartIndex,
-                            Text = span.Value
-                        });
-                        translationStartIndex += span.Value.Length;
+                        if (sEndMs == 0)
+                            sEndMs =
+                                (i + 1 < spans.Count)
+                                    ? ParseTtmlTime(spans[i + 1].Attribute("begin")?.Value)
+                                    : pEndMs;
+
+                        charTimings.Add(new CharTiming { StartMs = sStartMs, EndMs = sEndMs });
                     }
-                    if (translationTextSpans.Count > 0)
-                    {
-                        translationLines.Add(new LyricsLine
+
+                    if (spans.Count == 0)
+                        text = p.Value.Trim();
+
+                    singleLangLyricsLine.Add(
+                        new LyricsLine
                         {
                             StartMs = pStartMs,
                             EndMs = pEndMs,
-                            OriginalText = translationText,
-                            LyricsChars = translationCharTimings,
-                        });
-                    }
+                            Text = text,
+                            CharTimings = charTimings,
+                        }
+                    );
                 }
-                _lyricsDataArr.Add(new LyricsData(originalLines));
-                if (translationLines.Count > 0)
-                    _lyricsDataArr.Add(new LyricsData(translationLines));
+                PostProcessLyricsLines(singleLangLyricsLine);
+                _multiLangLyricsLines.Add(singleLangLyricsLine);
             }
             catch
             {
@@ -265,7 +250,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        private static int ParseTtmlTime(string? t)
+        private int ParseTtmlTime(string? t)
         {
             if (string.IsNullOrWhiteSpace(t))
                 return 0;
@@ -325,78 +310,5 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return 0;
         }
-
-        private void ParseQQNeteaseKugou(List<ILineInfo>? lines)
-        {
-            lines = lines?.Where(x => x.Text != string.Empty).ToList();
-            List<LyricsLine> lyricsLines = [];
-
-            if (lines != null && lines.Count > 0)
-            {
-                lyricsLines = [];
-                for (int lineIndex = 0; lineIndex < lines.Count; lineIndex++)
-                {
-                    var lineRead = lines[lineIndex];
-                    var lineWrite = new LyricsLine
-                    {
-                        StartMs = lineRead.StartTime ?? 0,
-                        EndMs = lineRead.EndTime ?? 0,
-                        OriginalText = lineRead.Text,
-                        LyricsChars = [],
-                    };
-
-                    var syllables = (lineRead as SyllableLineInfo)?.Syllables;
-                    if (syllables != null)
-                    {
-                        int startIndex = 0;
-                        for (
-                            int syllableIndex = 0;
-                            syllableIndex < syllables.Count;
-                            syllableIndex++
-                        )
-                        {
-                            var syllable = syllables[syllableIndex];
-                            var charTiming = new LyricsChar
-                            {
-                                StartMs = syllable.StartTime,
-                                EndMs = syllable.EndTime,
-                                Text = syllable.Text,
-                                StartIndex = startIndex,
-                            };
-                            lineWrite.LyricsChars.Add(charTiming);
-                            startIndex += syllable.Text.Length;
-                        }
-                    }
-
-                    lyricsLines.Add(lineWrite);
-                }
-            }
-
-            _lyricsDataArr.Add(new LyricsData(lyricsLines));
-        }
-
-        private void PostProcessLyricsLines(int durationMs)
-        {
-            for (int langIdx = 0; langIdx < _lyricsDataArr.Count; langIdx++)
-            {
-                var lines = _lyricsDataArr[langIdx].LyricsLines;
-                if (lines.Count > 0)
-                {
-                    if (lines[0].StartMs > 0)
-                    {
-                        lines.Insert(
-                            0,
-                            new LyricsLine
-                            {
-                                StartMs = 0,
-                                EndMs = lines[0].StartMs,
-                                OriginalText = "● ● ●",
-                                LyricsChars = [],
-                            }
-                        );
-                    }
-                }
-            }
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MetadataHelper.cs

@@ -1,47 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    using BetterLyrics.WinUI3.Models;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-    using System.Threading.Tasks;
-    using Windows.ApplicationModel;
-    using Windows.Storage;
-    using Windows.Storage.FileProperties;
-
-    public static class MetadataHelper
-    {
-        public const string AppAuthor = "Zhe Fang";
-        public const string AppDisplayName = "Better Lyrics";
-        public const string AppName = "BetterLyrics";
-        public static string AppVersion
-        {
-            get
-            {
-                var version = Package.Current.Id.Version;
-                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
-            }
-        }
-
-        public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
-        public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
-        public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";
-
-        public static async Task<DateTime> GetBuildDate()
-        {
-            var assembly = Assembly.GetExecutingAssembly();
-            var filePath = assembly.Location;
-            if (!File.Exists(filePath))
-                return DateTime.MinValue;
-
-            StorageFile file = await StorageFile.GetFileFromPathAsync(filePath);
-            // 获取文件基本属性
-            BasicProperties props = await file.GetBasicPropertiesAsync();
-            // 返回修改日期
-            return props.DateModified.DateTime;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NetHelper.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class NetHelper
-    {
-        public static async Task<bool> CheckConnectivity(string url)
-        {
-            try
-            {
-                using var client = new System.Net.Http.HttpClient();
-                // Try to reach a reliable endpoint
-                var res = await client.GetAsync(url);
-                return res.IsSuccessStatusCode;
-            }
-            catch
-            {
-                return false; // If any exception occurs, assume no connectivity
-            }
-        }
-    }
-}

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

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
-using Windows.Storage;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class PathHelper
-    {
-        private static string LocalFolder => ApplicationData.Current.LocalFolder.Path;
-        public static string CacheFolder => ApplicationData.Current.LocalCacheFolder.Path;
-        public static string AssetsFolder => Path.Combine(Package.Current.InstalledPath, "Assets");
-
-        public static string LanguageProfilePath => Path.Combine(AssetsFolder, "Core14.profile.xml");
-
-        public static string LogDirectory => Path.Combine(CacheFolder, "logs");
-        public static string LogFilePattern => Path.Combine(LogDirectory, "log-.txt");
-
-        public static string LyricsCacheDirectory => Path.Combine(CacheFolder, "lyrics");
-
-        public static string LrcLibLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "lrclib");
-        public static string NeteaseLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "netease");
-        public static string QQLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "qq");
-        public static string KugouLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "kugou");
-        public static string AmllTtmlDbLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "amll-ttml-db");
-        public static string AmllTtmlDbIndexPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-index.json");
-        public static string AmllTtmlDbLastUpdatedPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-last-updated.txt");
-
-        public static string TranslationCacheDirectory => Path.Combine(CacheFolder, "translations");
-
-        public static string QQTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "qq");
-
-        public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
-
-        public static string iTunesAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "itunes");
-
-        public static void EnsureDirectories()
-        {
-            Directory.CreateDirectory(LogDirectory);
-
-            Directory.CreateDirectory(LrcLibLyricsCacheDirectory);
-            Directory.CreateDirectory(QQLyricsCacheDirectory);
-            Directory.CreateDirectory(KugouLyricsCacheDirectory);
-            Directory.CreateDirectory(NeteaseLyricsCacheDirectory);
-            Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
-
-            Directory.CreateDirectory(QQTranslationCacheDirectory);
-
-            Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
-        }
-    }
-}

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

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class StringHelper
-    {
-        // 去除空格、括号、下划线、横杠、点、大小写等
-        public static string Normalize(string s) =>
-            new string(s
-                .Where(c => char.IsLetterOrDigit(c))
-                .ToArray())
-                .ToLowerInvariant();
-        public static string NewLine = "\n";
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemBackdropHelper.cs

@@ -1,6 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Enums;
 using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Xaml.Media;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/SystemVolumeHelper.cs

@@ -1,74 +0,0 @@
-using Microsoft.UI.Dispatching;
-using System;
-using Vanara.Extensions;
-using Vanara.PInvoke;
-using static Vanara.PInvoke.CoreAudio;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class SystemVolumeHelper
-    {
-        private readonly static IMMDeviceEnumerator _deviceEnumerator = new();
-        private static IAudioEndpointVolume? _endpointVolume = null;
-        private static VolumeCallbackImpl? _callbackImpl;
-        private static int _masterVolume = 0;
-        private static DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-
-        public static event Action<int>? VolumeChanged;
-
-        static SystemVolumeHelper()
-        {
-            var device = _deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia);
-            if (device != null)
-            {
-                device.Activate(typeof(IAudioEndpointVolume).GUID, 0, null, out var obj);
-                if (obj is IAudioEndpointVolume endpointVolume)
-                {
-                    _endpointVolume = endpointVolume;
-                    _callbackImpl = new VolumeCallbackImpl();
-                    _endpointVolume.RegisterControlChangeNotify(_callbackImpl);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 获取当前系统主音量（0~100）。
-        /// </summary>
-        public static int GetMasterVolume()
-        {
-            if (_endpointVolume != null)
-            {
-                float level = _endpointVolume.GetMasterVolumeLevelScalar();
-                _masterVolume = (int)(level * 100);
-            }
-
-            return _masterVolume;
-        }
-
-        /// <summary>
-        /// 设置当前系统主音量（0~100）。
-        /// </summary>
-        public static void SetMasterVolume(int volume)
-        {
-            if (_masterVolume == volume) return;
-
-            _masterVolume = volume;
-            _endpointVolume?.SetMasterVolumeLevelScalar(_masterVolume / 100f, Guid.Empty);
-        }
-
-        // 内部回调实现
-        private class VolumeCallbackImpl : IAudioEndpointVolumeCallback
-        {
-            HRESULT IAudioEndpointVolumeCallback.OnNotify(nint pNotify)
-            {
-                var data = pNotify.ToStructure<AUDIO_VOLUME_NOTIFICATION_DATA>();
-                _masterVolume = (int)(data.fMasterVolume * 100);
-                _dispatcherQueue.TryEnqueue(() =>
-                {
-                    VolumeChanged?.Invoke(_masterVolume);
-                });
-                return HRESULT.S_OK;
-            }
-        }
-    }
-}

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

@@ -1,180 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Diagnostics;
-using BetterLyrics.WinUI3.Enums;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public class ValueTransition<T>
-        where T : struct
-    {
-        private T _currentValue;
-        private float _durationSeconds;
-        private EasingType? _easingType;
-        private Func<T, T, float, T> _interpolator;
-        private bool _isTransitioning;
-        private float _progress;
-        private T _startValue;
-        private T _targetValue;
-
-        public float DurationSeconds => _durationSeconds;
-
-        public bool IsTransitioning => _isTransitioning;
-        public T Value => _currentValue;
-        public T TargetValue => _targetValue;
-
-        public ValueTransition(T initialValue, float durationSeconds, Func<T, T, float, T>? interpolator = null, EasingType? easingType = null)
-        {
-            _currentValue = initialValue;
-            _startValue = initialValue;
-            _targetValue = initialValue;
-            _durationSeconds = durationSeconds;
-            _progress = 1f;
-            _isTransitioning = false;
-
-            if (interpolator != null)
-            {
-                _interpolator = interpolator;
-                _easingType = null;
-            }
-            else if (easingType.HasValue)
-            {
-                _easingType = easingType;
-                _interpolator = GetInterpolatorByEasingType(_easingType.Value);
-            }
-            else
-            {
-                _easingType = EasingType.Linear;
-                _interpolator = GetInterpolatorByEasingType(_easingType.Value);
-            }
-        }
-
-        public void SetDuration(float seconds)
-        {
-            if (seconds <= 0)
-                throw new ArgumentOutOfRangeException(nameof(seconds), "Duration must be positive.");
-            _durationSeconds = seconds;
-        }
-
-        private void JumpTo(T value)
-        {
-            _currentValue = value;
-            _startValue = value;
-            _targetValue = value;
-            _progress = 1f;
-            _isTransitioning = false;
-        }
-
-        public void Reset(T value)
-        {
-            _currentValue = value;
-            _startValue = value;
-            _targetValue = value;
-            _progress = 0f;
-            _isTransitioning = false;
-        }
-
-        public void StartTransition(T targetValue, bool jumpTo = false)
-        {
-            if (jumpTo)
-            {
-                JumpTo(targetValue);
-                return;
-            }
-
-            if (!targetValue.Equals(_currentValue))
-            {
-                _startValue = _currentValue;
-                _targetValue = targetValue;
-                _progress = 0f;
-                _isTransitioning = true;
-            }
-        }
-
-        public static bool Equals(double x, double y, double tolerance)
-        {
-            var diff = Math.Abs(x - y);
-            return diff <= tolerance || diff <= Math.Max(Math.Abs(x), Math.Abs(y)) * tolerance;
-        }
-
-        public void Update(TimeSpan elapsedTime)
-        {
-            if (!_isTransitioning) return;
-
-            _progress += (float)elapsedTime.TotalSeconds / _durationSeconds;
-            if (_progress >= 1f)
-            {
-                _progress = 1f;
-                _currentValue = _targetValue;
-                _isTransitioning = false;
-            }
-            else
-            {
-                _currentValue = _interpolator(_startValue, _targetValue, _progress);
-            }
-        }
-
-        private Func<T, T, float, T> GetInterpolatorByEasingType(EasingType type)
-        {
-            if (typeof(T) == typeof(float))
-            {
-                return (start, end, progress) =>
-                {
-                    float s = (float)(object)start;
-                    float e = (float)(object)end;
-                    float t = progress;
-                    switch (type)
-                    {
-                        case EasingType.EaseInOutSine:
-                            t = EasingHelper.EaseInOutSine(t);
-                            break;
-                        case EasingType.EaseInOutQuad:
-                            t = EasingHelper.EaseInOutQuad(t);
-                            break;
-                        case EasingType.EaseInOutCubic:
-                            t = EasingHelper.EaseInOutCubic(t);
-                            break;
-                        case EasingType.EaseInOutQuart:
-                            t = EasingHelper.EaseInOutQuart(t);
-                            break;
-                        case EasingType.EaseInOutQuint:
-                            t = EasingHelper.EaseInOutQuint(t);
-                            break;
-                        case EasingType.EaseInOutExpo:
-                            t = EasingHelper.EaseInOutExpo(t);
-                            break;
-                        case EasingType.EaseInOutCirc:
-                            t = EasingHelper.EaseInOutCirc(t);
-                            break;
-                        case EasingType.EaseInOutBack:
-                            t = EasingHelper.EaseInOutBack(t);
-                            break;
-                        case EasingType.EaseInOutElastic:
-                            t = EasingHelper.EaseInOutElastic(t);
-                            break;
-                        case EasingType.EaseInOutBounce:
-                            t = EasingHelper.EaseInOutBounce(t);
-                            break;
-                        case EasingType.SmoothStep:
-                            t = EasingHelper.SmoothStep(t);
-                            break;
-                        case EasingType.Linear:
-                            t = EasingHelper.Linear(t);
-                            break;
-                        default:
-                            break;
-                    }
-                    return (T)(object)(s + (e - s) * t);
-                };
-            }
-            throw new NotSupportedException($"Easing type {type} is not supported for type {typeof(T)}.");
-        }
-
-        public void SetEasingType(EasingType easingType)
-        {
-            _easingType = easingType;
-            _interpolator = GetInterpolatorByEasingType(easingType);
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowColorHelper.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Runtime.InteropServices;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class WindowColorHelper
+    {
+        public static Color GetDominantColorBelow(IntPtr myHwnd)
+        {
+            if (!GetWindowRect(myHwnd, out RECT myRect))
+                return Color.Transparent;
+
+            int screenWidth = GetSystemMetrics(SystemMetric.SM_CXSCREEN);
+            int sampleHeight = 1;
+            int sampleY = myRect.Bottom + 1;
+
+            return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
+        }
+
+        private static Color GetAverageColorFromScreenRegion(int x, int y, int width, int height)
+        {
+            using Bitmap bmp = new(width, height, PixelFormat.Format32bppArgb);
+            using Graphics gDest = Graphics.FromImage(bmp);
+
+            IntPtr hdcDest = gDest.GetHdc();
+            IntPtr hdcSrc = GetDC(IntPtr.Zero); // Entire screen
+
+            BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, SRCCOPY);
+
+            gDest.ReleaseHdc(hdcDest);
+            ReleaseDC(IntPtr.Zero, hdcSrc);
+
+            return ComputeAverageColor(bmp);
+        }
+
+        private static Color ComputeAverageColor(Bitmap bmp)
+        {
+            long r = 0,
+                g = 0,
+                b = 0;
+            int count = 0;
+
+            for (int y = 0; y < bmp.Height; y++)
+            {
+                for (int x = 0; x < bmp.Width; x++)
+                {
+                    Color pixel = bmp.GetPixel(x, y);
+                    r += pixel.R;
+                    g += pixel.G;
+                    b += pixel.B;
+                    count++;
+                }
+            }
+
+            if (count == 0)
+                return Color.Transparent;
+            return Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
+        }
+
+        #region Win32 Imports & Structs
+        private const int SRCCOPY = 0x00CC0020;
+
+        [DllImport("user32.dll")]
+        private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetDC(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+        [DllImport("gdi32.dll")]
+        private static extern bool BitBlt(
+            IntPtr hdcDest,
+            int nXDest,
+            int nYDest,
+            int nWidth,
+            int nHeight,
+            IntPtr hdcSrc,
+            int nXSrc,
+            int nYSrc,
+            int dwRop
+        );
+
+        [DllImport("user32.dll")]
+        private static extern int GetSystemMetrics(SystemMetric smIndex);
+
+        private enum SystemMetric
+        {
+            SM_CXSCREEN = 0,
+            SM_CYSCREEN = 1,
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+        }
+        #endregion
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowHelper.cs

@@ -1,12 +1,8 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
+using System;
+using System.Collections.Generic;
 using BetterLyrics.WinUI3.Views;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using Windows.ApplicationModel.Core;
 using WinRT.Interop;
 using WinUIEx;
 
@@ -14,94 +10,124 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class WindowHelper
     {
-        private static List<object> _activeWindows = [];
+        private static readonly Dictionary<Type, Window> _windowCache = new();
 
-        public static void CloseWindow<T>()
+        public static void HideSystemTitleBar(this Window window)
         {
-            var window = _activeWindows.Find(w => w is T);
-            if (window is Window w)
-            {
-                w.Close();
-                _activeWindows.Remove(w);
-            }
+            window.ExtendsContentIntoTitleBar = true;
+            window.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
         }
 
-        public static void ExitAllWindows()
+        public static void HideSystemTitleBarAndSetCustomTitleBar(
+            this Window window,
+            UIElement titleBar
+        )
         {
-            while (_activeWindows.Count > 0)
-            {
-                var window = (Window)_activeWindows[0];
-                DockModeHelper.Disable(window);
-                window.Close();
-                _activeWindows.Remove(window);
-            }
-            App.Current.Exit();
+            window.HideSystemTitleBar();
+            window.SetTitleBar(titleBar);
         }
 
-        public static T? GetWindowByWindowType<T>()
+        public static void OpenSettingsWindow()
         {
-            foreach (var window in _activeWindows)
-            {
-                if (window is T castedWindow)
-                {
-                    return castedWindow;
-                }
-            }
-            return default;
+            OpenOrShowWindow(typeof(SettingsPage));
         }
-        public static void OpenOrShowWindow<T>()
+
+        public static void OpenLyricsWindow()
         {
-            var window = _activeWindows.Find(w => w is T);
-            if (window != null)
+            OpenOrShowWindow(typeof(LyricsPage));
+        }
+
+        private static void OpenOrShowWindow(Type pageType)
+        {
+            if (_windowCache.TryGetValue(pageType, out var window))
             {
-                var castedWindow = (Window)window;
-                castedWindow.Restore();
+                window.TryShow();
             }
             else
             {
-                object newWindow;
-                if (typeof(T) == typeof(LyricsWindow))
-                {
-                    newWindow = new LyricsWindow();
-                    ((LyricsWindow)newWindow).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
-                }
-                else if (typeof(T) == typeof(SettingsWindow))
-                {
-                    newWindow = new SettingsWindow();
-                }
-                else
-                {
-                    throw new ArgumentException("Unsupported window type", nameof(T));
-                }
-                ((Window)newWindow).Activate();
-                TrackWindow(newWindow);
+                var newWindow = new HostWindow();
+                TrackWindow(newWindow, pageType);
+                newWindow.ViewModel.FramePageType = pageType;
+                newWindow.Navigate(pageType);
+                newWindow.Activate();
             }
         }
 
-        public static void RestartApp(string args = "")
+        public static void TrackWindow(Window window, Type pageType = null)
         {
-            // The restart will be executed immediately.
-            AppRestartFailureReason failureReason =
-                Microsoft.Windows.AppLifecycle.AppInstance.Restart(args);
-
-            // If the restart fails, handle it here.
-            switch (failureReason)
+            if (pageType != null)
             {
-                case AppRestartFailureReason.RestartPending:
-                    break;
-                case AppRestartFailureReason.NotInForeground:
-                    break;
-                case AppRestartFailureReason.InvalidUser:
-                    break;
-                default: //AppRestartFailureReason.Other
-                    break;
+                _windowCache[pageType] = window;
             }
-        }
 
-        private static void TrackWindow(object window)
-        {
             if (!_activeWindows.Contains(window))
                 _activeWindows.Add(window);
         }
+
+        public static Window GetWindowForElement(UIElement element)
+        {
+            if (element.XamlRoot != null)
+            {
+                foreach (Window window in _activeWindows)
+                {
+                    if (element.XamlRoot == window.Content.XamlRoot)
+                    {
+                        return window;
+                    }
+                }
+            }
+            return null;
+        }
+
+        // get dpi for an element
+        static public double GetRasterizationScaleForElement(UIElement element)
+        {
+            if (element.XamlRoot != null)
+            {
+                foreach (Window window in _activeWindows)
+                {
+                    if (element.XamlRoot == window.Content.XamlRoot)
+                    {
+                        return element.XamlRoot.RasterizationScale;
+                    }
+                }
+            }
+            return 0.0;
+        }
+
+        public static List<Window> ActiveWindows
+        {
+            get { return _activeWindows; }
+        }
+
+        private static List<Window> _activeWindows = new List<Window>();
+
+        public static void TryShow(this Window window)
+        {
+            if (window is not null)
+            {
+                window.Activate();
+            }
+        }
+
+        public static void TryHide(this Window window)
+        {
+            if (window is not null)
+            {
+                window.Hide();
+            }
+        }
+
+        public static Window GetWindowByFramePageType(Type type)
+        {
+            foreach (var cachedWindow in _windowCache)
+            {
+                if (cachedWindow.Key == type)
+                {
+                    return cachedWindow.Value;
+                }
+            }
+            return null;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Messages/ShowNotificatonMessage.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BetterLyrics.WinUI3.Models;
+using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace BetterLyrics.WinUI3.Messages
+{
+    public class ShowNotificatonMessage(Notification value)
+        : ValueChangedMessage<Notification>(value)
+    { }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/AlbumArtSearchProviderInfo.cs

@@ -1,24 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class AlbumArtSearchProviderInfo : ObservableObject
-    {
-        [ObservableProperty]
-        public partial bool IsEnabled { get; set; }
-
-        [ObservableProperty]
-        public partial AlbumArtSearchProvider Provider { get; set; }
-
-        public AlbumArtSearchProviderInfo() { }
-
-        public AlbumArtSearchProviderInfo(AlbumArtSearchProvider provider, bool isEnabled)
-        {
-            Provider = provider;
-            IsEnabled = isEnabled;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CharTiming.cs

@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public class TranslateResponse
+    public class CharTiming
     {
-        [JsonPropertyName("translatedText")]
-        public string TranslatedText { get; set; }
+        public int StartMs { get; set; }
+        public int EndMs { get; set; }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LanguageInfo.cs

@@ -1,23 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class LanguageInfo : ObservableObject
-    {
-        [ObservableProperty]
-        public partial string Code { get; set; }
-        [ObservableProperty]
-        public partial string Name { get; set; }
-
-        public LanguageInfo(string code, string name)
-        {
-            Code = code;
-            Name = name;
-        }
-    }
-}

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

@@ -1,5 +1,8 @@
-// 2025/6/23 by Zhe Fang
-
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
@@ -7,10 +10,10 @@ namespace BetterLyrics.WinUI3.Models
     public partial class LocalLyricsFolder : ObservableObject
     {
         [ObservableProperty]
-        public partial bool IsEnabled { get; set; }
+        public partial string Path { get; set; }
 
         [ObservableProperty]
-        public partial string Path { get; set; }
+        public partial bool IsEnabled { get; set; }
 
         public LocalLyricsFolder() { }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs

@@ -1,14 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Helper;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class LyricsChar
-    {
-        public int? EndMs { get; set; }
-        public int StartIndex { get; set; }
-        public int StartMs { get; set; }
-        public string Text { get; set; } = string.Empty;
-    }
-}

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

@@ -1,113 +1,16 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
-using Lyricify.Lyrics.Helpers.General;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using StringHelper = BetterLyrics.WinUI3.Helper.StringHelper;
 
 namespace BetterLyrics.WinUI3.Models
 {
     public class LyricsData
     {
-        public List<LyricsLine> LyricsLines { get; set; }
-        public string? LanguageCode => LanguageHelper.DetectLanguageCode(WrappedOriginalText);
-        public string WrappedOriginalText => string.Join(StringHelper.NewLine, LyricsLines.Select(line => line.OriginalText));
+        public int LanguageIndex { get; set; } = 0;
 
-        public LyricsData()
-        {
-            LyricsLines = [];
-        }
-
-        public LyricsData(List<LyricsLine> lyricsLines)
-        {
-            LyricsLines = lyricsLines;
-        }
-
-        public void SetDisplayedTextAlongWith(LyricsData translationData)
-        {
-            int i = 0;
-            foreach (var line in LyricsLines)
-            {
-                if (i >= translationData.LyricsLines.Count)
-                {
-                    line.DisplayedText = line.OriginalText; // No translation available, keep original text
-                }
-                else
-                {
-                    if (translationData.LanguageCode?.Substring(0, 2) == "zh")
-                    {
-                        string tmp = "";
-                        if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hant")
-                        {
-                            tmp = ChineseConverter.ConvertToTraditionalChinese(translationData.LyricsLines[i].OriginalText);
-                        }
-                        else if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hans")
-                        {
-                            tmp = ChineseConverter.ConvertToSimplifiedChinese(translationData.LyricsLines[i].OriginalText);
-                        }
-                        line.DisplayedText = $"{line.OriginalText}\n{tmp}";
-                    }
-                    else
-                    {
-                        line.DisplayedText = $"{line.OriginalText}\n{translationData.LyricsLines[i].OriginalText}";
-                    }
-                }
-                i++;
-            }
-        }
-
-        public void SetDisplayedTextAlongWith(string translation)
-        {
-            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
-            int i = 0;
-            foreach (var line in LyricsLines)
-            {
-                if (i >= translationArr.Count)
-                {
-                    line.DisplayedText = line.OriginalText; // No translation available, keep original text
-                }
-                else
-                {
-                    line.DisplayedText = $"{line.OriginalText}{StringHelper.NewLine}({translationArr[i]})";
-                }
-                i++;
-            }
-        }
-
-        public void SetDisplayedTextInOriginalText()
-        {
-            foreach (var line in LyricsLines)
-            {
-                line.DisplayedText = line.OriginalText;
-            }
-        }
-
-        public static LyricsData GetNotfoundPlaceholder(int durationMs)
-        {
-            return new LyricsData([new LyricsLine
-            {
-                StartMs = 0,
-                EndMs = durationMs,
-                OriginalText = App.ResourceLoader!.GetString("LyricsNotFound"),
-                LyricsChars = [],
-            }]);
-        }
-
-        public static LyricsData GetLoadingPlaceholder()
-        {
-            return new LyricsData([
-                new LyricsLine
-                {
-                    StartMs = 0,
-                    EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                    OriginalText = "● ● ●",
-                    DisplayedText = "● ● ●",
-                    LyricsChars = [],
-                },
-            ]);
-        }
+        public List<LyricsLine> LyricsLines => MultiLangLyricsLines[LanguageIndex];
+        public List<List<LyricsLine>> MultiLangLyricsLines { get; set; } = [];
     }
 }

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

@@ -1,33 +1,54 @@
-// 2025/6/23 by Zhe Fang
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Numerics;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using Microsoft.Graphics.Canvas.Text;
 
 namespace BetterLyrics.WinUI3.Models
 {
     public class LyricsLine
     {
-        private const float _animationDuration = 0.3f;
-        public ValueTransition<float> AngleTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
-        public ValueTransition<float> BlurAmountTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
-        public ValueTransition<float> HighlightOpacityTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
-        public ValueTransition<float> OpacityTransition { get; set; } = new(initialValue: 0f, durationSeconds: _animationDuration);
-        public ValueTransition<float> ScaleTransition { get; set; } = new(initialValue: 0.95f, durationSeconds: _animationDuration);
+        public string Text { get; set; } = "";
 
-        public CanvasTextLayout? CanvasTextLayout { get; set; }
+        public List<CharTiming> CharTimings { get; set; } = [];
+
+        public int StartMs { get; set; }
+        public int EndMs { get; set; }
+
+        public LyricsPlayingState PlayingState { get; set; }
+
+        public int DurationMs => EndMs - StartMs;
+
+        public float EnteringProgress { get; set; }
+
+        public float ExitingProgress { get; set; }
+
+        public float PlayingProgress { get; set; }
 
-        public Vector2 CenterPosition { get; set; }
         public Vector2 Position { get; set; }
 
-        public List<LyricsChar> LyricsChars { get; set; } = [];
+        public Vector2 CenterPosition { get; set; }
 
-        public int? DurationMs => EndMs - StartMs;
-        public int? EndMs { get; set; }
-        public int StartMs { get; set; }
+        public float Scale { get; set; }
 
-        public string DisplayedText { get; set; } = "";
-        public string OriginalText { get; set; } = "";
+        public float Opacity { get; set; }
+
+        public LyricsLine Clone()
+        {
+            return new LyricsLine
+            {
+                Text = this.Text,
+                CharTimings = this.CharTimings,
+                StartMs = this.StartMs,
+                EndMs = this.EndMs,
+                PlayingState = this.PlayingState,
+                EnteringProgress = this.EnteringProgress,
+                ExitingProgress = this.ExitingProgress,
+                PlayingProgress = this.PlayingProgress,
+                Position = this.Position,
+                CenterPosition = this.CenterPosition,
+                Scale = this.Scale,
+                Opacity = this.Opacity,
+            };
+        }
     }
 }

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

@@ -1,6 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Enums;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
@@ -8,10 +6,10 @@ namespace BetterLyrics.WinUI3.Models
     public partial class LyricsSearchProviderInfo : ObservableObject
     {
         [ObservableProperty]
-        public partial bool IsEnabled { get; set; }
+        public partial LyricsSearchProvider Provider { get; set; }
 
         [ObservableProperty]
-        public partial LyricsSearchProvider Provider { get; set; }
+        public partial bool IsEnabled { get; set; }
 
         public LyricsSearchProviderInfo() { }
 
@@ -20,6 +18,5 @@ namespace BetterLyrics.WinUI3.Models
             Provider = provider;
             IsEnabled = isEnabled;
         }
-
     }
 }

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

@@ -1,25 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class MediaSourceProviderInfo : ObservableObject
-    {
-        [ObservableProperty]
-        public partial bool IsEnabled { get; set; }
-
-        [ObservableProperty]
-        public partial string Provider { get; set; }
-
-        public MediaSourceProviderInfo() { }
-
-        public MediaSourceProviderInfo(string provider, bool isEnabled)
-        {
-            Provider = provider;
-            IsEnabled = isEnabled;
-        }
-
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Notification.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class Notification : ObservableObject
+    {
+        [ObservableProperty]
+        public partial InfoBarSeverity Severity { get; set; }
+
+        [ObservableProperty]
+        public partial string? Message { get; set; }
+
+        [ObservableProperty]
+        public partial bool IsForeverDismissable { get; set; }
+
+        [ObservableProperty]
+        public partial Visibility Visibility { get; set; }
+
+        [ObservableProperty]
+        public partial string? RelatedSettingsKeyName { get; set; }
+
+        public Notification(
+            string? message = null,
+            InfoBarSeverity severity = InfoBarSeverity.Informational,
+            bool isForeverDismissable = false,
+            string? relatedSettingsKeyName = null
+        )
+        {
+            Message = message;
+            Severity = severity;
+            IsForeverDismissable = isForeverDismissable;
+            Visibility = IsForeverDismissable ? Visibility.Visible : Visibility.Collapsed;
+            RelatedSettingsKeyName = relatedSettingsKeyName;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs

@@ -1,27 +1,28 @@
-// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.Mvvm.ComponentModel;
-using Windows.Graphics.Imaging;
-using Windows.UI;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
     public partial class SongInfo : ObservableObject
     {
         [ObservableProperty]
-        public partial string? Album { get; set; }
+        public partial string Title { get; set; }
 
         [ObservableProperty]
         public partial string Artist { get; set; }
 
+        [ObservableProperty]
+        public partial string? Album { get; set; }
+
+        /// <summary>
+        /// In milliseconds
+        /// </summary>
         [ObservableProperty]
         public partial double? DurationMs { get; set; }
 
         [ObservableProperty]
         public partial string? SourceAppUserModelId { get; set; } = null;
 
-        [ObservableProperty]
-        public partial string Title { get; set; }
+        public byte[]? AlbumArt { get; set; } = null;
 
         public SongInfo() { }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml

@@ -5,7 +5,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:canvas="using:Microsoft.Graphics.Canvas.UI.Xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Renderer"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -14,16 +13,7 @@
         <canvas:CanvasAnimatedControl
             x:Name="LyricsCanvas"
             Draw="LyricsCanvas_Draw"
+            Loaded="LyricsCanvas_Loaded"
             Update="LyricsCanvas_Update" />
-        <Grid
-            Margin="36"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Visibility="{x:Bind ViewModel.IsTranslating, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-            <FontIcon
-                x:Name="RotatingIcon"
-                FontFamily="{StaticResource IconFontFamily}"
-                Glyph="&#xE8C1;" />
-        </Grid>
     </Grid>
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.xaml.cs

@@ -1,9 +1,11 @@
-// 2025/6/23 by Zhe Fang
-
+using System.Diagnostics;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media.Animation;
+
+// 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.Renderer
 {
@@ -17,14 +19,25 @@ namespace BetterLyrics.WinUI3.Renderer
             ViewModel = Ioc.Default.GetRequiredService<LyricsRendererViewModel>();
         }
 
-        private void LyricsCanvas_Draw(Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs args)
+        private void LyricsCanvas_Draw(
+            Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender,
+            Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedDrawEventArgs args
+        )
         {
             ViewModel.Draw(sender, args.DrawingSession);
         }
 
-        private void LyricsCanvas_Update(Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedUpdateEventArgs args)
+        private void LyricsCanvas_Update(
+            Microsoft.Graphics.Canvas.UI.Xaml.ICanvasAnimatedControl sender,
+            Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedUpdateEventArgs args
+        )
         {
             ViewModel.Update(sender, args);
         }
+
+        private void LyricsCanvas_Loaded(object sender, RoutedEventArgs e)
+        {
+            ViewModel.RequestRelayout();
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs

@@ -1,19 +1,17 @@
-// 2025/6/23 by Zhe Fang
-
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Models;
 
 namespace BetterLyrics.WinUI3.Serialization
 {
-
-    [JsonSerializable(typeof(List<AlbumArtSearchProviderInfo>))]
     [JsonSerializable(typeof(List<LyricsSearchProviderInfo>))]
-    [JsonSerializable(typeof(List<MediaSourceProviderInfo>))]
     [JsonSerializable(typeof(List<LocalLyricsFolder>))]
     [JsonSerializable(typeof(List<string>))]
-    [JsonSerializable(typeof(TranslateResponse))]
     [JsonSerializable(typeof(JsonElement))]
     [JsonSourceGenerationOptions(WriteIndented = true)]
     internal partial class SourceGenerationContext : JsonSerializerContext { }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService.cs

@@ -1,141 +0,0 @@
-using ATL;
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public class AlbumArtSearchService : IAlbumArtSearchService
-    {
-        private readonly HttpClient _iTunesHttpClinet;
-
-        private readonly ISettingsService _settingsService;
-        private readonly ILogger _logger;
-
-        public AlbumArtSearchService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            _logger = Ioc.Default.GetRequiredService<ILogger<AlbumArtSearchService>>();
-            _iTunesHttpClinet = new();
-        }
-
-        public async Task<byte[]?> SearchAsync(string title, string artist, string album, byte[]? bytesFromSMTC = null)
-        {
-            byte[]? result = null;
-
-            foreach (var provider in _settingsService.AlbumArtSearchProvidersInfo)
-            {
-                if (!provider.IsEnabled)
-                {
-                    continue;
-                }
-
-                switch (provider.Provider)
-                {
-                    case AlbumArtSearchProvider.Local:
-                        result = SearchFile(artist, album);
-                        break;
-                    case AlbumArtSearchProvider.SMTC:
-                        result = bytesFromSMTC;
-                        break;
-                    case AlbumArtSearchProvider.iTunes:
-                        foreach (string countryCode in new List<string>() { "us", "cn", "jp", "kr" })
-                        {
-                            result = await SearchiTunesAsync(artist, album, title, countryCode);
-                            if (result != null) break;
-                        }
-                        break;
-                    default:
-                        break;
-                }
-
-                if (result != null) return result;
-            }
-            return null;
-        }
-
-        private byte[]? SearchFile(string artist, string album)
-        {
-            foreach (var folder in _settingsService.LocalLyricsFolders)
-            {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
-                {
-                    foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
-                    {
-                        if (FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), album, artist))
-                        {
-                            Track track = new(file);
-                            var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
-                            if (bytes != null)
-                            {
-                                return bytes;
-                            }
-                        }
-                    }
-                }
-            }
-            return null;
-        }
-
-        private async Task<byte[]?> SearchiTunesAsync(string artist, string album, string title, string countryCode)
-        {
-            // Source: https://gist.github.com/mcworkaholic/82fbf203e3f1043bbe534b5b2974c0ce
-            try
-            {
-                string format = ".jpg";
-                var cachedAlbumArt = FileHelper.ReadAlbumArtCache(artist, album, format, PathHelper.iTunesAlbumArtCacheDirectory);
-
-                if (cachedAlbumArt != null)
-                {
-                    return cachedAlbumArt;
-                }
-
-                // Build the iTunes API URL
-                string url = $"https://itunes.apple.com/search?term=" + WebUtility.UrlEncode($"{artist} {album}").Replace("%20", "+") + "&country=" + countryCode + "&entity=album&media=music&limit=1";
-
-                // Make a request to the API
-                HttpResponseMessage response = await _iTunesHttpClinet.GetAsync(url);
-                response.EnsureSuccessStatusCode();
-                string responseBody = await response.Content.ReadAsStringAsync();
-
-                // Parse the JSON response
-                var data = JsonSerializer.Deserialize(responseBody, Serialization.SourceGenerationContext.Default.JsonElement);
-
-                if (data.TryGetProperty("results", out var results) && results.ValueKind == JsonValueKind.Array && results.GetArrayLength() > 0)
-                {
-                    // Get the first result
-                    var result = results[0];
-                    if (result.TryGetProperty("artworkUrl100", out var artworkUrlProp))
-                    {
-                        string artworkUrl = artworkUrlProp.GetString()?.Replace("100x100bb.jpg", "1200x1200bb.jpg") ?? string.Empty;
-                        var fetched = await _iTunesHttpClinet.GetByteArrayAsync(artworkUrl);
-
-                        if (fetched != null && fetched.Length > 0)
-                        {
-                            // Write to cache
-                            FileHelper.WriteAlbumArtCache(artist, album, fetched, format, PathHelper.iTunesAlbumArtCacheDirectory);
-                            return fetched;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error searching iTunes album art for {Artist} - {Album}", artist, album);
-            }
-            return null;
-        }
-
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IAlbumArtSearchService.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public interface IAlbumArtSearchService
-    {
-        Task<byte[]?> SearchAsync(string title, string artist, string album, byte[]? bytesFromSMTC = null);
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ILibWatcherService.cs

@@ -1,6 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,7 +11,6 @@ namespace BetterLyrics.WinUI3.Services
     public interface ILibWatcherService
     {
         event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
-
         public void UpdateWatchers(List<LocalLyricsFolder> folders);
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ILyricsSearchService.cs

@@ -1,14 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using BetterLyrics.WinUI3.Enums;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public interface ILyricsSearchService
-    {
-        Task<(string?, LyricsSearchProvider?)> SearchAsync(string title, string artist, string album, double durationMs, CancellationToken token);
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IMusicSearchService.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using BetterLyrics.WinUI3.Enums;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public interface IMusicSearchService
+    {
+        Task<(string?, LyricsFormat?)> SearchLyricsAsync(
+            string title,
+            string artist,
+            string album = "",
+            double durationMs = 0.0,
+            MusicSearchMatchMode matchMode = MusicSearchMatchMode.TitleAndArtist
+        );
+
+        byte[]? SearchAlbumArtAsync(string title, string artist);
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IPlaybackService.cs

@@ -1,7 +1,4 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
-using System.Threading.Tasks;
+using System;
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
 
@@ -9,16 +6,12 @@ namespace BetterLyrics.WinUI3.Services
 {
     public interface IPlaybackService
     {
+        event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
         event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
         event EventHandler<PositionChangedEventArgs>? PositionChanged;
-        event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
-        event EventHandler<AlbumArtChangedEventArgs>? AlbumArtChangedChanged;
-        event EventHandler<MediaSourceProvidersInfoEventArgs>? MediaSourceProvidersInfoChanged;
 
-        Task PlayAsync();
-        Task PauseAsync();
-        Task PreviousAsync();
-        Task NextAsync();
-            
+        SongInfo? SongInfo { get; }
+        bool IsPlaying { get; }
+        TimeSpan Position { get; }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ISettingsService.cs

@@ -1,100 +1,48 @@
-// 2025/6/23 by Zhe Fang
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
-using Windows.UI;
+using Windows.UI.Text;
 
 namespace BetterLyrics.WinUI3.Services
 {
     public interface ISettingsService
     {
-        // App behavior
+        bool IsFirstRun { get; set; }
 
+        // Lyrics lib
+        List<LocalLyricsFolder> LocalLyricsFolders { get; set; }
+        List<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
+
+        // App appearance
+        ElementTheme ThemeType { get; set; }
+        BackdropType BackdropType { get; set; }
+        TitleBarType TitleBarType { get; set; }
+        Language Language { get; set; }
+
+        // App behavior
         AutoStartWindowType AutoStartWindowType { get; set; }
 
+        // Album art background
+
+        bool IsCoverOverlayEnabled { get; set; }
+        bool IsDynamicCoverOverlayEnabled { get; set; }
+        int CoverOverlayOpacity { get; set; }
+        int CoverOverlayBlurAmount { get; set; }
+
+        // Album art cover style
         int CoverImageRadius { get; set; }
 
-        int CoverOverlayBlurAmount { get; set; }
-        int CoverOverlayOpacity { get; set; }
-        bool IsDynamicCoverOverlayEnabled { get; set; }
-        bool IsFanLyricsEnabled { get; set; }
-        bool IsFirstRun { get; set; }
-        bool IsLyricsGlowEffectEnabled { get; set; }
-        Language Language { get; set; }
-        int DesktopWindowLeft { get; set; }
-        int DesktopWindowTop { get; set; }
-        int DesktopWindowWidth { get; set; }
-        int DesktopWindowHeight { get; set; }
-
-        int StandardWindowWidth { get; set; }
-        int StandardWindowHeight { get; set; }
-        int StandardWindowLeft { get; set; }
-        int StandardWindowTop { get; set; }
-
-        bool AutoLockOnDesktopMode { get; set; }
-
-        string LibreTranslateServer { get; set; }
-        int SelectedTargetLanguageIndex { get; set; }
-        bool ResetPositionOffsetOnSongChanged { get; set; }
-        int PositionOffset { get; set; }
-        // Lyrics lib
-
-        List<LocalLyricsFolder> LocalLyricsFolders { get; set; }
-
         // Lyrics style and effetc
-
-        TextAlignmentType LyricsAlignmentType { get; set; }
-        TextAlignmentType SongInfoAlignmentType { get; set; }
-
-        int LyricsBlurAmount { get; set; }
-
-        Color LyricsCustomBgFontColor { get; set; }
-        Color LyricsCustomFgFontColor { get; set; }
-        Color LyricsCustomStrokeFontColor { get; set; }
-
-        int LyricsBgFontOpacity { get; set; }
-
-        LyricsFontColorType LyricsBgFontColorType { get; set; }
-        LyricsFontColorType LyricsFgFontColorType { get; set; }
-        LyricsFontColorType LyricsStrokeFontColorType { get; set; }
-
-        int LyricsFontSize { get; set; }
-
-        ElementTheme LyricsBackgroundTheme { get; set; }
-
-        int LyricsFontStrokeWidth { get; set; }
-
+        LyricsAlignmentType LyricsAlignmentType { get; set; }
         LyricsFontWeight LyricsFontWeight { get; set; }
-
-        LineRenderingType LyricsGlowEffectScope { get; set; }
-        LineRenderingType LyricsHighlightScope { get; set; }
-
-        bool IsLyricsFloatAnimationEnabled { get; set; }
-
-        float LyricsLineSpacingFactor { get; set; }
-
-        List<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
-        List<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; }
-        List<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; }
-
-        EasingType LyricsScrollEasingType { get; set; }
-        int LyricsScrollDuration { get; set; }
-
+        int LyricsBlurAmount { get; set; }
         int LyricsVerticalEdgeOpacity { get; set; }
-
-        bool IgnoreFullscreenWindow { get; set; }
-
-        bool IsTranslationEnabled { get; set; }
-        bool ShowTranslationOnly { get; set; }
-
-        LyricsDisplayType DisplayType { get; set; }
-
-        int TimelineSyncThreshold { get; set; }
-        int LockHotKeyIndex { get; set; }
-        bool IsImmersiveMode { get; set; }
-        string LXMusicServer { get; set; }
-        DockPlacement DockPlacement { get; set; }
+        float LyricsLineSpacingFactor { get; set; }
+        int LyricsFontSize { get; set; }
+        bool IsLyricsGlowEffectEnabled { get; set; }
+        LyricsGlowEffectScope LyricsGlowEffectScope { get; set; }
+        LyricsFontColorType LyricsFontColorType { get; set; }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ITranslateService.cs

@@ -1,17 +0,0 @@
-using BetterLyrics.WinUI3.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public interface ITranslateService
-    {
-        Task<string> TranslateTextAsync(string text, string targetLangCode, CancellationToken? token);
-
-        int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr);
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService.cs

@@ -1,84 +1,90 @@
-// 2025/6/23 by Zhe Fang
-
-using System;
+using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using BetterLyrics.WinUI3.Events;
-using BetterLyrics.WinUI3.Models;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    public class LibWatcherService : IDisposable, ILibWatcherService
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using global::BetterLyrics.WinUI3.Events;
+    using global::BetterLyrics.WinUI3.Models;
+
+    namespace BetterLyrics.WinUI3.Services
     {
-        private readonly ISettingsService _settingsService;
-
-        private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
-
-        public LibWatcherService(ISettingsService settingsService)
+        public class LibWatcherService : IDisposable, ILibWatcherService
         {
-            _settingsService = settingsService;
-            UpdateWatchers(_settingsService.LocalLyricsFolders);
-        }
+            private readonly ISettingsService _settingsService;
+            private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
 
-        public event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
+            public event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
 
-        public void Dispose()
-        {
-            foreach (var watcher in _watchers.Values)
+            public LibWatcherService(ISettingsService settingsService)
             {
-                watcher.Dispose();
-            }
-            _watchers.Clear();
-        }
-
-        public void UpdateWatchers(List<LocalLyricsFolder> folders)
-        {
-            // 移除不再监听的
-            foreach (var key in _watchers.Keys.ToList())
-            {
-                if (!folders.Any(x => x.Path == key && x.IsEnabled))
-                {
-                    _watchers[key].Dispose();
-                    _watchers.Remove(key);
-                }
+                _settingsService = settingsService;
+                UpdateWatchers(_settingsService.LocalLyricsFolders);
             }
 
-            // 添加新的监听
-            foreach (var folder in folders)
+            public void UpdateWatchers(List<LocalLyricsFolder> folders)
             {
-                if (
-                    !_watchers.ContainsKey(folder.Path)
-                    && Directory.Exists(folder.Path)
-                    && folder.IsEnabled
-                )
+                // 移除不再监听的
+                foreach (var key in _watchers.Keys.ToList())
                 {
-                    var watcher = new FileSystemWatcher(folder.Path)
+                    if (!folders.Any(x => x.Path == key && x.IsEnabled))
                     {
-                        IncludeSubdirectories = true,
-                        EnableRaisingEvents = true,
-                    };
-                    watcher.Created += (s, e) => OnChanged(folder.Path, e);
-                    watcher.Changed += (s, e) => OnChanged(folder.Path, e);
-                    watcher.Deleted += (s, e) => OnChanged(folder.Path, e);
-                    watcher.Renamed += (s, e) => OnChanged(folder.Path, e);
-                    _watchers[folder.Path] = watcher;
+                        _watchers[key].Dispose();
+                        _watchers.Remove(key);
+                    }
+                }
+
+                // 添加新的监听
+                foreach (var folder in folders)
+                {
+                    if (
+                        !_watchers.ContainsKey(folder.Path)
+                        && Directory.Exists(folder.Path)
+                        && folder.IsEnabled
+                    )
+                    {
+                        var watcher = new FileSystemWatcher(folder.Path)
+                        {
+                            IncludeSubdirectories = true,
+                            EnableRaisingEvents = true,
+                        };
+                        watcher.Created += (s, e) => OnChanged(folder.Path, e);
+                        watcher.Changed += (s, e) => OnChanged(folder.Path, e);
+                        watcher.Deleted += (s, e) => OnChanged(folder.Path, e);
+                        watcher.Renamed += (s, e) => OnChanged(folder.Path, e);
+                        _watchers[folder.Path] = watcher;
+                    }
                 }
             }
-        }
 
-        private void OnChanged(string folder, FileSystemEventArgs e)
-        {
-            App.DispatcherQueue!.TryEnqueue(
-                Microsoft.UI.Dispatching.DispatcherQueuePriority.High,
-                () =>
+            private void OnChanged(string folder, FileSystemEventArgs e)
+            {
+                App.DispatcherQueue!.TryEnqueue(
+                    Microsoft.UI.Dispatching.DispatcherQueuePriority.High,
+                    () =>
+                    {
+                        MusicLibraryFilesChanged?.Invoke(
+                            this,
+                            new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
+                        );
+                    }
+                );
+            }
+
+            public void Dispose()
+            {
+                foreach (var watcher in _watchers.Values)
                 {
-                    MusicLibraryFilesChanged?.Invoke(
-                        this,
-                        new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
-                    );
+                    watcher.Dispose();
                 }
-            );
+                _watchers.Clear();
+            }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService.cs

@@ -1,363 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using ATL;
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Lyricify.Lyrics.Providers.Web.Kugou;
-using Lyricify.Lyrics.Searchers;
-using Microsoft.Extensions.Logging;
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Storage;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public class LyricsSearchService : ILyricsSearchService
-    {
-        private readonly HttpClient _amllTtmlDbHttpClient;
-        private readonly HttpClient _lrcLibHttpClient;
-
-        private readonly ISettingsService _settingsService;
-        private readonly ILogger _logger;
-
-        public LyricsSearchService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            _logger = Ioc.Default.GetRequiredService<ILogger<LyricsSearchService>>();
-
-            _lrcLibHttpClient = new();
-            _lrcLibHttpClient.DefaultRequestHeaders.Add(
-                "User-Agent",
-                $"{MetadataHelper.AppName} {MetadataHelper.AppVersion} ({MetadataHelper.GithubUrl})"
-            );
-            _amllTtmlDbHttpClient = new();
-        }
-
-        private static bool IsAmllTtmlDbIndexInvalid()
-        {
-            bool existed = File.Exists(PathHelper.AmllTtmlDbIndexPath);
-
-            if (!existed)
-            {
-                return true;
-            }
-            else
-            {
-                long currentTs = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-                string lastUpdatedStr = File.ReadAllText(PathHelper.AmllTtmlDbLastUpdatedPath);
-                long lastUpdated = Convert.ToInt64(lastUpdatedStr);
-                return currentTs - lastUpdated > 1 * 24 * 60 * 60;
-            }
-        }
-
-        public async Task<bool> DownloadAmllTtmlDbIndexAsync()
-        {
-            const string url = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/metadata/raw-lyrics-index.jsonl";
-            try
-            {
-                using var response = await _amllTtmlDbHttpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
-                if (!response.IsSuccessStatusCode) return false;
-
-                await using var stream = await response.Content.ReadAsStreamAsync();
-                await using var fs = new FileStream(
-                    PathHelper.AmllTtmlDbIndexPath,
-                    FileMode.Create,
-                    FileAccess.Write,
-                    FileShare.None
-                );
-                await stream.CopyToAsync(fs);
-
-                long currentTs = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-                File.WriteAllText(PathHelper.AmllTtmlDbLastUpdatedPath, currentTs.ToString());
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public async Task<(string?, LyricsSearchProvider?)> SearchAsync(string title, string artist, string album, double durationMs, CancellationToken token)
-        {
-            _logger.LogInformation("Searching img for: {Title} - {Artist} (Album: {Album}, Duration: {DurationMs}ms)", title, artist, album, durationMs);
-
-            foreach (var provider in _settingsService.LyricsSearchProvidersInfo)
-            {
-                if (!provider.IsEnabled)
-                {
-                    continue;
-                }
-
-                string? cachedLyrics;
-                LyricsFormat lyricsFormat = provider.Provider.GetLyricsFormat();
-
-                // Check cache first
-                if (provider.Provider.IsRemote())
-                {
-                    cachedLyrics = FileHelper.ReadLyricsCache(title, artist, lyricsFormat, provider.Provider.GetCacheDirectory());
-                    if (!string.IsNullOrWhiteSpace(cachedLyrics))
-                    {
-                        return (cachedLyrics, provider.Provider);
-                    }
-                }
-
-                string? searchedLyrics = null;
-
-                if (provider.Provider.IsLocal())
-                {
-                    if (provider.Provider == LyricsSearchProvider.LocalMusicFile)
-                    {
-                        searchedLyrics = SearchEmbedded(title, artist);
-                    }
-                    else
-                    {
-                        searchedLyrics = await SearchFile(title, artist, lyricsFormat);
-                    }
-                }
-                else
-                {
-                    switch (provider.Provider)
-                    {
-                        case LyricsSearchProvider.LrcLib:
-                            searchedLyrics = await SearchLrcLibAsync(title, artist, album, (int)(durationMs / 1000));
-                            break;
-                        case LyricsSearchProvider.QQ:
-                            searchedLyrics = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.QQMusic);
-                            break;
-                        case LyricsSearchProvider.Kugou:
-                            searchedLyrics = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.Kugou);
-                            break;
-                        case LyricsSearchProvider.Netease:
-                            searchedLyrics = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.Netease);
-                            break;
-                        case LyricsSearchProvider.AmllTtmlDb:
-                            searchedLyrics = await SearchAmllTtmlDbAsync(title, artist);
-                            break;
-                        default:
-                            break;
-                    }
-                }
-
-                token.ThrowIfCancellationRequested();
-
-                if (!string.IsNullOrWhiteSpace(searchedLyrics))
-                {
-                    if (provider.Provider.IsRemote())
-                    {
-                        FileHelper.WriteLyricsCache(title, artist, searchedLyrics, lyricsFormat, provider.Provider.GetCacheDirectory());
-                    }
-
-                    return (searchedLyrics, provider.Provider);
-                }
-            }
-
-            return (null, null);
-        }
-
-        private async Task<string?> SearchFile(string title, string artist, LyricsFormat format)
-        {
-            foreach (var folder in _settingsService.LocalLyricsFolders)
-            {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
-                {
-                    foreach (var file in Directory.GetFiles(folder.Path, $"*{format.ToFileExtension()}", SearchOption.AllDirectories))
-                    {
-                        if (FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), title, artist))
-                        {
-                            string? raw = await File.ReadAllTextAsync(file, FileHelper.GetEncoding(file));
-                            if (raw != null)
-                            {
-                                return raw;
-                            }
-                        }
-                    }
-                }
-            }
-            return null;
-        }
-
-        private string? SearchEmbedded(string title, string artist)
-        {
-            foreach (var folder in _settingsService.LocalLyricsFolders)
-            {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
-                {
-                    foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
-                    {
-                        if (FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), title, artist))
-                        {
-                            try
-                            {
-                                var plain = TagLib.File.Create(file).Tag.Lyrics;
-                                if (plain != null && plain != string.Empty)
-                                {
-                                    return plain;
-                                }
-                            }
-                            catch (Exception) { }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private async Task<string?> SearchAmllTtmlDbAsync(string title, string artist)
-        {
-            if (IsAmllTtmlDbIndexInvalid())
-            {
-                var downloadOk = await DownloadAmllTtmlDbIndexAsync();
-                if (!downloadOk)
-                    return null;
-            }
-
-            string? rawLyricFile = null;
-            await foreach (var line in File.ReadLinesAsync(PathHelper.AmllTtmlDbIndexPath))
-            {
-                if (string.IsNullOrWhiteSpace(line))
-                    continue;
-                try
-                {
-                    using var doc = JsonDocument.Parse(line);
-                    var root = doc.RootElement;
-                    if (!root.TryGetProperty("metadata", out var metadataArr))
-                        continue;
-                    string? musicName = null;
-                    string? artists = null;
-                    foreach (var meta in metadataArr.EnumerateArray())
-                    {
-                        if (meta.GetArrayLength() != 2)
-                            continue;
-                        var key = meta[0].GetString();
-                        var valueArr = meta[1];
-                        if (key == "musicName" && valueArr.GetArrayLength() > 0)
-                            musicName = valueArr[0].GetString();
-                        if (key == "artists" && valueArr.GetArrayLength() > 0)
-                            artists = valueArr[0].GetString();
-                    }
-                    if (musicName == null || artists == null)
-                        continue;
-
-                    if (FileHelper.IsSwitchableNormalizedMatch($"{artists} - {musicName}", title, artist))
-                    {
-                        if (root.TryGetProperty("rawLyricFile", out var rawLyricFileProp))
-                        {
-                            rawLyricFile = rawLyricFileProp.GetString();
-                            break;
-                        }
-                    }
-                }
-                catch { }
-            }
-
-            if (string.IsNullOrWhiteSpace(rawLyricFile))
-                return null;
-
-            // 下载歌词内容
-            var url = $"https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/raw-lyrics/{rawLyricFile}";
-            try
-            {
-                var response = await _amllTtmlDbHttpClient.GetAsync(url);
-                if (!response.IsSuccessStatusCode)
-                    return null;
-                return await response.Content.ReadAsStringAsync();
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        private async Task<string?> SearchLrcLibAsync(string title, string artist, string album, int duration)
-        {
-            // Build API query URL
-            var url =
-                $"https://lrclib.net/api/search?" +
-                $"track_name={Uri.EscapeDataString(title)}&" +
-                $"artist_name={Uri.EscapeDataString(artist)}&" +
-                $"&album_name={Uri.EscapeDataString(album)}" +
-                $"&durationMs={Uri.EscapeDataString(duration.ToString())}";
-
-            var response = await _lrcLibHttpClient.GetAsync(url);
-            if (!response.IsSuccessStatusCode)
-                return null;
-
-            var json = await response.Content.ReadAsStringAsync();
-
-            var jArr = JsonSerializer.Deserialize(
-                json,
-                Serialization.SourceGenerationContext.Default.JsonElement
-            );
-            if (jArr.ValueKind == JsonValueKind.Array && jArr.GetArrayLength() > 0)
-            {
-                var first = jArr[0];
-                var syncedLyrics = first.GetProperty("syncedLyrics").GetString();
-                var result = string.IsNullOrWhiteSpace(syncedLyrics) ? null : syncedLyrics;
-                if (!string.IsNullOrWhiteSpace(result))
-                {
-                    return result;
-                }
-            }
-
-            return null;
-        }
-
-        private static async Task<string?> SearchQQNeteaseKugouAsync(string title, string artist, string album, int durationMs, Searchers searchers)
-        {
-            var result = await SearchersHelper.GetSearcher(searchers).SearchForResult(
-                new Lyricify.Lyrics.Models.TrackMultiArtistMetadata()
-                {
-                    DurationMs = durationMs,
-                    Album = album,
-                    Artists = [artist],
-                    Title = title,
-                }
-            );
-
-            if (result is QQMusicSearchResult qqResult)
-            {
-                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.QQMusicApi.GetLyricsAsync(qqResult.Id);
-                var original = response?.Lyrics;
-                var translated = response?.Trans;
-                if (!string.IsNullOrEmpty(translated))
-                {
-                    FileHelper.WriteLyricsCache(
-                        title,
-                        artist,
-                        translated,
-                        LyricsFormat.Lrc,
-                        PathHelper.QQTranslationCacheDirectory
-                    );
-                }
-                return original;
-            }
-            else if (result is NeteaseSearchResult neteaseResult)
-            {
-                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.NeteaseApi.GetLyric(neteaseResult.Id);
-                return response?.Lrc.Lyric;
-            }
-            else if (result is KugouSearchResult kugouResult)
-            {
-                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.KugouApi.GetSearchLyrics(hash: kugouResult.Hash);
-                if (response?.Candidates.FirstOrDefault() is SearchLyricsResponse.Candidate candidate)
-                {
-                    return Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyrics(
-                        candidate.Id,
-                        candidate.AccessKey
-                    );
-                }
-            }
-
-            return null;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MusicSearchService.cs

@@ -0,0 +1,354 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using ATL;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using Windows.Storage;
+using Windows.Storage.FileProperties;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public class MusicSearchService : IMusicSearchService
+    {
+        private readonly HttpClient _httpClient;
+        private readonly ISettingsService _settingsService;
+
+        public MusicSearchService(ISettingsService settingsService)
+        {
+            _settingsService = settingsService;
+            _httpClient = new HttpClient();
+            _httpClient.DefaultRequestHeaders.Add(
+                "User-Agent",
+                $"{AppInfo.AppName} {AppInfo.AppVersion} ({AppInfo.GithubUrl})"
+            );
+        }
+
+        public byte[]? SearchAlbumArtAsync(string title, string artist)
+        {
+            foreach (var folder in _settingsService.LocalLyricsFolders)
+            {
+                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                {
+                    foreach (
+                        var file in Directory.GetFiles(
+                            folder.Path,
+                            $"*.*",
+                            SearchOption.AllDirectories
+                        )
+                    )
+                    {
+                        if (FuzzyMatch(Path.GetFileNameWithoutExtension(file), title, artist))
+                        {
+                            Track track = new(file);
+                            var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
+                            if (bytes != null)
+                            {
+                                return bytes;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public async Task<(string?, LyricsFormat?)> SearchLyricsAsync(
+            string title,
+            string artist,
+            string album = "",
+            double durationMs = 0.0,
+            MusicSearchMatchMode matchMode = MusicSearchMatchMode.TitleAndArtist
+        )
+        {
+            foreach (var provider in _settingsService.LyricsSearchProvidersInfo)
+            {
+                if (!provider.IsEnabled)
+                {
+                    continue;
+                }
+
+                switch (provider.Provider)
+                {
+                    case LyricsSearchProvider.LrcLib:
+                        // Check cache first
+                        var cachedLyrics = ReadCache(title, artist, LyricsFormat.Lrc);
+                        if (!string.IsNullOrWhiteSpace(cachedLyrics))
+                        {
+                            return (cachedLyrics, LyricsFormat.Lrc);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                string? searchedLyrics = null;
+
+                switch (provider.Provider)
+                {
+                    case LyricsSearchProvider.LocalMusicFile:
+                        searchedLyrics = LocalLyricsSearchInMusicFiles(title, artist);
+                        break;
+                    case LyricsSearchProvider.LocalLrcFile:
+                        searchedLyrics = await LocalLyricsSearchInLyricsFiles(
+                            title,
+                            artist,
+                            LyricsFormat.Lrc
+                        );
+                        break;
+                    case LyricsSearchProvider.LocalEslrcFile:
+                        searchedLyrics = await LocalLyricsSearchInLyricsFiles(
+                            title,
+                            artist,
+                            LyricsFormat.Eslrc
+                        );
+                        break;
+                    case LyricsSearchProvider.LocalTtmlFile:
+                        searchedLyrics = await LocalLyricsSearchInLyricsFiles(
+                            title,
+                            artist,
+                            LyricsFormat.Ttml
+                        );
+                        break;
+                    case LyricsSearchProvider.LrcLib:
+                        searchedLyrics = await SearchLrcLib(
+                            title,
+                            artist,
+                            album,
+                            (int)(durationMs / 1000),
+                            matchMode
+                        );
+                        break;
+                    default:
+                        break;
+                }
+
+                if (!string.IsNullOrWhiteSpace(searchedLyrics))
+                {
+                    switch (provider.Provider)
+                    {
+                        case LyricsSearchProvider.LrcLib:
+                            WriteCache(title, artist, searchedLyrics, LyricsFormat.Lrc);
+                            return (searchedLyrics, LyricsFormat.Lrc);
+                        case LyricsSearchProvider.LocalMusicFile:
+                            return (searchedLyrics, LyricsFormatExtensions.Detect(searchedLyrics));
+                        case LyricsSearchProvider.LocalLrcFile:
+                            return (searchedLyrics, LyricsFormat.Lrc);
+                        case LyricsSearchProvider.LocalEslrcFile:
+                            return (searchedLyrics, LyricsFormat.Eslrc);
+                        case LyricsSearchProvider.LocalTtmlFile:
+                            return (searchedLyrics, LyricsFormat.Ttml);
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            return (null, null);
+        }
+
+        private static int LevenshteinDistance(string a, string b)
+        {
+            if (string.IsNullOrEmpty(a))
+                return b.Length;
+            if (string.IsNullOrEmpty(b))
+                return a.Length;
+            int[,] d = new int[a.Length + 1, b.Length + 1];
+            for (int i = 0; i <= a.Length; i++)
+                d[i, 0] = i;
+            for (int j = 0; j <= b.Length; j++)
+                d[0, j] = j;
+            for (int i = 1; i <= a.Length; i++)
+            for (int j = 1; j <= b.Length; j++)
+                d[i, j] = Math.Min(
+                    Math.Min(d[i - 1, j] + 1, d[i, j - 1] + 1),
+                    d[i - 1, j - 1] + (a[i - 1] == b[j - 1] ? 0 : 1)
+                );
+            return d[a.Length, b.Length];
+        }
+
+        // 判断相似度
+        private static bool FuzzyMatch(string fileName, string title, string artist)
+        {
+            var normFile = Normalize(fileName);
+            var normTarget1 = Normalize(title + artist);
+            var normTarget2 = Normalize(artist + title);
+
+            int dist1 = LevenshteinDistance(normFile, normTarget1);
+            int dist2 = LevenshteinDistance(normFile, normTarget2);
+
+            return dist1 <= 3 || dist2 <= 3; // 阈值可调整
+        }
+
+        private static string Normalize(string s)
+        {
+            if (string.IsNullOrWhiteSpace(s))
+                return "";
+            var sb = new StringBuilder();
+            foreach (var c in s.ToLowerInvariant())
+            {
+                if (char.IsLetterOrDigit(c))
+                    sb.Append(c);
+            }
+            return sb.ToString();
+        }
+
+        private string? LocalLyricsSearchInMusicFiles(string title, string artist)
+        {
+            foreach (var folder in _settingsService.LocalLyricsFolders)
+            {
+                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                {
+                    foreach (
+                        var file in Directory.GetFiles(
+                            folder.Path,
+                            $"*.*",
+                            SearchOption.AllDirectories
+                        )
+                    )
+                    {
+                        if (FuzzyMatch(Path.GetFileNameWithoutExtension(file), title, artist))
+                        {
+                            //Track track = new(file);
+                            //var plain = track.Lyrics.UnsynchronizedLyrics;
+
+                            try
+                            {
+                                var plain = TagLib.File.Create(file).Tag.Lyrics;
+                                if (plain != null && plain != string.Empty)
+                                {
+                                    return plain;
+                                }
+                            }
+                            catch (Exception) { }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private async Task<string?> LocalLyricsSearchInLyricsFiles(
+            string title,
+            string artist,
+            LyricsFormat format
+        )
+        {
+            foreach (var folder in _settingsService.LocalLyricsFolders)
+            {
+                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                {
+                    foreach (
+                        var file in Directory.GetFiles(
+                            folder.Path,
+                            $"*{format.ToFileExtension()}",
+                            SearchOption.AllDirectories
+                        )
+                    )
+                    {
+                        if (FuzzyMatch(Path.GetFileNameWithoutExtension(file), title, artist))
+                        {
+                            string? raw = await File.ReadAllTextAsync(
+                                file,
+                                FileHelper.GetEncoding(file)
+                            );
+                            if (raw != null)
+                            {
+                                return raw;
+                            }
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        private async Task<string?> SearchLrcLib(
+            string title,
+            string artist,
+            string album,
+            int duration,
+            MusicSearchMatchMode matchMode
+        )
+        {
+            // Build API query URL
+            var url =
+                $"https://lrclib.net/api/search?"
+                + $"track_name={Uri.EscapeDataString(title)}&"
+                + $"artist_name={Uri.EscapeDataString(artist)}";
+
+            if (matchMode == MusicSearchMatchMode.TitleArtistAlbumAndDuration)
+            {
+                url +=
+                    $"&album_name={Uri.EscapeDataString(album)}"
+                    + $"&durationMs={Uri.EscapeDataString(duration.ToString())}";
+            }
+
+            var response = await _httpClient.GetAsync(url);
+            if (!response.IsSuccessStatusCode)
+                return null;
+
+            var json = await response.Content.ReadAsStringAsync();
+
+            var jArr = JsonSerializer.Deserialize(
+                json,
+                Serialization.SourceGenerationContext.Default.JsonElement
+            );
+            if (jArr.ValueKind == JsonValueKind.Array && jArr.GetArrayLength() > 0)
+            {
+                var first = jArr[0];
+                var syncedLyrics = first.GetProperty("syncedLyrics").GetString();
+                var result = string.IsNullOrWhiteSpace(syncedLyrics) ? null : syncedLyrics;
+                if (!string.IsNullOrWhiteSpace(result))
+                {
+                    return result;
+                }
+            }
+
+            return null;
+        }
+
+        private void WriteCache(string title, string artist, string lyrics, LyricsFormat format)
+        {
+            var safeArtist = SanitizeFileName(artist);
+            var safeTitle = SanitizeFileName(title);
+            var cacheFilePath = Path.Combine(
+                AppInfo.OnlineLyricsCacheDirectory,
+                $"{safeArtist} - {safeTitle}{format.ToFileExtension()}"
+            );
+            File.WriteAllText(cacheFilePath, lyrics);
+        }
+
+        private string? ReadCache(string title, string artist, LyricsFormat format)
+        {
+            var safeArtist = SanitizeFileName(artist);
+            var safeTitle = SanitizeFileName(title);
+            var cacheFilePath = Path.Combine(
+                AppInfo.OnlineLyricsCacheDirectory,
+                $"{safeArtist} - {safeTitle}{format.ToFileExtension()}"
+            );
+            if (File.Exists(cacheFilePath))
+            {
+                return File.ReadAllText(cacheFilePath);
+            }
+            return null;
+        }
+
+        private static string SanitizeFileName(string fileName, char replacement = '_')
+        {
+            var invalidChars = Path.GetInvalidFileNameChars();
+            var sb = new StringBuilder(fileName.Length);
+            foreach (var c in fileName)
+            {
+                sb.Append(Array.IndexOf(invalidChars, c) >= 0 ? replacement : c);
+            }
+            return sb.ToString();
+        }
+    }
+}