chores: bump version code

- Add album text in lyrics render
- Improve song info update and draw algo
- Upgrade to .NET 10

.github/ISSUE_TEMPLATE/bug-反馈.md

@@ -0,0 +1,22 @@
+---
+name: Bug 反馈
+about: 帮助我们改进 BetterLyrics
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**描述问题**
+
+
+**屏幕截图**
+
+
+**BetterLyrics 版本**
+v1.0.XX.0
+
+**日志**
+将日志以单文件形式上传到此处。你可以在此处找到日志文件 `%LocalAppData%\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\logs`
+
+**附加信息**

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+
+
+**Screenshots**
+
+**BetterLyrics Version**
+v1.0.XX.0
+
+**Logs**
+Upload logs as a file here. You can find logs at `%LocalAppData%\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\logs`
+
+**Additional context**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,13 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the solution you'd like**
+
+
+**Additional context**

.github/ISSUE_TEMPLATE/功能建议.md

@@ -0,0 +1,13 @@
+---
+name: 功能建议
+about: 提供宝贵的功能建议
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**描述你所构想的解决方案**
+
+
+**附加信息**

.gitignore

@@ -407,3 +407,4 @@ FodyWeavers.xsd
 *.sln.iml
 /BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package)_TemporaryKey.pfx
 /BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LastFM.cs
+/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Discord.cs

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

@@ -37,8 +37,8 @@
   <PropertyGroup>
     <ProjectGuid>6576cd19-ef92-4099-b37d-e2d8ebdb6bf5</ProjectGuid>
     <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <AssetTargetFallback>net8.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <AssetTargetFallback>net10.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
     <DefaultLanguage>zh-CN</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
@@ -143,8 +143,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6584" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -53,8 +53,6 @@
             <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converter:MillisecondsToFormattedTimeConverter x:Key="MillisecondsToFormattedTimeConverter" />
-            <converter:MediaSourceProviderToLogoUriConverter x:Key="MediaSourceProviderToLogoUriConverter" />
-            <converter:MediaSourceProviderToDisplayedNameConverter x:Key="MediaSourceProviderToDisplayedNameConverter" />
             <converter:FPSToTimeSpanConverter x:Key="FPSToTimeSpanConverter" />
             <converter:ShortcutToStringConverter x:Key="ShortcutToStringConverter" />
             <converter:BoolNegationToVisibilityConverter x:Key="BoolNegationToVisibilityConverter" />
@@ -69,6 +67,8 @@
             <converter:TrackToLyricsConverter x:Key="TrackToLyricsConverter" />
             <converter:IntToBoolConverter x:Key="IntToBoolConverter" />
             <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
+            <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
+            <converter:MillisecondsToSecondsConverter x:Key="MillisecondsToSecondsConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />

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

@@ -1,9 +1,9 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
+using BetterLyrics.WinUI3.Services.DiscordService;
 using BetterLyrics.WinUI3.Services.LastFMService;
 using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
@@ -18,14 +18,10 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.ApplicationModel.Resources;
 using Serilog;
 using System;
-using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -73,10 +69,10 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+            WindowHook.OpenOrShowWindow<LyricsWindow>();
             if (Ioc.Default.GetRequiredService<ISettingsService>().AppSettings.MusicGallerySettings.AutoOpen)
             {
-                WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
+                WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
             }
         }
 
@@ -105,6 +101,7 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<ITranslateService, TranslateService>()
                     .AddSingleton<ILastFMService, LastFMService>()
                     .AddSingleton<IResourceService, ResourceService>()
+                    .AddSingleton<IDiscordService, DiscordService>()
                     // ViewModels
                     .AddSingleton<AppSettingsControlViewModel>()
                     .AddSingleton<PlaybackSettingsControlViewModel>()

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
 		<RootNamespace>BetterLyrics.WinUI3</RootNamespace>
 		<Platforms>x86;x64;ARM64</Platforms>
@@ -61,34 +61,37 @@
 		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
+		<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
 		<PackageReference Include="csharp-kana" Version="1.0.2" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
-		<PackageReference Include="DevWinUI.Controls" Version="9.4.2" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.5.0" />
+		<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
 		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
 		<PackageReference Include="NAudio.Wasapi" Version="2.2.1" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.3-dev-02320" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-		<PackageReference Include="System.Drawing.Common" Version="9.0.10" />
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+		<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
 		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.User32" Version="4.2.1" />
+		<PackageReference Include="Vanara.Windows.Shell" Version="4.2.1" />
 		<PackageReference Include="WinUIEx" Version="2.9.0" />
-		<PackageReference Include="z440.atl.core" Version="7.6.0" />
+		<PackageReference Include="z440.atl.core" Version="7.8.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\ColorThief.WinUI3\ColorThief.WinUI3.csproj" />
@@ -106,26 +109,19 @@
 	</ItemGroup>
 	<!--Disable Trimming for Specific Packages-->
 	<ItemGroup>
-		<TrimmerRootAssembly Include="TagLibSharp" />
 		<TrimmerRootAssembly Include="NAudio.Wasapi" />
+		<TrimmerRootAssembly Include="TagLibSharp" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.DwmApi" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.Gdi32" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.Shell32" />
+		<TrimmerRootAssembly Include="Vanara.PInvoke.User32" />
+		<TrimmerRootAssembly Include="Vanara.Windows.Shell" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Content Update="Assets\AIMP.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\AlbumArtPlaceholder.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\AMLLPlayer.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\AppleMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Chrome.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Edge.png">
+	  <Content Update="Assets\Alipay.jpg">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\FluidEffect.bin">
@@ -140,70 +136,25 @@
 	  <Content Update="Assets\EmptyState.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\foobar2000.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\HyPlayer.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\iTunes.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\KugouMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\LastFM.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Leaf.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Listen1.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\Logo.ico">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Logo.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\LXMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\MediaPlayerWindows11.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\MoeKoeMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\MusicBee.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\NetEaseCloudMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\Page.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\PlanetMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\PotPlayer.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\QQMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Question.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\SaltPlayerForWindows.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\Segoe Fluent Icons.ttf">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Spotify.png">
+	  <Content Update="Assets\WeChatReward.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Wiki82.profile.xml">
@@ -345,8 +296,5 @@
 		<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
 		<InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
 		<PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
-		<Version>2025.6.0</Version>
-		<AssemblyVersion>2025.6.18.0110</AssemblyVersion>
-		<FileVersion>2025.6.18.0110</FileVersion>
 	</PropertyGroup>
 </Project>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Collections/FullyObservableCollection.cs

@@ -3,11 +3,8 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace BetterLyrics.WinUI3.Extensions
+namespace BetterLyrics.WinUI3.Collections
 {
     // https://stackoverflow.com/a/32013610/11048731
     public class FullyObservableCollection<T> : ObservableCollection<T>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AmllTTmlDB.cs

@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class AmllTTmlDB
     {
-        private const string BaseUrl = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/";
-        public const string QueryPrefix = $"{BaseUrl}raw-lyrics/";
-        public const string Index = $"{BaseUrl}metadata/raw-lyrics-index.jsonl";
+        public const string BaseUrl = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main";
+        public const string QueryPrefix = "raw-lyrics";
+        public const string IndexSuffix = "metadata/raw-lyrics-index.jsonl";
     }
 }

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

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class App
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/AppleMusic.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class AppleMusic
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/DiscordTemplate

@@ -0,0 +1,7 @@
+namespace BetterLyrics.WinUI3.Constants
+{
+    class Discord
+    {
+        public const string AppID = "Your Discord app ID here";
+    }
+}

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

@@ -0,0 +1,8 @@
+namespace BetterLyrics.WinUI3.Constants
+{
+    public class ExtendedGenreFiled
+    {
+        public const string NetEaseCloudMusicTrackID = "NCM-";
+        public const string FileName = "FILENAME-";
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LXMusic.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class LXMusic
     {

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

@@ -1,18 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class Link
     {
+        public const string MicrosoftStoreUrl = "https://apps.microsoft.com/detail/9p1wcd1p597r";
         public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics";
         public const string ShareHubUrl = $"{GitHubUrl}/blob/dev/ShareHub/index.md";
-        public const string WikiUrl = $"{GitHubUrl}/wiki";
-        public const string AppleMusicCfgUrl = $"{WikiUrl}/%5BEN%5D-Lyrics-provider-configuration#apple-music";
-        public const string FAQUrl = $"{GitHubUrl}/blob/dev/FAQ/index.md";
+        public const string TermsOfServiceUrl = $"{GitHubUrl}/blob/dev/TermsofService.md";
+        public const string PrivacyPolicy = $"{GitHubUrl}/blob/dev/PrivacyPolicy.md";
+        public const string WikiUrl = "https://jayfunc.blog/work/betterlyrics";
+        public const string AppleMusicCfgUrl = $"{WikiUrl}#lyrics-sources-configuration";
+        public const string FAQUrl = $"{WikiUrl}#faq";
         public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
         public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";
         public const string TelegramUrl = "https://t.me/+svhSLZ7awPsxNGY1";

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

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

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

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

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

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

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/iTunes.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
+namespace BetterLyrics.WinUI3.Constants
 {
     public static class iTunes
     {

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

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

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

@@ -1,19 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml

@@ -5,9 +5,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:dev="using:DevWinUI"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
@@ -42,7 +42,6 @@
                     <dev:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
                         <local:ExtendedSlider
                             Default="12"
-                            
                             Maximum="100"
                             Minimum="0"
                             Unit="%"
@@ -52,7 +51,6 @@
                     <dev:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
                         <local:ExtendedSlider
                             Default="12"
-                            
                             Maximum="64"
                             Minimum="0"
                             Value="{x:Bind AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=TwoWay}" />
@@ -99,6 +97,9 @@
                             <dev:SettingsCard x:Uid="SettingsPageShowArtists">
                                 <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowArtists, Mode=TwoWay}" />
                             </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageShowAlbum">
+                                <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowAlbum, Mode=TwoWay}" />
+                            </dev:SettingsCard>
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AlbumArtLayoutSettingsControl.xaml.cs

@@ -1,20 +1,6 @@
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,23 +1,7 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,18 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+using BetterLyrics.WinUI3.Models;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using BetterLyrics.WinUI3.Models;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ExtendedSlider.xaml.cs

@@ -1,19 +1,8 @@
 using BetterLyrics.WinUI3.Events;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,20 +1,8 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -109,7 +109,7 @@
                                     Value="{x:Bind LyricsBackgroundSettings.FluidOverlayOpacity, Mode=TwoWay}" />
                             </dev:SettingsCard>
 
-                            <dev:SettingsCard x:Uid="SettingsPagePaletteGeneratorType">
+                            <dev:SettingsCard x:Uid="SettingsPagePaletteGeneratorType" IsEnabled="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
                                 <ComboBox SelectedIndex="{x:Bind LyricsBackgroundSettings.PaletteGeneratorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                     <ComboBoxItem x:Uid="SettingsPageMedianCut" />
                                     <ComboBoxItem x:Uid="SettingsPageOctTree" />
@@ -126,20 +126,45 @@
                         IsExpanded="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
                         <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=TwoWay}" />
                         <dev:SettingsExpander.Items>
-                            <dev:SettingsCard x:Uid="SettingsPageAmount">
+                            <dev:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
                                 <uc:ExtendedSlider
-                                    Maximum="100"
-                                    Minimum="10"
+                                    Maximum="10"
+                                    Minimum="0"
                                     ResetButtonVisibility="Collapsed"
                                     Value="{x:Bind LyricsBackgroundSettings.SnowFlakeOverlayAmount, Mode=TwoWay}" />
                             </dev:SettingsCard>
+                            <dev:SettingsCard x:Uid="SettingsPageSpeed" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Maximum="10"
+                                    Minimum="1"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsBackgroundSettings.SnowFlakeOverlaySpeed, Mode=TwoWay}" />
+                            </dev:SettingsCard>
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 
-                    <dev:SettingsCard x:Uid="SettingsPageSpectrumLayer" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE659;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                    <dev:SettingsCard x:Uid="SettingsPageFogLayer" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA91;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsFogOverlayEnabled, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <dev:SettingsExpander
+                        x:Uid="SettingsPageSpectrumLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF61F;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                        <dev:SettingsExpander.Items>
+
+                            <dev:SettingsCard x:Uid="SettingsPageSpectrumLayerPlacement" IsEnabled="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsBackgroundSettings.SpectrumPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageSpectrumPlacementTop" />
+                                    <ComboBoxItem x:Uid="SettingsPageSpectrumPlacementBottom" />
+                                </ComboBox>
+                            </dev:SettingsCard>
+
+                        </dev:SettingsExpander.Items>
+                    </dev:SettingsExpander>
+
                 </StackPanel>
             </Grid>
         </ScrollViewer>

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

@@ -1,20 +1,6 @@
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,20 +1,6 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -69,6 +69,17 @@
 
                                 <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
                                 <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}" TextWrapping="Wrap" />
+                                <RichTextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" TextWrapping="Wrap">
+                                    <Paragraph>
+                                        <Run x:Uid="ArtistsSplitHint" />
+                                        <Run Text=";" />
+                                        <Run Text="," />
+                                        <Run Text="/" />
+                                        <Run Text="；" />
+                                        <Run Text="、" />
+                                        <Run Text="，" />
+                                    </Paragraph>
+                                </RichTextBlock>
                                 <Button
                                     VerticalAlignment="Center"
                                     Command="{x:Bind ViewModel.ResetMappedArtistCommand}"
@@ -133,7 +144,7 @@
                                         Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     <TextBlock
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        Text="{x:Bind Artist}"
+                                        Text="{x:Bind DisplayArtists}"
                                         TextWrapping="Wrap"
                                         Visibility="{x:Bind IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     <TextBlock

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

@@ -1,21 +1,7 @@
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Ude.Core;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,20 +1,6 @@
-using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,6 +1,5 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Serialization;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.ResourceService;
@@ -10,22 +9,12 @@ using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using NTextCat.Commons;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.Storage;
-using WinRT.Interop;
-using static Vanara.PInvoke.ComCtl32;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -11,66 +11,74 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
-        CornerRadius="12">
-        <FontIcon
-            Margin="20"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            FontFamily="{StaticResource IconFontFamily}"
-            Glyph="&#xE8AB;" />
-        <Button
-            Margin="12"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Click="Button_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  Glyph=&#xE73C;}"
-            Style="{StaticResource GhostButtonStyle}">
-            <Button.KeyboardAccelerators>
-                <KeyboardAccelerator Key="Escape" />
-            </Button.KeyboardAccelerators>
-        </Button>
+    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid x:Name="ShadowCastGrid" />
+        <Border
+            x:Name="ShadowRect"
+            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+            CornerRadius="12"
+            Loaded="ShadowRect_Loaded"
+            Translation="0,0,64">
+            <Border.Shadow>
+                <ThemeShadow x:Name="Shadow" />
+            </Border.Shadow>
+        </Border>
+        <Grid Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}" CornerRadius="12">
+            <TextBlock
+                x:Uid="SystemTraySwitch"
+                Margin="20"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top" />
+            <Button
+                Margin="12"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Click="Button_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      Glyph=&#xE73C;}"
+                Style="{StaticResource GhostButtonStyle}">
+                <Button.KeyboardAccelerators>
+                    <KeyboardAccelerator Key="Escape" />
+                </Button.KeyboardAccelerators>
+            </Button>
 
-        <ListView
-            Margin="48,56"
-            ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
-            SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <Grid
-                        Margin="0,10"
-                        Padding="5"
-                        AllowFocusOnInteraction="True"
-                        CornerRadius="4"
-                        Tapped="Grid_Tapped">
-                        <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
-                    </Grid>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
+            <ListView
+                Margin="48,56"
+                ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <Grid
+                            Margin="0,10"
+                            Padding="5"
+                            AllowFocusOnInteraction="True"
+                            CornerRadius="4"
+                            Tapped="Grid_Tapped">
+                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
 
-        <StackPanel
-            Margin="20"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Bottom"
-            Orientation="Horizontal"
-            Spacing="6">
-            <FontIcon
-                Margin="0,1,0,0"
-                FontFamily="{StaticResource IconFontFamily}"
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                Glyph="&#xE946;" />
-            <TextBlock x:Uid="LyricsWindowSwitchWindowHelp" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-        </StackPanel>
+            <StackPanel
+                Margin="20"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Bottom"
+                Orientation="Horizontal"
+                Spacing="6">
+                <HyperlinkButton Click="SettingsHypelinkButton_Click">
+                    <HyperlinkButton.Content>
+                        <TextBlock x:Uid="LyricsWindowSwitchWindowHelp" />
+                    </HyperlinkButton.Content>
+                </HyperlinkButton>
+            </StackPanel>
+        </Grid>
     </Grid>
 
+
 </UserControl>

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

@@ -1,22 +1,11 @@
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -45,10 +34,21 @@ namespace BetterLyrics.WinUI3.Controls
 
         private async Task HideAsync()
         {
-            var lyricsWindowSwitchWindow = WindowHelper.GetWindowByWindowType<LyricsWindowSwitchWindow>();
+            var lyricsWindowSwitchWindow = WindowHook.GetWindow<LyricsWindowSwitchWindow>();
             lyricsWindowSwitchWindow?.ViewModel.RootGridOpacity = 0;
             await Task.Delay(300);
-            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
+            WindowHook.HideWindow<LyricsWindowSwitchWindow>();
+        }
+
+        private void ShadowRect_Loaded(object sender, RoutedEventArgs e)
+        {
+            Shadow.Receivers.Add(ShadowCastGrid);
+        }
+
+        private async void SettingsHypelinkButton_Click(object sender, RoutedEventArgs e)
+        {
+            await HideAsync();
+            WindowHook.OpenOrShowWindow<SettingsWindow>();
         }
     }
 }

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

@@ -3,18 +3,7 @@ using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,

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

@@ -21,8 +21,72 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
-            <ScrollViewer Margin="0,72,0,0" Style="{StaticResource SettingsScrollViewerStyle}">
+
+        <Grid Grid.Column="0" RowSpacing="18">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <interactivity:Interaction.Behaviors>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
+                    ComparisonCondition="NotEqual"
+                    Value="0">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="0">
+                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                </interactivity:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+
+            <!--  播放源列表  -->
+            <ListView
+                x:Name="MediaSourceProvidersListView"
+                Grid.Row="0"
+                AllowDrop="True"
+                CanDragItems="True"
+                CanReorderItems="True"
+                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
+                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
+                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                ScrollViewer.HorizontalScrollMode="Enabled"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollMode="Disabled"
+                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
+                <ListView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ItemsStackPanel Orientation="Horizontal" />
+                    </ItemsPanelTemplate>
+                </ListView.ItemsPanel>
+                <ListView.ItemTemplate>
+                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <ToolTipService.ToolTip>
+                                <ToolTip Content="{Binding Provider, Mode=OneWay}" />
+                            </ToolTipService.ToolTip>
+                            <FontIcon
+                                FontFamily="Segoe UI Symbol"
+                                FontSize="12"
+                                Glyph="&#x283F;" />
+                            <Grid
+                                Width="16"
+                                Height="16"
+                                CornerRadius="4">
+                                <Image Source="{Binding Logo, Mode=OneWay}" />
+                            </Grid>
+                            <TextBlock
+                                MaxWidth="200"
+                                Text="{Binding DisplayName, Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+
+            <ScrollViewer Grid.Row="1" Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
@@ -34,6 +98,31 @@
                             <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLastFMTrackEnabled, Mode=TwoWay}" />
                         </dev:SettingsCard>
 
+                        <dev:SettingsCard x:Uid="SettingsPageDiscordPresence">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsDiscordPresenceEnabled, Mode=TwoWay}" />
+                        </dev:SettingsCard>
+
+                        <!--  LX music server  -->
+                        <dev:SettingsCard x:Uid="SettingsPageLXMusicServer" Visibility="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLXMusic, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBox
+                                    x:Uid="SettingsPageLXMusicServerInput"
+                                    Grid.Column="0"
+                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    x:Uid="SettingsPageServerTestButton"
+                                    Grid.Column="1"
+                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
+                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+                            </Grid>
+                        </dev:SettingsCard>
+
                         <!--  时间轴相关配置  -->
                         <dev:SettingsExpander x:Uid="SettingsPageLyricsTimeline" IsExpanded="True">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsTimelineSyncEnabled, Mode=TwoWay}" />
@@ -127,55 +216,6 @@
                 </Grid>
             </ScrollViewer>
 
-            <!--  播放源列表  -->
-            <ListView
-                x:Name="MediaSourceProvidersListView"
-                VerticalAlignment="Top"
-                AllowDrop="True"
-                CanDragItems="True"
-                CanReorderItems="True"
-                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
-                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                ScrollViewer.HorizontalScrollMode="Enabled"
-                ScrollViewer.VerticalScrollBarVisibility="Disabled"
-                ScrollViewer.VerticalScrollMode="Disabled"
-                SelectedItem="{x:Bind ViewModel.SelectedMediaSourceProvider, Mode=TwoWay}">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <ItemsStackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-                <ListView.ItemTemplate>
-                    <DataTemplate x:DataType="models:MediaSourceProviderInfo">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <FontIcon
-                                FontFamily="Segoe UI Symbol"
-                                FontSize="12"
-                                Glyph="&#x283F;" />
-                            <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
-                            <TextBlock
-                                MaxWidth="200"
-                                Text="{Binding Provider, Converter={StaticResource MediaSourceProviderToDisplayedNameConverter}, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-            <interactivity:Interaction.Behaviors>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="NotEqual"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                </interactivity:DataTriggerBehavior>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="Equal"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                </interactivity:DataTriggerBehavior>
-            </interactivity:Interaction.Behaviors>
         </Grid>
 
         <StackPanel
@@ -210,17 +250,56 @@
 
                         <!--  Provider info  -->
                         <TextBlock x:Uid="SettingsPageRealtimeStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <dev:SettingsCard x:Uid="LyricsPageLyricsProviderPrefix">
-                            <HyperlinkButton
-                                Content="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}"
-                                IsEnabled="False"
-                                NavigateUri="{x:Bind ViewModel.OriginalLyricsRef, Mode=OneWay}" />
+                        <dev:SettingsCard ContentAlignment="Left">
+                            <StackPanel Spacing="6">
+                                <Grid ColumnSpacing="12">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        x:Uid="SettingsPagePlaybackSource"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center" />
+                                    <RichTextBlock
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        IsTextSelectionEnabled="True"
+                                        TextWrapping="Wrap">
+                                        <Paragraph>
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentMediaSourceProviderInfo.DisplayName, Mode=OneWay}" />
+                                            <Run Text="(" />
+                                            <Run Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.PlayerId, TargetNullValue=N/A, Mode=OneWay}" />
+                                            <Run Text=")" />
+                                        </Paragraph>
+                                    </RichTextBlock>
+                                </Grid>
+                                <StackPanel Orientation="Horizontal" Spacing="12">
+                                    <TextBlock VerticalAlignment="Center" Text="NCM ID" />
+                                    <TextBlock
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        IsTextSelectionEnabled="True"
+                                        Text="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.SongId, Mode=OneWay, TargetNullValue=N/A}" />
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Spacing="12">
+                                    <TextBlock x:Uid="LyricsPageLyricsProviderPrefix" VerticalAlignment="Center" />
+                                    <TextBlock
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        IsTextSelectionEnabled="True"
+                                        Text="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.ProviderIfFound, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Spacing="12">
+                                    <TextBlock x:Uid="LyricsPageTranslationProviderPrefix" VerticalAlignment="Center" />
+                                    <TextBlock
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        IsTextSelectionEnabled="True"
+                                        Text="{x:Bind ViewModel.MediaSessionsService.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                                </StackPanel>
+                            </StackPanel>
                         </dev:SettingsCard>
-                        <dev:SettingsCard x:Uid="LyricsPageTranslationProviderPrefix">
-                            <HyperlinkButton
-                                Content="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}"
-                                IsEnabled="False"
-                                NavigateUri="{x:Bind ViewModel.TranslatedLyricsRef, Mode=OneWay}" />
+
+                        <dev:SettingsCard x:Uid="SettingsPageForceWordByWordEffect">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsForceWordByWordEffect, Mode=TwoWay}" />
                         </dev:SettingsCard>
 
                         <!--  Lyrics translation  -->
@@ -241,12 +320,7 @@
                                 </dev:SettingsCard>
                                 <dev:SettingsCard x:Uid="SettingsPageTranslationConfig" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
                                     <dev:SettingsCard.Description>
-                                        <HyperlinkButton Margin="0,6,0,0" NavigateUri="https://github.com/LibreTranslate/LibreTranslate">
-                                            <TextBlock
-                                                x:Uid="SettingsPageTranslationInfoLink"
-                                                FontSize="14"
-                                                TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                        <HyperlinkButton Content="https://github.com/LibreTranslate/LibreTranslate" NavigateUri="https://github.com/LibreTranslate/LibreTranslate" />
                                     </dev:SettingsCard.Description>
                                     <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=TwoWay}" />
                                 </dev:SettingsCard>
@@ -320,19 +394,25 @@
                             </dev:SettingsExpander.Items>
                         </dev:SettingsExpander>
 
-                        <!--  LX music server  -->
-                        <TextBlock x:Uid="SettingsPageLXMusicServer" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <dev:SettingsCard x:Uid="SettingsPageServerAddress">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
+                        <!--  amll-ttml-db  -->
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="amll-ttml-db" />
+                        <dev:SettingsCard x:Uid="SettingsPageAmllTtmlDbBaseUrl">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                 <TextBox
-                                    x:Uid="SettingsPageLXMusicServerInput"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}" />
+                                    Grid.Column="0"
+                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.AmllTtmlDbBaseUrl, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
                                 <Button
-                                    x:Uid="SettingsPageServerTestButton"
-                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-                            </StackPanel>
+                                    Grid.Column="1"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE8FB;}"
+                                    Style="{StaticResource GhostButtonStyle}" />
+                            </Grid>
                         </dev:SettingsCard>
 
                         <!--  Apple Music token  -->
@@ -342,20 +422,31 @@
                             Description="Use at your own risk"
                             Foreground="{ThemeResource SystemFillColorCautionBrush}"
                             Header="WARNING">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
+                            <Grid ColumnSpacing="6">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
                                 <TextBox
-                                    MaxWidth="250"
+                                    Grid.Column="0"
                                     PlaceholderText="media-user-token"
                                     Text="{x:Bind ViewModel.AppleMusicMediaUserToken, Mode=TwoWay}"
                                     TextWrapping="Wrap" />
-                                <HyperlinkButton Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE897;}" NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
+                                <HyperlinkButton
+                                    Grid.Column="1"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE897;}"
+                                    NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
                                 <Button
+                                    Grid.Column="2"
                                     Command="{x:Bind ViewModel.SaveAppleMusicMediaUserTokenCommand}"
                                     Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                           FontSize=12,
                                                           Glyph=&#xE8FB;}"
                                     Style="{StaticResource GhostButtonStyle}" />
-                            </StackPanel>
+                            </Grid>
                         </dev:SettingsCard>
 
                     </StackPanel>

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

@@ -1,19 +1,6 @@
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

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

@@ -1,21 +1,11 @@
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.UI.Core;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -99,7 +89,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void CheckButton_Click(object sender, RoutedEventArgs e)
         {
-            bool registered = GlobalHotKeyHelper.IsHotKeyRegistered(Shortcut);
+            bool registered = GlobalHotKeyHook.IsHotKeyRegistered(Shortcut);
             if (registered)
             {
                 DevWinUI.Growl.Success(_resourceService.GetLocalizedString("SettingsPageShortcutRegSuccessInfo"));

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

@@ -3,10 +3,6 @@ using BetterLyrics.WinUI3.Services.ResourceService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolNegationToOpacityConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToOpacityConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/BoolToPartialOpacityConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs

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

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

@@ -1,8 +1,8 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
+using System;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Converter

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

@@ -1,5 +1,5 @@
-using System;
-using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Data;
+using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs

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

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

@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Xaml.Data;
+using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FPSToTimeSpanConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IndexToDisplayConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToBoolConverter.cs

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

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

@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Xaml.Data;
+using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/IntToDoubleConverter.cs

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

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

@@ -1,11 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Converter

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToDisplayedNameConverter.cs

@@ -1,52 +0,0 @@
-using BetterLyrics.WinUI3.Constants;
-using BetterLyrics.WinUI3.Helper;
-using Microsoft.UI.Xaml.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public class MediaSourceProviderToDisplayedNameConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is string provider)
-            {
-                return provider switch
-                {
-                    PlayerID.Spotify => PlayerName.Spotify,
-                    PlayerID.AppleMusic => PlayerName.AppleMusic,
-                    PlayerID.iTunes => PlayerName.iTunes,
-                    PlayerID.KugouMusic => PlayerName.KugouMusic,
-                    PlayerID.NetEaseCloudMusic => PlayerName.NetEaseCloudMusic,
-                    PlayerID.QQMusic => PlayerName.QQMusic,
-                    PlayerID.LXMusic => PlayerName.LXMusic,
-                    PlayerID.LXMusicPortable => PlayerName.LXMusicPortable,
-                    PlayerID.MediaPlayerWindows11 => PlayerName.MediaPlayerWindows11,
-                    PlayerID.AIMP => PlayerName.AIMP,
-                    PlayerID.Foobar2000 => PlayerName.Foobar2000,
-                    PlayerID.MusicBee => PlayerName.MusicBee,
-                    PlayerID.PotPlayer => PlayerName.PotPlayer,
-                    PlayerID.Chrome => PlayerName.Chrome,
-                    PlayerID.Edge => PlayerName.Edge,
-                    PlayerID.BetterLyrics => PlayerName.BetterLyrics,
-                    PlayerID.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
-                    PlayerID.SaltPlayerForWindows => PlayerName.SaltPlayerForWindows,
-                    PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
-                    PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
-                    PlayerID.Listen1 => PlayerName.Listen1,
-                    _ => provider,
-                };
-            }
-            return value?.ToString() ?? "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MediaSourceProviderToLogoUriConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToSecondsConverter.cs

@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public class MillisecondsToSecondsConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is int intValue)
+            {
+                return intValue / 1000.0;
+            }
+            else if (value is double doubleValue)
+            {
+                return doubleValue / 1000.0;
+            }
+            return 0.0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToParentFolderConverter.cs

@@ -1,10 +1,6 @@
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/RectToMarginConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/SecondsToFormattedTimeConverter.cs

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ShortcutToStringConverter.cs

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

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

@@ -1,11 +1,7 @@
 using ATL;
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Extensions;
 using Microsoft.UI.Xaml.Data;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Converter
 {
@@ -15,7 +11,7 @@ namespace BetterLyrics.WinUI3.Converter
         {
             if (value is Track track)
             {
-                return track.GetLyrics();
+                return track.GetRawLyrics();
             }
             return "";
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AlbumArtSearchProvider.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum AlbumArtSearchProvider
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/ChineseRomanization.cs

@@ -1,28 +1,8 @@
-using BetterLyrics.WinUI3.Helper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum ChineseRomanization
     {
         Pinyin,
         Jyutping,
     }
-
-    public static class ChineseRomanizationExtensions
-    {
-        public static string ToPhoneticCode(this ChineseRomanization chineseRomanization)
-        {
-            return chineseRomanization switch
-            {
-                ChineseRomanization.Pinyin => PhoneticHelper.PinyinCode,
-                ChineseRomanization.Jyutping => PhoneticHelper.JyutpingCode,
-                _ => throw new ArgumentOutOfRangeException(nameof(chineseRomanization))
-            };
-        }
-    }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/CommonSongProperty.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum CommonSongProperty
     {

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

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Enums
 {

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

@@ -1,11 +1,5 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace BetterLyrics.WinUI3.Enums
 {
     public enum Language

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

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum LineMaskType
     {

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

@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
 using Microsoft.UI.Text;
+using System;
 using Windows.UI.Text;
 
 namespace BetterLyrics.WinUI3.Enums

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsLayoutOrientation.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum LyricsLayoutOrientation
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PaletteGeneratorType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum PaletteGeneratorType
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/PlaybackOrder.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum PlaybackOrder
     {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/SettingsStoreType.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
+namespace BetterLyrics.WinUI3.Enums
 {
     public enum SettingsStoreType
     {