Merge pull request #72 from jayfunc/dev

v1.0.32.0

.github/workflows/issues-translator.yml

@@ -1,18 +0,0 @@
-name: 'issue-translator'
-on: 
-  issue_comment: 
-    types: [created]
-  issues: 
-    types: [opened]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: usthe/issues-translate-action@v2.7
-        with:
-          IS_MODIFY_TITLE: false
-          # not require, default false, . Decide whether to modify the issue title
-          # if true, the robot account @Issues-translate-bot must have modification permissions, invite @Issues-translate-bot to your project or use your custom bot.
-          CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿
-          # not require. Customize the translation robot prefix message.

.github/workflows/release-to-telegram.yml

@@ -12,7 +12,6 @@ jobs:
         env:
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
           CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
-          THREAD_ID: ${{ secrets.TELEGRAM_THREAD_ID }}
           RELEASE_URL: ${{ github.event.release.html_url }}
           RELEASE_TAG: ${{ github.event.release.tag_name }}
           RELEASE_NAME: ${{ github.event.release.name }}
@@ -24,5 +23,5 @@ jobs:
 
           curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
                -d chat_id="${CHAT_ID}" \
-               -d message_thread_id="${THREAD_ID}" \
-               -d text="${TEXT}"
+               -d text="${TEXT}" \
+               -d parse_mode=Markdown

.gitignore

@@ -406,4 +406,3 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 /BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package)_TemporaryKey.pfx
-/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LastFM.cs

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

@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-		<VisualStudioVersion>15.0</VisualStudioVersion>
-	</PropertyGroup>
-	<ItemGroup Label="ProjectConfigurations">
-		<ProjectConfiguration Include="Debug|x86">
-			<Configuration>Debug</Configuration>
-			<Platform>x86</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Release|x86">
-			<Configuration>Release</Configuration>
-			<Platform>x86</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Debug|x64">
-			<Configuration>Debug</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Release|x64">
-			<Configuration>Release</Configuration>
-			<Platform>x64</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Debug|ARM64">
-			<Configuration>Debug</Configuration>
-			<Platform>ARM64</Platform>
-		</ProjectConfiguration>
-		<ProjectConfiguration Include="Release|ARM64">
-			<Configuration>Release</Configuration>
-			<Platform>ARM64</Platform>
-		</ProjectConfiguration>
-	</ItemGroup>
-	<PropertyGroup>
-		<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-		<PathToXAMLWinRTImplementations>BetterLyrics.WinUI3\</PathToXAMLWinRTImplementations>
-	</PropertyGroup>
-	<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-	<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>
-		<DefaultLanguage>zh-CN</DefaultLanguage>
-		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-		<EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
-		<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-		<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-		<GenerateTestArtifacts>True</GenerateTestArtifacts>
-		<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
-		<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-		<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-		<PackageCertificateKeyFile>BetterLyrics.WinUI3 %28Package%29_TemporaryKey.pfx</PackageCertificateKeyFile>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-		<AppxBundle>Always</AppxBundle>
-		<DefaultLanguage>en-US</DefaultLanguage>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-		<AppxBundle>Always</AppxBundle>
-		<DefaultLanguage>en-US</DefaultLanguage>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-		<AppxBundle>Always</AppxBundle>
-		<DefaultLanguage>en-US</DefaultLanguage>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-		<AppxBundle>Always</AppxBundle>
-		<DefaultLanguage>en-US</DefaultLanguage>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-		<AppxBundle>Always</AppxBundle>
-		<DefaultLanguage>en-US</DefaultLanguage>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-		<AppxBundle>Always</AppxBundle>
-		<DefaultLanguage>en-US</DefaultLanguage>
-	</PropertyGroup>
-	<ItemGroup>
-		<AppxManifest Include="Package.appxmanifest">
-			<SubType>Designer</SubType>
-		</AppxManifest>
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="BetterLyrics.WinUI3 %28Package%29_TemporaryKey.pfx" />
-		<Content Include="Images\LargeTile.scale-100.png" />
-		<Content Include="Images\LargeTile.scale-125.png" />
-		<Content Include="Images\LargeTile.scale-150.png" />
-		<Content Include="Images\LargeTile.scale-200.png" />
-		<Content Include="Images\LargeTile.scale-400.png" />
-		<Content Include="Images\SmallTile.scale-100.png" />
-		<Content Include="Images\SmallTile.scale-125.png" />
-		<Content Include="Images\SmallTile.scale-150.png" />
-		<Content Include="Images\SmallTile.scale-200.png" />
-		<Content Include="Images\SmallTile.scale-400.png" />
-		<Content Include="Images\SplashScreen.scale-100.png" />
-		<Content Include="Images\SplashScreen.scale-125.png" />
-		<Content Include="Images\SplashScreen.scale-150.png" />
-		<Content Include="Images\SplashScreen.scale-200.png" />
-		<Content Include="Images\LockScreenLogo.scale-200.png" />
-		<Content Include="Images\SplashScreen.scale-400.png" />
-		<Content Include="Images\Square150x150Logo.scale-100.png" />
-		<Content Include="Images\Square150x150Logo.scale-125.png" />
-		<Content Include="Images\Square150x150Logo.scale-150.png" />
-		<Content Include="Images\Square150x150Logo.scale-200.png" />
-		<Content Include="Images\Square150x150Logo.scale-400.png" />
-		<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-		<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
-		<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-		<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
-		<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-		<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-		<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-		<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
-		<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-		<Content Include="Images\Square44x44Logo.scale-100.png" />
-		<Content Include="Images\Square44x44Logo.scale-125.png" />
-		<Content Include="Images\Square44x44Logo.scale-150.png" />
-		<Content Include="Images\Square44x44Logo.scale-200.png" />
-		<Content Include="Images\Square44x44Logo.scale-400.png" />
-		<Content Include="Images\Square44x44Logo.targetsize-16.png" />
-		<Content Include="Images\Square44x44Logo.targetsize-24.png" />
-		<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-		<Content Include="Images\Square44x44Logo.targetsize-256.png" />
-		<Content Include="Images\Square44x44Logo.targetsize-32.png" />
-		<Content Include="Images\Square44x44Logo.targetsize-48.png" />
-		<Content Include="Images\StoreLogo.scale-100.png" />
-		<Content Include="Images\StoreLogo.scale-125.png" />
-		<Content Include="Images\StoreLogo.scale-150.png" />
-		<Content Include="Images\StoreLogo.scale-200.png" />
-		<Content Include="Images\StoreLogo.scale-400.png" />
-		<Content Include="Images\Wide310x150Logo.scale-100.png" />
-		<Content Include="Images\Wide310x150Logo.scale-125.png" />
-		<Content Include="Images\Wide310x150Logo.scale-150.png" />
-		<Content Include="Images\Wide310x150Logo.scale-200.png" />
-		<Content Include="Images\Wide310x150Logo.scale-400.png" />
-		<None Include="Package.StoreAssociation.xml" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj">
-			    <EnableMsixTooling>true</EnableMsixTooling>
-<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-			<PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
-		</ProjectReference>
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
-	</ItemGroup>
-	<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <PathToXAMLWinRTImplementations>BetterLyrics.WinUI3\</PathToXAMLWinRTImplementations>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <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>
+    <DefaultLanguage>zh-CN</DefaultLanguage>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
+    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <PackageCertificateKeyFile>BetterLyrics.WinUI3 %28Package%29_TemporaryKey.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="BetterLyrics.WinUI3 %28Package%29_TemporaryKey.pfx" />
+    <Content Include="Images\LargeTile.scale-100.png" />
+    <Content Include="Images\LargeTile.scale-125.png" />
+    <Content Include="Images\LargeTile.scale-150.png" />
+    <Content Include="Images\LargeTile.scale-200.png" />
+    <Content Include="Images\LargeTile.scale-400.png" />
+    <Content Include="Images\SmallTile.scale-100.png" />
+    <Content Include="Images\SmallTile.scale-125.png" />
+    <Content Include="Images\SmallTile.scale-150.png" />
+    <Content Include="Images\SmallTile.scale-200.png" />
+    <Content Include="Images\SmallTile.scale-400.png" />
+    <Content Include="Images\SplashScreen.scale-100.png" />
+    <Content Include="Images\SplashScreen.scale-125.png" />
+    <Content Include="Images\SplashScreen.scale-150.png" />
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\SplashScreen.scale-400.png" />
+    <Content Include="Images\Square150x150Logo.scale-100.png" />
+    <Content Include="Images\Square150x150Logo.scale-125.png" />
+    <Content Include="Images\Square150x150Logo.scale-150.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.scale-100.png" />
+    <Content Include="Images\Square44x44Logo.scale-125.png" />
+    <Content Include="Images\Square44x44Logo.scale-150.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
+    <Content Include="Images\StoreLogo.scale-100.png" />
+    <Content Include="Images\StoreLogo.scale-125.png" />
+    <Content Include="Images\StoreLogo.scale-150.png" />
+    <Content Include="Images\StoreLogo.scale-200.png" />
+    <Content Include="Images\StoreLogo.scale-400.png" />
+    <Content Include="Images\Wide310x150Logo.scale-100.png" />
+    <Content Include="Images\Wide310x150Logo.scale-125.png" />
+    <Content Include="Images\Wide310x150Logo.scale-150.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <Content Include="Images\Wide310x150Logo.scale-400.png" />
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\BetterLyrics.WinUI3\BetterLyrics.WinUI3.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+  </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.55.0" />
+	  Version="1.0.32.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -10,10 +10,10 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!--  Merged dictionaries here  -->
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsExpander/SettingsExpander.xaml" />
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
+                <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
 
             <!--  Theme  -->
@@ -51,11 +51,6 @@
             <converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
             <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
-            <converter:MediaSourceProviderToLogoUriConverter x:Key="MediaSourceProviderToLogoUriConverter" />
-            <converter:MediaSourceProviderToDisplayedNameConverter x:Key="MediaSourceProviderToDisplayedNameConverter" />
-            <converter:FPSToTimeSpanConverter x:Key="FPSToTimeSpanConverter" />
-            <converter:ShortcutToStringConverter x:Key="ShortcutToStringConverter" />
-
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
             <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
@@ -86,10 +81,7 @@
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
-            <Style
-                x:Key="TitleBarToggleButtonStyle"
-                BasedOn="{StaticResource ToggleButtonRevealStyle}"
-                TargetType="ToggleButton">
+            <Style x:Key="TitleBarToggleButtonStyle" TargetType="ToggleButton">
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
@@ -300,29 +292,6 @@
                 <Setter Property="Padding" Value="0" />
             </Style>
 
-            <Style
-                x:Key="SettingsScrollViewerStyle"
-                BasedOn="{StaticResource DefaultScrollViewerStyle}"
-                TargetType="ScrollViewer">
-                <Setter Property="Padding" Value="36,0" />
-            </Style>
-
-            <Style x:Key="SettingsGridStyle" TargetType="Grid">
-                <Setter Property="Padding" Value="0,0,0,36" />
-            </Style>
-
-            <Style
-                x:Key="FlyoutPageStyle"
-                BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
-                TargetType="FlyoutPresenter">
-                <Setter Property="Opacity" Value="0.9" />
-                <Setter Property="MinWidth" Value="850" />
-                <Setter Property="Padding" Value="0" />
-                <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
-                <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
-                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-            </Style>
-
             <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="TextFillColorPrimaryBrush" />
@@ -333,5 +302,4 @@
             <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

@@ -3,16 +3,7 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services;
-using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
-using BetterLyrics.WinUI3.Services.LastFMService;
-using BetterLyrics.WinUI3.Services.LibWatcherService;
-using BetterLyrics.WinUI3.Services.LiveStatesService;
-using BetterLyrics.WinUI3.Services.LyricsSearchService;
-using BetterLyrics.WinUI3.Services.MediaSessionsService;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.Services.TranslateService;
 using BetterLyrics.WinUI3.ViewModels;
-using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
@@ -73,7 +64,7 @@ namespace BetterLyrics.WinUI3
         private void EnsureSingleInstance()
         {
             bool createdNew;
-            _instanceMutex = new Mutex(true, Constants.App.AppName, out createdNew);
+            _instanceMutex = new Mutex(true, MetadataHelper.AppName, out createdNew);
 
             if (!createdNew)
             {
@@ -85,6 +76,13 @@ namespace BetterLyrics.WinUI3
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
             WindowHelper.OpenWindow<LyricsWindow>();
+
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                lyricsWindow.ViewModel.InitLockHotKey();
+                lyricsWindow.AutoSelectLyricsMode();
+            }
         }
 
         private static void ConfigureServices()
@@ -103,21 +101,13 @@ namespace BetterLyrics.WinUI3
                         loggingBuilder.AddSerilog();
                     })
                     // Services
-                    .AddSingleton<ILiveStatesService, LiveStatesService>()
                     .AddSingleton<ISettingsService, SettingsService>()
-                    .AddSingleton<IMediaSessionsService, MediaSessionsService>()
+                    .AddSingleton<IPlaybackService, PlaybackService>()
                     .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
                     .AddSingleton<ILyricsSearchService, LyricsSearchService>()
                     .AddSingleton<ILibWatcherService, LibWatcherService>()
                     .AddSingleton<ITranslateService, TranslateService>()
-                    .AddSingleton<ILastFMService, LastFMService>()
                     // ViewModels
-                    .AddSingleton<AppSettingsControlViewModel>()
-                    .AddSingleton<LyricsBackgroundSettingsControlViewModel>()
-                    .AddSingleton<AlbumArtLayoutSettingsControlViewModel>()
-                    .AddSingleton<PlaybackSettingsControlViewModel>()
-                    .AddSingleton<MediaSettingsControlViewModel>()
-                    .AddSingleton<AllLyricsSettingsControlViewModel>()
                     .AddSingleton<LyricsWindowViewModel>()
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()

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

@@ -20,17 +20,8 @@
 		<PRIResource Remove="ViewModels\Lyrics\**" />
 	</ItemGroup>
 	<ItemGroup>
+		<None Remove="Assets\Core14.profile.xml" />
 		<None Remove="Assets\Segoe Fluent Icons.ttf" />
-		<None Remove="Assets\Wiki82.profile.xml" />
-		<None Remove="Controls\AlbumArtLayoutSettingsControl.xaml" />
-		<None Remove="Controls\AllLyricsSettingsControl.xaml" />
-		<None Remove="Controls\AppSettingsControl.xaml" />
-		<None Remove="Controls\ExtendedSlider.xaml" />
-		<None Remove="Controls\LyricsBavkgroundSettingsControl.xaml" />
-		<None Remove="Controls\LyricsSettingsControl.xaml" />
-		<None Remove="Controls\MediaSettingsControl.xaml" />
-		<None Remove="Controls\PlaybackSettingsControl.xaml" />
-		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
@@ -44,7 +35,6 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="3v.EvtSource" Version="2.0.0" />
-		<PackageReference Include="ColorThief.ImageSharp" Version="1.0.0" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
@@ -62,20 +52,20 @@
 		<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.8" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.8" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
-		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.3-dev-02320" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="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.11" />
-		<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
-		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.8" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.7" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
 		<PackageReference Include="TinyPinyin.Net" Version="1.0.2" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
@@ -87,11 +77,6 @@
 		<PackageReference Include="WinUIEx" Version="2.6.0" />
 		<PackageReference Include="z440.atl.core" Version="7.2.0" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Reference Include="Hqub.Lastfm">
-	    <HintPath>..\..\..\Last.fm\src\Hqub.Lastfm\bin\Release\netstandard2.0\Hqub.Lastfm.dll</HintPath>
-	  </Reference>
-	</ItemGroup>
 	<ItemGroup>
 		<Page Update="Rendering\InAppLyricsRenderer.xaml">
 			<Generator>MSBuild:Compile</Generator>
@@ -107,129 +92,9 @@
 		<TrimmerRootAssembly Include="TagLibSharp" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Content Update="Assets\AIMP.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\Discord.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Edge.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\EmptyBox.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\EmptyState.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\foobar2000.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\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\MusicBee.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\NetEaseCloudMusic.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\PotPlayer.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\QQ.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\Segoe Fluent Icons.ttf">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Spotify.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Telegram.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	  <Content Update="Assets\Wiki82.profile.xml">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\ShortcutTextBox.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\ExtendedSlider.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\AllLyricsSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\LyricsSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\MediaSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\PlaybackSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\AlbumArtLayoutSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\LyricsBavkgroundSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Controls\AppSettingsControl.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
 	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Views\MusicGalleryWindow.xaml">

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

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-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";
-    }
-}

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

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class App
-    {
-        public const string AppAuthor = "Zhe Fang";
-        public const string AppName = "BetterLyrics";
-
-        public const string AutoStartupTaskId = "AutoStartup";
-    }
-}

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

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class LXMusic
-    {
-        public const string QuerySuffix = "/subscribe-player-status?filter=progress,duration";
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/LastFMTemplate

@@ -1,10 +0,0 @@
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class LastFM
-    {
-        public const string ApiKey = "Your api key here";
-        public const string SharedSecret = "Your shared secret here";
-        public const string UnAuthUrl = "https://www.last.fm/settings/applications";
-        public const string SessionKeyCredentialKey = "LastFMSessionKey";
-    }
-}

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

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class Link
-    {
-        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 const string TelegramUrl = "https://t.me/+svhSLZ7awPsxNGY1";
-    }
-}

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

@@ -1,29 +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 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 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";
-    }
-}

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

@@ -1,28 +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 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 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)";
-    }
-}

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

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class Time
-    {
-        public static readonly TimeSpan DebounceTimeout = TimeSpan.FromMilliseconds(300);
-    }
-}

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

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Constants
-{
-    public static class iTunes
-    {
-        public const string QueryPrefix = "https://itunes.apple.com/search?";
-    }
-}

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

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.AlbumArtLayoutSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-            <Grid Style="{StaticResource SettingsGridStyle}">
-                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <TextBlock x:Uid="SettingsPageAlbumArt" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
-                        <local:ExtendedSlider
-                            Default="12"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
-                        <local:ExtendedSlider
-                            Default="12"
-                            Frequency="1"
-                            Maximum="64"
-                            Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <TextBlock x:Uid="SettingsPageSongInfo" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageSongInfoAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageSongInfoLeft" />
-                            <ComboBoxItem x:Uid="SettingsPageSongInfoCenter" />
-                            <ComboBoxItem x:Uid="SettingsPageSongInfoRight" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-
-    </Grid>
-</UserControl>

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

@@ -1,32 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class AlbumArtLayoutSettingsControl : UserControl
-    {
-        public AlbumArtLayoutSettingsControlViewModel ViewModel => (AlbumArtLayoutSettingsControlViewModel)DataContext;
-        public AlbumArtLayoutSettingsControl()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<AlbumArtLayoutSettingsControlViewModel>();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AllLyricsSettingsControl.xaml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.AllLyricsSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
-    mc:Ignorable="d">
-
-    <Grid>
-        <controls:SwitchPresenter Margin="0,72,0,0" Value="{Binding SelectedItem.Tag, ElementName=LyricsSettingsSegmentedControl}">
-            <controls:Case Value="Standard">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.StandardLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.StandardLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-            <controls:Case Value="Desktop">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.DesktopLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.DesktopLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-            <controls:Case Value="Dock">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.DockLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.DockLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-            <controls:Case Value="PictureInPicture">
-                <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.AppSettings.PictureInPictureLyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.AppSettings.PictureInPictureLyricsStyleSettings, Mode=OneWay}" />
-            </controls:Case>
-        </controls:SwitchPresenter>
-        <controls:Segmented
-            x:Name="LyricsSettingsSegmentedControl"
-            Margin="36,36,36,0"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Top"
-            SelectedIndex="{x:Bind ViewModel.SelectedTabIndex, Mode=OneWay}">
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlStandard" Tag="Standard" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlDock" Tag="Dock" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlDesktop" Tag="Desktop" />
-            <controls:SegmentedItem x:Uid="AllLyricsSettingsControlPictureInPicture" Tag="PictureInPicture" />
-        </controls:Segmented>
-    </Grid>
-</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AllLyricsSettingsControl.xaml.cs

@@ -1,32 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class AllLyricsSettingsControl : UserControl
-    {
-        public AllLyricsSettingsControlViewModel ViewModel => (AllLyricsSettingsControlViewModel)DataContext;
-        public AllLyricsSettingsControl()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<AllLyricsSettingsControlViewModel>();
-        }
-    }
-}

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

@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.AppSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-            <Grid Style="{StaticResource SettingsGridStyle}">
-                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <!--  App appearance  -->
-
-                    <TextBlock x:Uid="SettingsPageAppAppearance" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPageLanguage"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xF2B7;}"
-                        IsExpanded="True">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.Language, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageSystemLanguage" />
-                            <ComboBoxItem x:Uid="SettingsPageEN" />
-                            <ComboBoxItem x:Uid="SettingsPageSC" />
-                            <ComboBoxItem x:Uid="SettingsPageTC" />
-                            <ComboBoxItem x:Uid="SettingsPageJA" />
-                            <ComboBoxItem x:Uid="SettingsPageKO" />
-                        </ComboBox>
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard>
-                                <Button x:Uid="SettingsPageRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
-                            </controls:SettingsCard>
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
-
-                    <!--  App behavior  -->
-
-                    <TextBlock x:Uid="SettingsPageAppBehavior" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageAutoStart" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF71C;}">
-                        <ToggleSwitch
-                            x:Name="AutoStartupToggleSwitch"
-                            Loaded="AutoStartupToggleSwitch_Loaded"
-                            Unloaded="AutoStartupToggleSwitch_Unloaded" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageAutoStartWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE736;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.AutoStartWindowType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageAutoStartInAppLyrics" />
-                            <ComboBoxItem x:Uid="SettingsPageAutoStartDockLyrics" />
-                            <ComboBoxItem x:Uid="SettingsPageAutoStartDesktopLyrics" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageIgnoreFullscreenWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE967;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreFullscreenWindow, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.HideWindowWhenNotPlaying, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageGlobalDrag" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C2;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IsDragEverywhereEnabled, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageExitOnLyricsWindowClosed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E8;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ExitOnLyricsWindowClosed, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <!--  Standard mode  -->
-
-                    <TextBlock x:Uid="SettingsPageAppStandard" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.StandardModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                            <ComboBoxItem x:Uid="MainPageSplitView" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <!--  Desktop mode  -->
-
-                    <TextBlock x:Uid="SettingsPageAppDesktop" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageToggleHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.DesktopModeSettings.ToggleShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DesktopModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                            <ComboBoxItem x:Uid="MainPageSplitView" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageAutoLock" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE755;}">
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.DesktopModeSettings.AutoLockOnDesktopMode, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLockHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.DesktopModeSettings.LockShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <!--  Dock mode  -->
-
-                    <TextBlock x:Uid="SettingsPageAppDock" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageToggleHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.DockModeSettings.ToggleShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DockModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                            <ComboBoxItem x:Uid="MainPageSplitView" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageDockMonitor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7F4;}">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <ComboBox ItemsSource="{x:Bind ViewModel.MonitorDeviceNames, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.AppSettings.DockModeSettings.DockMonitorDeviceName, Mode=TwoWay}" />
-                            <Button
-                                Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
-                                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                      FontSize=12,
-                                                      Glyph=&#xE72C;}"
-                                Style="{StaticResource GhostButtonStyle}" />
-                        </StackPanel>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageDockWindowHeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED5E;}">
-                        <local:ExtendedSlider
-                            Default="64"
-                            Frequency="1"
-                            Maximum="200"
-                            Minimum="64"
-                            Unit="px"
-                            Value="{x:Bind ViewModel.AppSettings.DockModeSettings.DockWindowHeight, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageDockPlacement" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.DockModeSettings.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
-                            <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <!--  Picture in picture mode  -->
-
-                    <TextBlock x:Uid="SettingsPageAppPictureInPicture" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageToggleHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.PictureInPictureModeSettings.ToggleShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageDisplayTypeSwitcher" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF246;}">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.PictureInPictureModeSettings.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
-                            <ComboBoxItem x:Uid="MainPageLyriscOnly" />
-                            <ComboBoxItem x:Uid="MainPageSplitView" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <!--  Playback shortcut  -->
-
-                    <TextBlock x:Uid="SettingsPagePlaybackShortcut" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPagePlayOrPauseSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PlayOrPauseShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageNextSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.NextSongShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPagePreviousSongHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
-                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.PreviousSongShortcut, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</UserControl>

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

@@ -1,50 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class AppSettingsControl : UserControl
-    {
-        public AppSettingsControlViewModel ViewModel => (AppSettingsControlViewModel)DataContext;
-
-        public AppSettingsControl()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<AppSettingsControlViewModel>();
-        }
-
-        private async void AutoStartupToggleSwitch_Loaded(object sender, RoutedEventArgs e)
-        {
-            AutoStartupToggleSwitch.IsOn = await ViewModel.DetectIsAutoStartupEnabledAsync();
-            AutoStartupToggleSwitch.Toggled += AutoStartupToggleSwitch_Toggled;
-        }
-
-        private void AutoStartupToggleSwitch_Toggled(object sender, RoutedEventArgs e)
-        {
-            ViewModel.ToggleAutoStartupAsync(AutoStartupToggleSwitch.IsOn);
-        }
-
-        private void AutoStartupToggleSwitch_Unloaded(object sender, RoutedEventArgs e)
-        {
-            AutoStartupToggleSwitch.Toggled -= AutoStartupToggleSwitch_Toggled;
-        }
-    }
-}

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

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.ExtendedSlider"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <StackPanel Orientation="Horizontal">
-        <TextBlock
-            Margin="6,0,2,0"
-            VerticalAlignment="Center"
-            Text="{x:Bind Value, Mode=OneWay}" />
-        <TextBlock
-            Margin="0,0,14,0"
-            VerticalAlignment="Center"
-            Text="{x:Bind Unit, Mode=OneWay}" />
-        <Slider
-            Maximum="{x:Bind Maximum, Mode=OneWay}"
-            Minimum="{x:Bind Minimum, Mode=OneWay}"
-            SnapsTo="Ticks"
-            StepFrequency="{x:Bind Frequency, Mode=OneWay}"
-            TickFrequency="{x:Bind Frequency, Mode=OneWay}"
-            TickPlacement="Outside"
-            Value="{x:Bind Value, Mode=TwoWay}" />
-        <Button
-            Margin="3,0,0,0"
-            VerticalAlignment="Center"
-            Click="ResetButton_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  FontSize=12,
-                                  Glyph=&#xE777;}"
-            Style="{StaticResource GhostButtonStyle}"
-            Visibility="{x:Bind ResetButtonVisibility, Mode=OneWay}" />
-        <Button
-            x:Name="SubtractButton"
-            Margin="3,0,0,0"
-            VerticalAlignment="Center"
-            Click="SubtractButton_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  FontSize=12,
-                                  Glyph=&#xE738;}"
-            Style="{StaticResource GhostButtonStyle}" />
-        <Button
-            x:Name="AddButton"
-            Margin="3,0,0,0"
-            VerticalAlignment="Center"
-            Click="AddButton_Click"
-            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                  FontSize=12,
-                                  Glyph=&#xE710;}"
-            Style="{StaticResource GhostButtonStyle}" />
-    </StackPanel>
-</UserControl>

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

@@ -1,129 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class ExtendedSlider : UserControl
-    {
-        public ExtendedSlider()
-        {
-            InitializeComponent();
-        }
-
-        private void Subtract()
-        {
-            if (Value - Frequency < Minimum)
-            {
-                Value = Minimum;
-            }
-            else
-            {
-                Value -= Frequency;
-            }
-        }
-
-        private void Add()
-        {
-            if (Value + Frequency > Maximum)
-            {
-                Value = Maximum;
-            }
-            else
-            {
-                Value += Frequency;
-            }
-        }
-
-        private void SubtractTimer_Tick(object? sender, object e)
-        {
-            Subtract();
-        }
-
-        private void AddTimer_Tick(object? sender, object e)
-        {
-            Add();
-        }
-
-        public static readonly DependencyProperty FrequencyProperty =
-            DependencyProperty.Register(nameof(Frequency), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
-        public static readonly DependencyProperty MinimumProperty =
-            DependencyProperty.Register(nameof(Minimum), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
-        public static readonly DependencyProperty MaximumProperty =
-            DependencyProperty.Register(nameof(Maximum), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
-        public static readonly DependencyProperty ValueProperty =
-            DependencyProperty.Register(nameof(Value), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
-        public static readonly DependencyProperty DefaultProperty =
-            DependencyProperty.Register(nameof(Default), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
-        public static readonly DependencyProperty ResetButtonVisibilityProperty =
-            DependencyProperty.Register(nameof(ResetButtonVisibility), typeof(Visibility), typeof(ExtendedSlider), new PropertyMetadata(Visibility.Visible));
-        public static readonly DependencyProperty UnitProperty =
-            DependencyProperty.Register(nameof(Unit), typeof(string), typeof(ExtendedSlider), new PropertyMetadata(""));
-
-        public double Frequency
-        {
-            get => (double)GetValue(FrequencyProperty);
-            set => SetValue(FrequencyProperty, value);
-        }
-        public double Minimum
-        {
-            get => (double)GetValue(MinimumProperty);
-            set => SetValue(MinimumProperty, value);
-        }
-        public double Maximum
-        {
-            get => (double)GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
-        }
-        public double Value
-        {
-            get => (double)GetValue(ValueProperty);
-            set => SetValue(ValueProperty, value);
-        }
-        public double Default
-        {
-            get => (double)GetValue(DefaultProperty);
-            set => SetValue(DefaultProperty, value);
-        }
-        public Visibility ResetButtonVisibility
-        {
-            get => (Visibility)GetValue(ResetButtonVisibilityProperty);
-            set => SetValue(ResetButtonVisibilityProperty, value);
-        }
-        public string Unit
-        {
-            get => (string)GetValue(UnitProperty);
-            set => SetValue(UnitProperty, value);
-        }
-
-        private void ResetButton_Click(object sender, RoutedEventArgs e)
-        {
-            Value = Default;
-        }
-
-        private void SubtractButton_Click(object sender, RoutedEventArgs e)
-        {
-            Subtract();
-        }
-
-        private void AddButton_Click(object sender, RoutedEventArgs e)
-        {
-            Add();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBavkgroundSettingsControl.xaml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.LyricsBavkgroundSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-            <Grid Style="{StaticResource SettingsGridStyle}">
-                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageTheme" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE790;}">
-                        <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.LyricsBackgroundTheme, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageFollowSystem" />
-                            <ComboBoxItem x:Uid="SettingsPageLight" />
-                            <ComboBoxItem x:Uid="SettingsPageDark" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsPureColorBgOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <uc:ExtendedSlider
-                            Default="100"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.PureColorOverlayOpacity, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBackgroundOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <uc:ExtendedSlider
-                            Default="100"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverOverlayOpacity, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBackgroundSpeed" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC49;}">
-                        <uc:ExtendedSlider
-                            Default="50"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverOverlaySpeed, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBackgroundBlurAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
-                        <uc:ExtendedSlider
-                            Default="100"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE80A;}">
-                        <uc:ExtendedSlider
-                            Default="0"
-                            Frequency="1"
-                            Maximum="10"
-                            Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.LyricsBackgroundSettings.CoverAcrylicEffectAmount, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBavkgroundSettingsControl.xaml.cs

@@ -1,33 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class LyricsBavkgroundSettingsControl : UserControl
-    {
-        public LyricsBackgroundSettingsControlViewModel ViewModel => (LyricsBackgroundSettingsControlViewModel)DataContext;
-
-        public LyricsBavkgroundSettingsControl()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<LyricsBackgroundSettingsControlViewModel>();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSettingsControl.xaml

@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.LyricsSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-            <Grid Style="{StaticResource SettingsGridStyle}">
-                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <!--  Lyrics style  -->
-
-                    <TextBlock x:Uid="SettingsPageLyricsStyle" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
-                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsLeft" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsCenter" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsRight" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
-                        <ComboBox ItemsSource="{x:Bind SystemFontNames, Mode=OneWay}" SelectedItem="{x:Bind LyricsStyleSettings.LyricsFontFamily, Mode=TwoWay}">
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontWeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8DD;}">
-                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsFontWeight, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsThin" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsExtraLight" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsLight" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsSemiLight" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsNormal" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsMedium" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsSemiBold" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsBold" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsExtraBold" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsBlack" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsExtraBlack" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBgFontOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <local:ExtendedSlider
-                            Default="30"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind LyricsStyleSettings.LyricsBgFontOpacity, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontStrokeWidth" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC12;}">
-                        <local:ExtendedSlider
-                            Default="0"
-                            Frequency="1"
-                            Maximum="5"
-                            Minimum="0"
-                            Value="{x:Bind LyricsStyleSettings.LyricsFontStrokeWidth, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsStrokeFontColor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D3;}">
-                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsStrokeFontColorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveColored" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveGrayed" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorCustom" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <ColorPicker
-                        ColorSpectrumShape="Box"
-                        IsAlphaEnabled="True"
-                        IsAlphaSliderVisible="True"
-                        IsAlphaTextInputVisible="True"
-                        IsColorChannelTextInputVisible="True"
-                        IsColorSliderVisible="True"
-                        IsHexInputVisible="True"
-                        IsMoreButtonVisible="True"
-                        Color="{x:Bind LyricsStyleSettings.LyricsCustomStrokeFontColor, Mode=TwoWay}">
-                        <interactivity:Interaction.Behaviors>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind LyricsStyleSettings.LyricsStrokeFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
-                                ComparisonCondition="Equal"
-                                Value="2">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                            </interactivity:DataTriggerBehavior>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind LyricsStyleSettings.LyricsStrokeFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
-                                ComparisonCondition="NotEqual"
-                                Value="2">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                            </interactivity:DataTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </ColorPicker>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBgFontColor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D3;}">
-                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsBgFontColorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveColored" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveGrayed" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorCustom" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <ColorPicker
-                        ColorSpectrumShape="Box"
-                        IsAlphaEnabled="True"
-                        IsAlphaSliderVisible="True"
-                        IsAlphaTextInputVisible="True"
-                        IsColorChannelTextInputVisible="True"
-                        IsColorSliderVisible="True"
-                        IsHexInputVisible="True"
-                        IsMoreButtonVisible="True"
-                        Color="{x:Bind LyricsStyleSettings.LyricsCustomBgFontColor, Mode=TwoWay}">
-                        <interactivity:Interaction.Behaviors>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind LyricsStyleSettings.LyricsBgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
-                                ComparisonCondition="Equal"
-                                Value="2">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                            </interactivity:DataTriggerBehavior>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind LyricsStyleSettings.LyricsBgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
-                                ComparisonCondition="NotEqual"
-                                Value="2">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                            </interactivity:DataTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </ColorPicker>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsFgFontColor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D3;}">
-                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsFgFontColorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveColored" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveGrayed" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsFontColorCustom" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <ColorPicker
-                        ColorSpectrumShape="Box"
-                        IsAlphaEnabled="True"
-                        IsAlphaSliderVisible="True"
-                        IsAlphaTextInputVisible="True"
-                        IsColorChannelTextInputVisible="True"
-                        IsColorSliderVisible="True"
-                        IsHexInputVisible="True"
-                        IsMoreButtonVisible="True"
-                        Color="{x:Bind LyricsStyleSettings.LyricsCustomFgFontColor, Mode=TwoWay}">
-                        <interactivity:Interaction.Behaviors>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind LyricsStyleSettings.LyricsFgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
-                                ComparisonCondition="Equal"
-                                Value="2">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                            </interactivity:DataTriggerBehavior>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind LyricsStyleSettings.LyricsFgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
-                                ComparisonCondition="NotEqual"
-                                Value="2">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                            </interactivity:DataTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </ColorPicker>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
-                        <local:ExtendedSlider
-                            Frequency="2"
-                            Maximum="96"
-                            Minimum="12"
-                            ResetButtonVisibility="Collapsed"
-                            Value="{x:Bind LyricsStyleSettings.LyricsFontSize, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsLineSpacingFactorSlider"
-                            Default="0.5"
-                            Frequency="0.1"
-                            Maximum="2"
-                            Minimum="0"
-                            Unit="x"
-                            Value="{x:Bind LyricsStyleSettings.LyricsLineSpacingFactor, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsTranslationSeparator" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF464;}">
-                        <StackPanel Orientation="Horizontal" Spacing="6">
-                            <TextBox AcceptsReturn="True" Text="{x:Bind LyricsStyleSettings.LyricsTranslationSeparator, Mode=TwoWay}" />
-                            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
-                        </StackPanel>
-                    </controls:SettingsCard>
-
-                    <!--  Effect  -->
-
-                    <TextBlock
-                        x:Uid="SettingsPageLyricsEffect"
-                        Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
-                        Text="Effect" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsVerticalEdgeOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsVerticalEdgeOpacitySlider"
-                            Default="0"
-                            Frequency="1"
-                            Maximum="100"
-                            Minimum="0"
-                            Unit="%"
-                            Value="{x:Bind LyricsEffectSettings.LyricsVerticalEdgeOpacity, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsBlurAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
-                        <local:ExtendedSlider
-                            x:Uid="SettingsPageLyricsBlurAmountExtendedSlider"
-                            Default="5"
-                            Frequency="1"
-                            Maximum="10"
-                            Minimum="0"
-                            Value="{x:Bind LyricsEffectSettings.LyricsBlurAmount, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsLineFade" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED3A;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsLineFadeEnabled, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <!--  高亮  -->
-                    <controls:SettingsCard x:Uid="SettingsPageLyricsHighlightScope" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E6;}">
-                        <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsHighlightScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
-                            <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
-                        </ComboBox>
-                    </controls:SettingsCard>
-
-                    <!--  阴影  -->
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPageLyricsShadow"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xF5EF;}"
-                        IsExpanded="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=TwoWay}" />
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
-                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsShadowScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Default="8"
-                                    Frequency="1"
-                                    Maximum="20"
-                                    Minimum="1"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsShadowAmount, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
-
-                    <!--  辉光效果  -->
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPageLyricsGlowEffect"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE9A9;}"
-                        IsExpanded="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
-                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
-                                </ComboBox>
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Default="8"
-                                    Frequency="1"
-                                    Maximum="20"
-                                    Minimum="1"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectAmount, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
-
-                    <!--  浮动动画  -->
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPageLyricsFloatAnimation"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE8C5;}"
-                        IsExpanded="True">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
-                                <local:ExtendedSlider
-                                    Default="1"
-                                    Frequency="1"
-                                    Maximum="4"
-                                    Minimum="1"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsFloatAmount, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
-
-                    <!--  扇形歌词  -->
-                    <controls:SettingsCard x:Uid="SettingsPageFan" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEBC5;}">
-                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsFanLyricsEnabled, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPageScrollEasing"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xECE7;}"
-                        IsExpanded="True">
-                        <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsScrollEasingType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeLinear" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeSmoothStep" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutSine" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuad" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutCubic" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuart" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuint" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutExpo" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutCirc" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutBack" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutElastic" />
-                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutBounce" />
-                        </ComboBox>
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="SettingsPageScrollTopDuration">
-                                <local:ExtendedSlider
-                                    x:Uid="SettingsPageLyricsScrollTopDurationExtendedSlider"
-                                    Default="500"
-                                    Frequency="50"
-                                    Maximum="1000"
-                                    Minimum="50"
-                                    Unit="ms"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollTopDuration, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="SettingsPageScrollDuration">
-                                <local:ExtendedSlider
-                                    x:Uid="SettingsPageLyricsScrollDurationExtendedSlider"
-                                    Default="500"
-                                    Frequency="50"
-                                    Maximum="1000"
-                                    Minimum="50"
-                                    Unit="ms"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollDuration, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                            <controls:SettingsCard x:Uid="SettingsPageScrollBottomDuration">
-                                <local:ExtendedSlider
-                                    x:Uid="SettingsPageLyricsScrollBottomDurationExtendedSlider"
-                                    Default="500"
-                                    Frequency="50"
-                                    Maximum="1000"
-                                    Minimum="50"
-                                    Unit="ms"
-                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollBottomDuration, Mode=TwoWay}" />
-                            </controls:SettingsCard>
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
-
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSettingsControl.xaml.cs

@@ -1,53 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class LyricsSettingsControl : UserControl
-    {
-        public ObservableCollection<string> SystemFontNames { get; set; } = [.. FontHelper.SystemFontFamilies];
-
-        public LyricsSettingsControl()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty LyricsStyleSettingsProperty =
-            DependencyProperty.Register(nameof(LyricsStyleSettings), typeof(LyricsStyleSettings), typeof(LyricsSettingsControl), new PropertyMetadata(default));
-
-        public LyricsStyleSettings LyricsStyleSettings
-        {
-            get => (LyricsStyleSettings)GetValue(LyricsStyleSettingsProperty);
-            set => SetValue(LyricsStyleSettingsProperty, value);
-        }
-
-
-        public static readonly DependencyProperty LyricsEffectSettingsProperty =
-            DependencyProperty.Register(nameof(LyricsEffectSettings), typeof(LyricsEffectSettings), typeof(LyricsSettingsControl), new PropertyMetadata(default));
-
-        public LyricsEffectSettings LyricsEffectSettings
-        {
-            get => (LyricsEffectSettings)GetValue(LyricsEffectSettingsProperty);
-            set => SetValue(LyricsEffectSettingsProperty, value);
-        }
-
-    }
-}

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

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.MediaSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-            <Grid Style="{StaticResource SettingsGridStyle}">
-                <StackPanel>
-
-                    <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
-                    <controls:SettingsCard x:Uid="SettingsPageMusicLib" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8B7;}" />
-
-                    <InfoBar
-                        x:Uid="SettingsPageRemoveInfo"
-                        BorderThickness="0"
-                        CornerRadius="0"
-                        IsClosable="False"
-                        IsOpen="True"
-                        Severity="Success">
-                        <interactivity:Interaction.Behaviors>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind ViewModel.AppSettings.LocalMediaFolders.Count, Mode=OneWay}"
-                                ComparisonCondition="Equal"
-                                Value="0">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                            </interactivity:DataTriggerBehavior>
-                            <interactivity:DataTriggerBehavior
-                                Binding="{x:Bind ViewModel.AppSettings.LocalMediaFolders.Count, Mode=OneWay}"
-                                ComparisonCondition="NotEqual"
-                                Value="0">
-                                <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                            </interactivity:DataTriggerBehavior>
-                        </interactivity:Interaction.Behaviors>
-                    </InfoBar>
-
-                    <ListView
-                        ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
-                        ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
-                        SelectionMode="None">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <controls:SettingsExpander>
-                                    <controls:SettingsExpander.Header>
-                                        <HyperlinkButton
-                                            Click="LocalFolderHyperlinkButton_Click"
-                                            Content="{Binding Path, Mode=OneWay}"
-                                            Tag="{Binding Path, Mode=OneWay}" />
-                                    </controls:SettingsExpander.Header>
-                                    <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
-                                    <controls:SettingsExpander.Items>
-                                        <controls:SettingsCard>
-                                            <controls:SettingsCard.Header>
-                                                <HyperlinkButton
-                                                    x:Uid="SettingsPageRemovePath"
-                                                    Click="SettingsPageRemovePathButton_Click"
-                                                    Tag="{Binding}" />
-                                            </controls:SettingsCard.Header>
-                                        </controls:SettingsCard>
-                                        <controls:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch">
-                                            <ToggleSwitch IsOn="{Binding IsRealTimeWatchEnabled, Mode=TwoWay}" />
-                                        </controls:SettingsCard>
-                                    </controls:SettingsExpander.Items>
-                                </controls:SettingsExpander>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-
-                    <controls:SettingsCard x:Uid="SettingsPageAddFolder" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
-                        <Button
-                            x:Uid="SettingsPageAddFolderButton"
-                            Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
-                            CommandParameter="{Binding ElementName=RootGrid}" />
-                    </controls:SettingsCard>
-
-                </StackPanel>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</UserControl>

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

@@ -1,50 +0,0 @@
-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 Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.System;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class MediaSettingsControl : UserControl
-    {
-        public MediaSettingsControlViewModel ViewModel => (MediaSettingsControlViewModel)DataContext;
-        public MediaSettingsControl()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<MediaSettingsControlViewModel>();
-        }
-
-        private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-        {
-            ViewModel.RemoveFolderAsync((LocalMediaFolder)(sender as HyperlinkButton)!.Tag);
-        }
-
-        private async void LocalFolderHyperlinkButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is HyperlinkButton button && button.Tag is string uriStr)
-            {
-                if (Uri.TryCreate(uriStr, UriKind.Absolute, out var uri))
-                {
-                    await Launcher.LaunchUriAsync(uri);
-                }
-            }
-        }
-    }
-}

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

@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.PlaybackSettingsControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    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:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="using:BetterLyrics.WinUI3.Models"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid ColumnSpacing="6">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
-            <ScrollViewer Margin="0,72,0,0" Style="{StaticResource SettingsScrollViewerStyle}">
-                <Grid Style="{StaticResource SettingsGridStyle}">
-                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-
-                        <controls:SettingsCard x:Uid="SettingsPageMediaSourceProvidersConfig">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsEnabled, Mode=TwoWay}" />
-                        </controls:SettingsCard>
-
-                        <controls:SettingsCard x:Uid="SettingsPageLastFMTrack" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.IsLastFMTrackEnabled, Mode=TwoWay}" />
-                        </controls:SettingsCard>
-
-                        <!--  时间轴相关配置  -->
-                        <controls:SettingsCard x:Uid="SettingsPageLyricsTimelineThreshold">
-                            <local:ExtendedSlider
-                                x:Uid="SettingsPageLyricsTimelineThresholdReset"
-                                Frequency="100"
-                                Maximum="1000"
-                                Minimum="0"
-                                ResetButtonVisibility="Collapsed"
-                                Unit="ms"
-                                Value="{x:Bind ViewModel.SelectedMediaSourceProvider.TimelineSyncThreshold, Mode=TwoWay}" />
-                        </controls:SettingsCard>
-                        <controls:SettingsExpander x:Uid="MainPagePositionOffsetSlider" IsExpanded="True">
-                            <local:ExtendedSlider
-                                x:Uid="SettingsPagePositionOffsetReset"
-                                Default="0"
-                                Frequency="100"
-                                Maximum="5000"
-                                Minimum="-5000"
-                                Unit="ms"
-                                Value="{x:Bind ViewModel.SelectedMediaSourceProvider.PositionOffset, Mode=TwoWay}" />
-                            <controls:SettingsExpander.Items>
-                                <controls:SettingsCard x:Uid="LyricsPagePositionOffsetHint">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.SelectedMediaSourceProvider.ResetPositionOffsetOnSongChanged, Mode=TwoWay}" />
-                                </controls:SettingsCard>
-                            </controls:SettingsExpander.Items>
-                        </controls:SettingsExpander>
-
-                        <!--  专辑封面源配置  -->
-                        <TextBlock x:Uid="SettingsPageAlbumArtSearchProvidersConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <ListView
-                            x:Name="AlbumArtSearchProvidersListView"
-                            AllowDrop="True"
-                            CanDragItems="True"
-                            CanReorderItems="True"
-                            DragItemsCompleted="AlbumArtSearchProvidersListView_DragItemsCompleted"
-                            ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
-                            ItemsSource="{x:Bind ViewModel.SelectedMediaSourceProvider.AlbumArtSearchProvidersInfo, Mode=OneWay}"
-                            SelectionMode="None">
-                            <ListView.OpacityTransition>
-                                <ScalarTransition />
-                            </ListView.OpacityTransition>
-                            <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="models:AlbumArtSearchProviderInfo">
-                                    <controls:SettingsCard Header="{Binding Provider, Converter={StaticResource AlbumArtSearchProviderToDisplayNameConverter}, Mode=OneWay}">
-                                        <controls:SettingsCard.HeaderIcon>
-                                            <FontIcon FontFamily="Segoe UI Symbol" Glyph="&#x283F;" />
-                                        </controls:SettingsCard.HeaderIcon>
-                                        <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
-                                    </controls:SettingsCard>
-                                </DataTemplate>
-                            </ListView.ItemTemplate>
-                        </ListView>
-
-                        <!--  歌词源配置  -->
-                        <TextBlock x:Uid="SettingsPageLyricsSearchProvidersConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <ListView
-                            x:Name="LyricsSearchProvidersListView"
-                            AllowDrop="True"
-                            CanDragItems="True"
-                            CanReorderItems="True"
-                            DragItemsCompleted="LyricsSearchProvidersListView_DragItemsCompleted"
-                            ItemsSource="{x:Bind ViewModel.SelectedMediaSourceProvider.LyricsSearchProvidersInfo, Mode=OneWay}"
-                            SelectionMode="None">
-                            <ListView.OpacityTransition>
-                                <ScalarTransition />
-                            </ListView.OpacityTransition>
-                            <ListView.ItemContainerStyle>
-                                <Style TargetType="ListViewItem">
-                                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                                    <Setter Property="Margin" Value="0" />
-                                    <Setter Property="Padding" Value="0" />
-                                </Style>
-                            </ListView.ItemContainerStyle>
-                            <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="models:LyricsSearchProviderInfo">
-                                    <controls:SettingsCard Header="{Binding Provider, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}, Mode=OneWay}">
-                                        <controls:SettingsCard.HeaderIcon>
-                                            <FontIcon FontFamily="Segoe UI Symbol" Glyph="&#x283F;" />
-                                        </controls:SettingsCard.HeaderIcon>
-                                        <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
-                                    </controls:SettingsCard>
-                                </DataTemplate>
-                            </ListView.ItemTemplate>
-                        </ListView>
-
-                    </StackPanel>
-                </Grid>
-            </ScrollViewer>
-            <ListView
-                VerticalAlignment="Top"
-                ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                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">
-                            <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
-            Grid.Column="0"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Spacing="12">
-            <interactivity:Interaction.Behaviors>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="Equal"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
-                </interactivity:DataTriggerBehavior>
-                <interactivity:DataTriggerBehavior
-                    Binding="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo.Count, Mode=OneWay}"
-                    ComparisonCondition="NotEqual"
-                    Value="0">
-                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
-                </interactivity:DataTriggerBehavior>
-            </interactivity:Interaction.Behaviors>
-            <Image MaxWidth="200" Source="/Assets/Leaf.png" />
-            <TextBlock
-                x:Uid="SettingsPagePlaybackNotFound"
-                HorizontalAlignment="Center"
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-        </StackPanel>
-        <Grid Grid.Column="1">
-            <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
-                <Grid Style="{StaticResource SettingsGridStyle}">
-                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                        <!--  Last.fm  -->
-                        <TextBlock x:Uid="SettingsPageLastFM" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <controls:SettingsExpander
-                            x:Uid="SettingsPageLastFMManager"
-                            HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/LastFM.png}"
-                            IsExpanded="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <Button
-                                    x:Uid="SettingsPageLastFMAuth"
-                                    Command="{x:Bind ViewModel.LastFMAuthCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
-                                <Button
-                                    x:Uid="SettingsPageLastFMUnAuth"
-                                    Command="{x:Bind ViewModel.LastFMUnAuthCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}" />
-                            </StackPanel>
-                            <controls:SettingsExpander.Items>
-                                <controls:SettingsCard x:Uid="SettingsPageLastFMUsername" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <HyperlinkButton Content="{x:Bind ViewModel.LastFMUser.Name, Mode=OneWay}" NavigateUri="{x:Bind ViewModel.LastFMUser.Url, Mode=OneWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="SettingsPageLastFMPlaycount" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <TextBlock Text="{x:Bind ViewModel.LastFMUser.Playcount, Mode=OneWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="SettingsPageLastFMRegistered" IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <TextBlock Text="{x:Bind ViewModel.LastFMUser.Registered.ToLongDateString(), Mode=OneWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard IsEnabled="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
-                                    <Button x:Uid="SettingsPageLastFMRefresh" Command="{x:Bind ViewModel.LastFMRefreshCommand}" />
-                                </controls:SettingsCard>
-                            </controls:SettingsExpander.Items>
-                        </controls:SettingsExpander>
-                        <!--  Lyrics translation  -->
-                        <TextBlock x:Uid="SettingsPageTranslation" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <controls:SettingsExpander
-                            x:Uid="LyricsPageTranslationEnabled"
-                            HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                     Glyph=&#xE774;}"
-                            IsExpanded="True">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=TwoWay}" />
-                            <controls:SettingsExpander.Items>
-                                <controls:SettingsCard x:Uid="SettingsPageTargetLanguage">
-                                    <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.TranslationSettings.SelectedTargetLanguageIndex, Mode=TwoWay}">
-                                        <ComboBoxItem Content="العربية" Tag="ar" />
-                                        <ComboBoxItem Content="Azərbaycan dili" Tag="az" />
-                                        <ComboBoxItem Content="简体中文" Tag="zh-Hans" />
-                                        <ComboBoxItem Content="繁體中文" Tag="zh-Hant" />
-                                        <ComboBoxItem Content="Čeština" Tag="cs" />
-                                        <ComboBoxItem Content="Dansk" Tag="da" />
-                                        <ComboBoxItem Content="Nederlands" Tag="nl" />
-                                        <ComboBoxItem Content="English" Tag="en" />
-                                        <ComboBoxItem Content="Esperanto" Tag="eo" />
-                                        <ComboBoxItem Content="Suomi" Tag="fi" />
-                                        <ComboBoxItem Content="Français" Tag="fr" />
-                                        <ComboBoxItem Content="Deutsch" Tag="de" />
-                                        <ComboBoxItem Content="Ελληνικά" Tag="el" />
-                                        <ComboBoxItem Content="עברית" Tag="he" />
-                                        <ComboBoxItem Content="हिन्दी" Tag="hi" />
-                                        <ComboBoxItem Content="Magyar" Tag="hu" />
-                                        <ComboBoxItem Content="Bahasa Indonesia" Tag="id" />
-                                        <ComboBoxItem Content="Gaeilge" Tag="ga" />
-                                        <ComboBoxItem Content="Italiano" Tag="it" />
-                                        <ComboBoxItem Content="日本語" Tag="ja" />
-                                        <ComboBoxItem Content="한국어" Tag="ko" />
-                                        <ComboBoxItem Content="فارسی" Tag="fa" />
-                                        <ComboBoxItem Content="Polski" Tag="pl" />
-                                        <ComboBoxItem Content="Português" Tag="pt" />
-                                        <ComboBoxItem Content="Русский" Tag="ru" />
-                                        <ComboBoxItem Content="Slovenčina" Tag="sk" />
-                                        <ComboBoxItem Content="Español" Tag="es" />
-                                        <ComboBoxItem Content="Svenska" Tag="sv" />
-                                        <ComboBoxItem Content="Türkçe" Tag="tr" />
-                                        <ComboBoxItem Content="Українська" Tag="uk" />
-                                        <ComboBoxItem Content="Tiếng Việt" Tag="vi" />
-                                    </ComboBox>
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="SettingsPageTranslationConfig">
-                                    <controls:SettingsCard.Description>
-                                        <HyperlinkButton Margin="0,6,0,0" NavigateUri="https://github.com/LibreTranslate/LibreTranslate">
-                                            <TextBlock
-                                                x:Uid="SettingsPageTranslationInfoLink"
-                                                FontSize="14"
-                                                TextWrapping="Wrap" />
-                                        </HyperlinkButton>
-                                    </controls:SettingsCard.Description>
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=TwoWay}" />
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="SettingsPageLibreTranslateServer" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsLibreTranslateEnabled, Mode=OneWay}">
-                                    <StackPanel Orientation="Horizontal" Spacing="12">
-                                        <TextBox
-                                            x:Name="LibreTranslateServerTextBox"
-                                            IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                                            PlaceholderText="http://localhost:5000"
-                                            Text="{x:Bind ViewModel.AppSettings.TranslationSettings.LibreTranslateServer, Mode=TwoWay}" />
-                                        <Button
-                                            x:Uid="SettingsPageServerTestButton"
-                                            Command="{x:Bind ViewModel.LibreTranslateServerTestCommand}"
-                                            IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-                                    </StackPanel>
-                                </controls:SettingsCard>
-                                <controls:SettingsCard x:Uid="LyricsPageTranslationOnly" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.ShowTranslationOnly, Mode=TwoWay}" />
-                                </controls:SettingsCard>
-                            </controls:SettingsExpander.Items>
-                        </controls:SettingsExpander>
-                        <controls:SettingsCard x:Uid="LyricsPageLyricsProviderPrefix">
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
-                        </controls:SettingsCard>
-                        <controls:SettingsCard x:Uid="LyricsPageTranslationProviderPrefix">
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
-                        </controls:SettingsCard>
-                        <!--  LX music server  -->
-                        <TextBlock x:Uid="SettingsPageLXMusicServer" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <controls:SettingsCard>
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <TextBox
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
-                                    PlaceholderText="http://127.0.0.1:23330"
-                                    Text="{x:Bind ViewModel.AppSettings.GeneralSettings.LXMusicServer, Mode=TwoWay}" />
-                                <Button
-                                    x:Uid="SettingsPageServerTestButton"
-                                    Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
-                                    IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
-                            </StackPanel>
-                        </controls:SettingsCard>
-                    </StackPanel>
-                </Grid>
-            </ScrollViewer>
-        </Grid>
-    </Grid>
-
-</UserControl>

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

@@ -1,45 +0,0 @@
-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.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class PlaybackSettingsControl : UserControl
-    {
-        public PlaybackSettingsControlViewModel ViewModel => (PlaybackSettingsControlViewModel)DataContext;
-
-        public PlaybackSettingsControl()
-        {
-            InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<PlaybackSettingsControlViewModel>();
-        }
-
-        private void AlbumArtSearchProvidersListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-        {
-            // <20><> AlbumArtSearchProvidersInfo <20><><EFBFBD><EFBFBD> CollectionChanged <20>¼<EFBFBD>
-            ViewModel.SelectedMediaSourceProvider?.AlbumArtSearchProvidersInfo?.Refresh();
-        }
-
-        private void LyricsSearchProvidersListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-        {
-            // <20><> LyricsSearchProvidersInfo <20><><EFBFBD><EFBFBD> CollectionChanged <20>¼<EFBFBD>
-            ViewModel.SelectedMediaSourceProvider?.LyricsSearchProvidersInfo?.Refresh();
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="BetterLyrics.WinUI3.Controls.ShortcutTextBox"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:BetterLyrics.WinUI3.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <StackPanel Orientation="Horizontal">
-            <TextBox
-                x:Name="TextBox"
-                IsReadOnly="True"
-                KeyDown="TextBox_KeyDown"
-                Loaded="TextBox_Loaded" />
-            <Button
-                Margin="3,0,0,0"
-                HorizontalAlignment="Right"
-                Click="ClearButton_Click"
-                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                      FontSize=12,
-                                      Glyph=&#xE894;}"
-                Style="{StaticResource GhostButtonStyle}" />
-        </StackPanel>
-    </Grid>
-</UserControl>

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

@@ -1,95 +0,0 @@
-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,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace BetterLyrics.WinUI3.Controls
-{
-    public sealed partial class ShortcutTextBox : UserControl
-    {
-        public ShortcutTextBox()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty ShortcutProperty =
-            DependencyProperty.Register(nameof(Shortcut), typeof(List<string>), typeof(ShortcutTextBox), new PropertyMetadata(default));
-
-        public List<string> Shortcut
-        {
-            get => (List<string>)GetValue(ShortcutProperty);
-            set => SetValue(ShortcutProperty, value);
-        }
-
-        private void TextBox_KeyDown(object sender, KeyRoutedEventArgs e)
-        {
-            List<string> shortcut = [];
-
-            bool ctrl = InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-            bool shift = InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-            bool alt = InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-            bool win = InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-                       InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-
-            if (ctrl)
-            {
-                shortcut.Add("Ctrl");
-            }
-            if (shift)
-            {
-                shortcut.Add("Shift");
-            }
-            if (alt)
-            {
-                shortcut.Add("Alt");
-            }
-            if (win)
-            {
-                shortcut.Add("Win");
-            }
-
-            if (e.Key != Windows.System.VirtualKey.Control &&
-                e.Key != Windows.System.VirtualKey.Shift &&
-                e.Key != Windows.System.VirtualKey.Menu &&
-                e.Key != Windows.System.VirtualKey.LeftWindows &&
-                e.Key != Windows.System.VirtualKey.RightWindows)
-            {
-                shortcut.Add(e.Key.ToString());
-            }
-            Shortcut = shortcut;
-
-            UpdateTextBox();
-        }
-
-        private void UpdateTextBox()
-        {
-            TextBox.Text = string.Join(" + ", Shortcut);
-        }
-
-        private void TextBox_Loaded(object sender, RoutedEventArgs e)
-        {
-            UpdateTextBox();
-        }
-
-        private void ClearButton_Click(object sender, RoutedEventArgs e)
-        {
-            Shortcut = [];
-            UpdateTextBox();
-        }
-    }
-}

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

@@ -14,9 +14,9 @@
         x:Name="TrayIcon"
         x:FieldModifier="public"
         ContextMenuMode="SecondWindow"
-        DoubleClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
+        DoubleClickCommand="{x:Bind ViewModel.OpenLyricsWindowCommand}"
         IconSource="ms-appx:///Assets/Logo.ico"
-        LeftClickCommand="{x:Bind ViewModel.OpenLyricsCommand}"
+        LeftClickCommand="{x:Bind ViewModel.OpenLyricsWindowCommand}"
         NoLeftClickDelay="True"
         ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
         <tb:TaskbarIcon.ContextFlyout>
@@ -24,49 +24,13 @@
                 AreOpenCloseAnimationsEnabled="True"
                 LightDismissOverlayMode="On"
                 ShowMode="TransientWithDismissOnPointerMoveAway">
-                <MenuFlyout.MenuFlyoutPresenterStyle>
-                    <Style BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}" TargetType="MenuFlyoutPresenter">
-                        <Setter Property="MinWidth" Value="600" />
-                    </Style>
-                </MenuFlyout.MenuFlyoutPresenterStyle>
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayLyrics"
-                    Command="{x:Bind ViewModel.OpenLyricsCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE90B;}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayMusicGallery"
-                    Command="{x:Bind ViewModel.OpenMusicGalleryCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xEA69;}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTraySettings"
-                    Command="{x:Bind ViewModel.OpenSettingsCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE713;}" />
-                <MenuFlyoutSeparator />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayResetWindowPosition"
-                    Command="{x:Bind ViewModel.ResetWindowPositionCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE923;}" />
+                <MenuFlyoutItem x:Uid="SystemTrayMusicGallery" Command="{x:Bind ViewModel.OpenMusicGalleryCommand}" />
+                <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}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE785;}"
                     Visibility="{x:Bind ViewModel.IsLyricsWindowLocked, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <MenuFlyoutSeparator />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayRestart"
-                    Command="{x:Bind ViewModel.RestartAppCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE777;}" />
-                <MenuFlyoutItem
-                    x:Uid="SystemTrayExit"
-                    Command="{x:Bind ViewModel.ExitAppCommand}"
-                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xE7E8;}" />
             </MenuFlyout>
         </tb:TaskbarIcon.ContextFlyout>
     </tb:TaskbarIcon>

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

@@ -1,26 +0,0 @@
-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 FPSToTimeSpanConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is int fps)
-            {
-                return TimeSpan.FromSeconds(1.0 / fps);
-            }
-            return TimeSpan.FromSeconds(1.0 / 60);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

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

@@ -15,9 +15,9 @@ namespace BetterLyrics.WinUI3.Converter
                 return provider switch
                 {
                     LyricsSearchProvider.LrcLib => "LrcLib",
-                    LyricsSearchProvider.QQ => "QQ 音乐",
-                    LyricsSearchProvider.Netease => "网易云音乐",
-                    LyricsSearchProvider.Kugou => "酷狗音乐",
+                    LyricsSearchProvider.QQ => "QQ",
+                    LyricsSearchProvider.Netease => "Netease",
+                    LyricsSearchProvider.Kugou => "Kugou",
                     LyricsSearchProvider.AmllTtmlDb => "amll-ttml-db",
                     LyricsSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
                     LyricsSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),

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

@@ -1,47 +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.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,
-                    _ => 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,47 +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 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.iTunes  => PathHelper.iTunesLogoPath,
-                    PlayerID.KugouMusic => PathHelper.KugouMusicLogoPath,
-                    PlayerID.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
-                    PlayerID.QQMusic => PathHelper.QQMusicLogoPath,
-                    PlayerID.LXMusic => 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,
-                    _ => PathHelper.UnknownPlayerLogoPath,
-                };
-            }
-            return PathHelper.UnknownPlayerLogoPath;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

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

@@ -1,26 +0,0 @@
-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 ShortcutToStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is List<string> shortcut)
-            {
-                return string.Join(" + ", shortcut);
-            }
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TranslationSearchProviderToDisplayNameConverter.cs

@@ -15,9 +15,9 @@ namespace BetterLyrics.WinUI3.Converter
                 return provider switch
                 {
                     TranslationSearchProvider.LrcLib => "LrcLib",
-                    TranslationSearchProvider.QQ => "QQ 音乐",
-                    TranslationSearchProvider.Netease => "网易云音乐",
-                    TranslationSearchProvider.Kugou => "酷狗音乐",
+                    TranslationSearchProvider.QQ => "QQ",
+                    TranslationSearchProvider.Netease => "Netease",
+                    TranslationSearchProvider.Kugou => "Kugou",
                     TranslationSearchProvider.AmllTtmlDb => "amll-ttml-db",
                     TranslationSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
                     TranslationSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),

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

@@ -2,11 +2,10 @@
 
 namespace BetterLyrics.WinUI3.Enums
 {
-    public enum LyricsWindowMode
+    public enum AutoStartWindowType
     {
         StandardMode,
         DockMode,
         DesktopMode,
-        PictureInPictureMode,
     }
 }

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

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LyricsLayoutOrientation
-    {
-        Horizontal,
-        Vertical,
-    }
-}

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

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum SettingsStoreType
-    {
-        Container,
-        JSON
-    }
-}

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

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum ShortcutID
-    {
-        DesktopLock,
-        DesktopToggle,
-        DockToggle,
-        PictureInPictureToggle,
-        PlayOrPauseSong,
-        NextSong,
-        PreviousSong,
-    }
-}

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

@@ -8,11 +8,9 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class AlbumArtChangedEventArgs(byte[]? bytes, SoftwareBitmap? albumArtSwBitmap, Color? albumArtLightAccentColor, Color? albumArtDarkAccentColor) : EventArgs
+    public class AlbumArtChangedEventArgs(SoftwareBitmap? albumArtSwBitmap, Color? albumArtAccentColor) : EventArgs
     {
-        public byte[]? Bytes { get; set; } = bytes;
         public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
-        public Color? AlbumArtLightAccentColor { get; set; } = albumArtLightAccentColor;
-        public Color? AlbumArtDarkAccentColor { get; set; } = albumArtDarkAccentColor;
+        public Color? AlbumArtAccentColor { get; set; } = albumArtAccentColor;
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMIsAuthenticatedChangedEventArgs.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class LastFMIsAuthenticatedChangedEventArgs : EventArgs
-    {
-        public bool IsAuthenticated { get; set; }
-        public LastFMIsAuthenticatedChangedEventArgs(bool isAuthenticated)
-        {
-            IsAuthenticated = isAuthenticated;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/LastFMUserChangedEventArgs.cs

@@ -1,18 +0,0 @@
-using Hqub.Lastfm.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Events
-{
-    public class LastFMUserChangedEventArgs : EventArgs
-    {
-        public User? User { get; set; }
-        public LastFMUserChangedEventArgs(User? user)
-        {
-            User = user;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/FullyObservableCollection.cs

@@ -1,125 +0,0 @@
-using System;
-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
-{
-    // https://stackoverflow.com/a/32013610/11048731
-    public class FullyObservableCollection<T> : ObservableCollection<T>
-            where T : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Occurs when a property is changed within an item.
-        /// </summary>
-        public event EventHandler<ItemPropertyChangedEventArgs> ItemPropertyChanged;
-
-        public FullyObservableCollection() : base()
-        { }
-
-        public FullyObservableCollection(List<T> list) : base(list)
-        {
-            ObserveAll();
-        }
-
-        public FullyObservableCollection(IEnumerable<T> enumerable) : base(enumerable)
-        {
-            ObserveAll();
-        }
-
-        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
-        {
-            if (e.Action == NotifyCollectionChangedAction.Remove ||
-                e.Action == NotifyCollectionChangedAction.Replace)
-            {
-                foreach (T item in e.OldItems)
-                    item.PropertyChanged -= ChildPropertyChanged;
-            }
-
-            if (e.Action == NotifyCollectionChangedAction.Add ||
-                e.Action == NotifyCollectionChangedAction.Replace)
-            {
-                foreach (T item in e.NewItems)
-                    item.PropertyChanged += ChildPropertyChanged;
-            }
-
-            base.OnCollectionChanged(e);
-        }
-
-        protected void OnItemPropertyChanged(ItemPropertyChangedEventArgs e)
-        {
-            ItemPropertyChanged?.Invoke(this, e);
-        }
-
-        protected void OnItemPropertyChanged(int index, PropertyChangedEventArgs e)
-        {
-            OnItemPropertyChanged(new ItemPropertyChangedEventArgs(index, e));
-        }
-
-        protected override void ClearItems()
-        {
-            foreach (T item in Items)
-                item.PropertyChanged -= ChildPropertyChanged;
-
-            base.ClearItems();
-        }
-
-        private void ObserveAll()
-        {
-            foreach (T item in Items)
-                item.PropertyChanged += ChildPropertyChanged;
-        }
-
-        private void ChildPropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            T typedSender = (T)sender;
-            int i = Items.IndexOf(typedSender);
-
-            if (i < 0)
-                throw new ArgumentException("Received property notification from item not in collection");
-
-            OnItemPropertyChanged(i, e);
-        }
-
-        public void Refresh()
-        {
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-    }
-
-    /// <summary>
-    /// Provides data for the <see cref="FullyObservableCollection{T}.ItemPropertyChanged"/> event.
-    /// </summary>
-    public class ItemPropertyChangedEventArgs : PropertyChangedEventArgs
-    {
-        /// <summary>
-        /// Gets the index in the collection for which the property change has occurred.
-        /// </summary>
-        /// <value>
-        /// Index in parent collection.
-        /// </value>
-        public int CollectionIndex { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPropertyChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="index">The index in the collection of changed item.</param>
-        /// <param name="name">The name of the property that changed.</param>
-        public ItemPropertyChangedEventArgs(int index, string name) : base(name)
-        {
-            CollectionIndex = index;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ItemPropertyChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="index">The index.</param>
-        /// <param name="args">The <see cref="PropertyChangedEventArgs"/> instance containing the event data.</param>
-        public ItemPropertyChangedEventArgs(int index, PropertyChangedEventArgs args) : this(index, args.PropertyName)
-        { }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppWindowHelper.cs

@@ -11,9 +11,9 @@ namespace BetterLyrics.WinUI3.Helper
     {
         public static void SetIcons(this AppWindow appWindow)
         {
-            appWindow.SetIcon(PathHelper.LogoPath);
-            appWindow.SetTaskbarIcon(PathHelper.LogoPath);
-            appWindow.SetTitleBarIcon(PathHelper.LogoPath);
+            appWindow.SetIcon(@"Assets/Logo.ico");
+            appWindow.SetTaskbarIcon(@"Assets/Logo.ico");
+            appWindow.SetTitleBarIcon(@"Assets/Logo.ico");
         }
     }
 }

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

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

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

@@ -52,7 +52,7 @@ namespace BetterLyrics.WinUI3.Helper
             return Color.FromArgb(255, fg.R, fg.G, fg.B);
         }
 
-        public static Color GetInterpolatedColor(double 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(
@@ -106,25 +106,25 @@ namespace BetterLyrics.WinUI3.Helper
             return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
         }
 
-        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, string monitorDeviceName, WindowPixelSampleMode mode)
+        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, WindowPixelSampleMode mode)
         {
             if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
 
-            var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(monitorDeviceName);
-            int screenWidth = monitorInfo.rcMonitor.Width;
             switch (mode)
             {
                 case WindowPixelSampleMode.BelowWindow:
                     {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
                         int sampleHeight = 1;
                         int sampleY = myRect.Bottom + 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        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(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
                     }
                 case WindowPixelSampleMode.WindowArea:
                     {

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

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -67,8 +67,24 @@ namespace BetterLyrics.WinUI3.Helper
                 );
             }
 
+            // <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;
+
+            if (targetWidth <= 0 || targetHeight <= 0 || targetX < 0 || targetY < 0)
+            {
+                targetWidth = 1200;
+                targetHeight = 600;
+                targetX = 200;
+                targetY = 200;
+            }
+
             // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
-            window.AppWindow.MoveAndResize(_settingsService.AppSettings.DesktopModeSettings.WindowBounds.ToRectInt32());
+            window.AppWindow.MoveAndResize(
+                new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
+            );
 
             // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
             if (!_originalTopmostStates.ContainsKey(hwnd))

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/DirectoryHelper.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
-
-    namespace BetterLyrics.WinUI3.Helper
-    {
-        public class DirectoryHelper
-        {
-            /// <summary>
-            /// 递归查找指定文件夹下所有文件（包括子文件夹）。
-            /// </summary>
-            /// <param name="folderPath">要查找的文件夹路径</param>
-            /// <returns>所有文件的完整路径列表</returns>
-            public static List<string> GetAllFiles(string folderPath, string searchPattern = "*")
-            {
-                var files = new List<string>();
-                if (!Directory.Exists(folderPath))
-                    return files;
-
-                try
-                {
-                    files.AddRange(Directory.GetFiles(folderPath, searchPattern));
-                    foreach (var dir in Directory.GetDirectories(folderPath))
-                    {
-                        files.AddRange(GetAllFiles(dir, searchPattern));
-                    }
-                }
-                catch (Exception)
-                {
-                    // 可根据需要处理异常，如权限不足等
-                }
-                return files;
-            }
-        }
-    }
-}

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

@@ -1,6 +1,4 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using System;
@@ -18,17 +16,10 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class DockModeHelper
     {
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
         private static readonly HashSet<IntPtr> _registered = [];
         private static readonly Dictionary<IntPtr, RECT> _originalPositions = [];
         private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyle = [];
 
-        public static bool IsEnabled(IntPtr hwnd)
-        {
-            return _registered.Contains(hwnd);
-        }
-
         public static void Disable(Window window)
         {
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
@@ -61,9 +52,10 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static void Enable(Window window, string monitorDeviceName, int appBarHeight, DockPlacement dockPlacement)
+        public static void Enable(Window window, int appBarHeight, DockPlacement dockPlacement)
         {
             window.SetIsShownInSwitchers(false);
+            //window.ExtendsContentIntoTitleBar = false;
             window.SetIsAlwaysOnTop(true);
 
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
@@ -81,18 +73,16 @@ namespace BetterLyrics.WinUI3.Helper
                 }
             }
 
-            RegisterAppBar(hwnd, monitorDeviceName, appBarHeight, dockPlacement);
+            RegisterAppBar(hwnd, appBarHeight, dockPlacement);
 
-            var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(_settingsService.AppSettings.DockModeSettings.DockMonitorDeviceName);
-
-            int screenWidth = monitorInfo.rcMonitor.Width;
-            int screenHeight = monitorInfo.rcMonitor.Bottom - monitorInfo.rcMonitor.Top;
-            int y = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - appBarHeight;
+            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,
-                monitorInfo.rcMonitor.Left,
+                0,
                 y,
                 screenWidth,
                 appBarHeight,
@@ -103,16 +93,14 @@ namespace BetterLyrics.WinUI3.Helper
             window.Show();
         }
 
-        private static void RegisterAppBar(IntPtr hwnd, string monitorDeviceName, int height, DockPlacement dockPlacement)
+        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;
-
-            var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(monitorDeviceName);
-
-            int top = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - height;
-            int bottom = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top + height : monitorInfo.rcMonitor.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()
             {
@@ -121,13 +109,14 @@ namespace BetterLyrics.WinUI3.Helper
                 uEdge = uEdge,
                 rc = new RECT
                 {
-                    Left = monitorInfo.rcMonitor.Left,
+                    Left = 0,
                     Top = top,
-                    Right = monitorInfo.rcMonitor.Right,
+                    Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
                     Bottom = bottom,
                 },
             };
 
+            // Ref: https://github.com/TwilightLemon/AppBarTest/blob/master/AppBarCreator.cs
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
@@ -151,7 +140,12 @@ namespace BetterLyrics.WinUI3.Helper
             _registered.Remove(hwnd);
         }
 
-        public static void UpdateAppBarHeight(IntPtr hwnd, string monitorDeviceName, int newHeight, DockPlacement dockPlacement)
+        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(() =>
             {
@@ -159,12 +153,9 @@ namespace BetterLyrics.WinUI3.Helper
                     return;
 
                 var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-
-                var monitorInfo = MonitorHelper.GetMonitorInfoExFromDeviceName(monitorDeviceName);
-
-                int screenWidth = monitorInfo.rcMonitor.Width;
-                int top = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - newHeight;
-                int bottom = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top + newHeight : monitorInfo.rcMonitor.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()
                 {
@@ -173,9 +164,9 @@ namespace BetterLyrics.WinUI3.Helper
                     uEdge = uEdge,
                     rc = new RECT
                     {
-                        Left = monitorInfo.rcMonitor.Left,
+                        Left = 0,
                         Top = top,
-                        Right = monitorInfo.rcMonitor.Right,
+                        Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
                         Bottom = bottom,
                     },
                 };
@@ -184,21 +175,16 @@ namespace BetterLyrics.WinUI3.Helper
                 Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
 
                 // 同步窗口实际高度和位置
-                int y = dockPlacement == DockPlacement.Top ? monitorInfo.rcMonitor.Top : monitorInfo.rcMonitor.Bottom - newHeight;
-                int repeatCount = 2;
-                while (repeatCount > 0)
-                {
-                    repeatCount--;
-                    User32.SetWindowPos(
-                        hwnd,
-                        IntPtr.Zero,
-                        monitorInfo.rcMonitor.Left,
-                        y,
-                        screenWidth,
-                        newHeight,
-                        newHeight == 0 ? User32.SetWindowPosFlags.SWP_HIDEWINDOW : User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                    );
-                }
+                int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - newHeight;
+                User32.SetWindowPos(
+                    hwnd,
+                    IntPtr.Zero,
+                    0,
+                    y,
+                    User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
+                    newHeight,
+                    newHeight == 0 ? User32.SetWindowPosFlags.SWP_HIDEWINDOW : User32.SetWindowPosFlags.SWP_SHOWWINDOW
+                );
             }, TimeSpan.FromMilliseconds(100));
         }
     }

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

@@ -10,67 +10,67 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class EasingHelper
     {
-        public static double EaseInOutSine(double t)
+        public static float EaseInOutSine(float t)
         {
-            return -(Math.Cos(Math.PI * t) - 1f) / 2f;
+            return -(MathF.Cos(MathF.PI * t) - 1f) / 2f;
         }
-        public static double EaseInOutQuad(double t)
+        public static float EaseInOutQuad(float t)
         {
             return t < 0.5f ? 2 * t * t : -1 + (4 - 2 * t) * t;
         }
 
-        public static double EaseInOutCubic(double t)
+        public static float EaseInOutCubic(float t)
         {
-            return t < 0.5f ? 4 * t * t * t : 1 - Math.Pow(-2 * t + 2, 3) / 2;
+            return t < 0.5f ? 4 * t * t * t : 1 - MathF.Pow(-2 * t + 2, 3) / 2;
         }
-        public static double EaseInOutQuart(double t)
+        public static float EaseInOutQuart(float t)
         {
-            return t < 0.5f ? 8 * t * t * t * t : 1 - Math.Pow(-2 * t + 2, 4) / 2;
+            return t < 0.5f ? 8 * t * t * t * t : 1 - MathF.Pow(-2 * t + 2, 4) / 2;
         }
 
-        public static double EaseInOutQuint(double t)
+        public static float EaseInOutQuint(float t)
         {
-            return t < 0.5f ? 16 * t * t * t * t * t : 1 - Math.Pow(-2 * t + 2, 5) / 2;
+            return t < 0.5f ? 16 * t * t * t * t * t : 1 - MathF.Pow(-2 * t + 2, 5) / 2;
         }
 
-        public static double EaseInOutExpo(double t)
+        public static float EaseInOutExpo(float t)
         {
             return t == 0
               ? 0
               : t == 1
               ? 1
-              : t < 0.5 ? Math.Pow(2, 20 * t - 10) / 2
-              : (2 - Math.Pow(2, -20 * t + 10)) / 2;
+              : t < 0.5 ? MathF.Pow(2, 20 * t - 10) / 2
+              : (2 - MathF.Pow(2, -20 * t + 10)) / 2;
         }
 
-        public static double EaseInOutCirc(double t)
+        public static float EaseInOutCirc(float t)
         {
             return t < 0.5f
-              ? (1 - Math.Sqrt(1 - Math.Pow(2 * t, 2))) / 2
-              : (Math.Sqrt(1 - Math.Pow(-2 * t + 2, 2)) + 1) / 2;
+              ? (1 - MathF.Sqrt(1 - MathF.Pow(2 * t, 2))) / 2
+              : (MathF.Sqrt(1 - MathF.Pow(-2 * t + 2, 2)) + 1) / 2;
         }
 
-        public static double EaseInOutBack(double t)
+        public static float EaseInOutBack(float t)
         {
-            double c1 = 1.70158f;
-            double c2 = c1 * 1.525f;
+            float c1 = 1.70158f;
+            float c2 = c1 * 1.525f;
 
             return t < 0.5
-              ? (Math.Pow(2 * t, 2) * ((c2 + 1) * 2 * t - c2)) / 2
-              : (Math.Pow(2 * t - 2, 2) * ((c2 + 1) * (t * 2 - 2) + c2) + 2) / 2;
+              ? (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 double EaseInOutElastic(double t)
+        public static float EaseInOutElastic(float t)
         {
             if (t == 0 || t == 1) return t;
-            double p = 0.3f;
-            double s = p / 4;
+            float p = 0.3f;
+            float s = p / 4;
             return t < 0.5f
-              ? -(Math.Pow(2, 20 * t - 10) * Math.Sin((20 * t - 11.125f) * (2 * Math.PI) / p)) / 2
-              : (Math.Pow(2, -20 * t + 10) * Math.Sin((20 * t - 11.125f) * (2 * Math.PI) / p)) / 2 + 1;
+              ? -(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 double EaseOutBounce(double t)
+        private static float EaseOutBounce(float t)
         {
             if (t < 4 / 11f)
             {
@@ -90,7 +90,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static double EaseInOutBounce(double t)
+        public static float EaseInOutBounce(float t)
         {
             if (t < 0.5f)
             {
@@ -102,17 +102,11 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static double SmoothStep(double t)
+        public static float SmoothStep(float t)
         {
             return t * t * (3f - 2f * t);
         }
 
-        public static double CubicBezier(double t, double p0, double p1, double p2, double p3)
-        {
-            double u = 1 - t;
-            return u * u * u * p0 + 3 * u * u * t * p1 + 3 * u * t * t * p2 + t * t * t * p3;
-        }
-
-        public static double Linear(double t) => t;
+        public static float Linear(float t) => t;
     }
 }

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

@@ -2,9 +2,7 @@
 
 using BetterLyrics.WinUI3.Enums;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using Ude;
 
@@ -71,7 +69,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static bool IsSwitchableNormalizedMatch(string fileName, string q1, string q2)
         {
-            var normFileName = StringHelper.Normalize(fileName);
+            var normFileName = StringHelper.Normalize(fileName.Normalize());
             var normQ1 = StringHelper.Normalize(q1);
             var normQ2 = StringHelper.Normalize(q2);
 
@@ -80,13 +78,5 @@ namespace BetterLyrics.WinUI3.Helper
                 || normFileName == normQ2 + normQ1;
         }
 
-        public static readonly string[] MusicExtensions = {
-            ".mp3", ".aac", ".m4a", ".ogg", ".opus", ".wma", ".amr",
-            ".flac", ".alac", ".ape", ".wv", ".tak",
-            ".wav", ".aiff", ".aif", ".pcm", ".cda", ".dsf", ".dff", ".au", ".snd",
-            ".mid", ".midi", ".mod", ".xm", ".it", ".s3m"
-        };
-
-        public static string MusicSearchPattern => string.Join("|", MusicExtensions.Select(x => $"*{x}"));
     }
 }

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

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Graphics.Canvas.Text;
 using System;
@@ -11,6 +11,10 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class FontHelper
     {
+        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
         public static string[] SystemFontFamilies => CanvasTextFormat.GetSystemFontFamilies();
+
+        public static string GetUserPreferredFontFamily() => SystemFontFamilies.ElementAtOrDefault(_settingsService.SelectedFontFamilyIndex) ?? "Segoe UI";
     }
 }

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

@@ -1,5 +1,4 @@
-using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,70 +13,24 @@ namespace BetterLyrics.WinUI3.Helper
     public class GlobalHotKeyHelper
     {
         private static Dictionary<int, Action> _hotKeyActions = [];
+        private static int _nextId = 0;
 
-        /// <summary>
-        /// Register a global hotkey for a specific window type
-        /// </summary>
-        /// <typeparam name="T">Target window type</typeparam>
-        /// <param name="id"></param>
-        /// <param name="keys"></param>
-        /// <param name="action"></param>
-        public static void RegisterHotKey<T>(ShortcutID id, List<string> keys, Action action)
+        public static void RegisterHotKey(Window window, User32.HotKeyModifiers modifiers, uint key, Action action)
         {
-            if (keys.Count == 0) return;
-
-            var window = WindowHelper.GetWindowByWindowType<T>();
-            if (window == null) return;
-
             HWND hwnd = WindowNative.GetWindowHandle(window);
-            User32.HotKeyModifiers modifiers = User32.HotKeyModifiers.MOD_NONE;
-            VirtualKey key = VirtualKey.None;
-            foreach (var item in keys)
+            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())
             {
-                if (item == "Ctrl")
-                {
-                    modifiers |= User32.HotKeyModifiers.MOD_CONTROL;
-                }
-                else if (item == "Shift")
-                {
-                    modifiers |= User32.HotKeyModifiers.MOD_SHIFT;
-                }
-                else if (item == "Alt")
-                {
-                    modifiers |= User32.HotKeyModifiers.MOD_ALT;
-                }
-                else if (item == "Win")
-                {
-                    modifiers |= User32.HotKeyModifiers.MOD_WIN;
-                }
-                else
-                {
-                    key = (VirtualKey)Enum.Parse(typeof(VirtualKey), item, true);
-                }
+                User32.UnregisterHotKey(hwnd, id);
+                _hotKeyActions.Remove(id);
             }
-            User32.RegisterHotKey(hwnd, (int)id, modifiers, (uint)key);
-            _hotKeyActions[(int)id] = action;
-        }
-
-        public static void UnregisterHotKey<T>(ShortcutID id)
-        {
-            var window = WindowHelper.GetWindowByWindowType<T>();
-            if (window == null) return;
-
-            HWND hwnd = WindowNative.GetWindowHandle(window);
-            User32.UnregisterHotKey(hwnd, (int)id);
-            _hotKeyActions.Remove((int)id);
-        }
-
-        public static void UpdateHotKey<T>(ShortcutID id, List<string> keys, Action action)
-        {
-            UnregisterHotKey<T>(id);
-            RegisterHotKey<T>(id, keys, action);
-        }
-
-        public static bool TryInvokeAction(ShortcutID id)
-        {
-            return TryInvokeAction((int)id);
         }
 
         public static bool TryInvokeAction(int id)

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

@@ -6,7 +6,6 @@ using Microsoft.Graphics.Canvas.Text;
 using Microsoft.UI;
 using Microsoft.UI.Xaml.Media.Imaging;
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Jpeg;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
@@ -25,9 +24,11 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class ImageHelper
     {
+        private const int _accentColorCount = 1;
+
         public static async Task<InMemoryRandomAccessStream> ByteArrayToStream(byte[] bytes)
         {
-            using var stream = new InMemoryRandomAccessStream();
+            var stream = new InMemoryRandomAccessStream();
             await stream.WriteAsync(bytes.AsBuffer());
             stream.Seek(0);
 
@@ -36,8 +37,8 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static RandomAccessStreamReference ByteArrayToRandomAccessStreamReference(byte[] bytes)
         {
-            using var stream = new InMemoryRandomAccessStream();
-            using var writer = new DataWriter(stream);
+            var stream = new InMemoryRandomAccessStream();
+            var writer = new DataWriter(stream);
             writer.WriteBytes(bytes);
             writer.StoreAsync().GetAwaiter().GetResult();
             writer.FlushAsync().GetAwaiter().GetResult();
@@ -47,8 +48,8 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static async Task<byte[]> CreateTextPlaceholderBytesAsync(int width, int height)
         {
-            using var device = CanvasDevice.GetSharedDevice();
-            using var renderTarget = new CanvasRenderTarget(device, width, height, 96);
+            var device = CanvasDevice.GetSharedDevice();
+            var renderTarget = new CanvasRenderTarget(device, width, height, 96);
 
             // 随机生成渐变色
             Windows.UI.Color RandomColor()
@@ -57,7 +58,7 @@ namespace BetterLyrics.WinUI3.Helper
                 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 CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, l);
+                return HslToColor(h, s, l);
             }
 
             Windows.UI.Color color1 = RandomColor();
@@ -66,40 +67,86 @@ namespace BetterLyrics.WinUI3.Helper
             using (var ds = renderTarget.CreateDrawingSession())
             {
                 // 绘制线性渐变背景
-                using var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
+                var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
                 {
-                    StartPoint = new Vector2(0, 0),
-                    EndPoint = new Vector2(width, height)
+                    StartPoint = new System.Numerics.Vector2(0, 0),
+                    EndPoint = new System.Numerics.Vector2(width, height)
                 };
                 ds.FillRectangle(0, 0, width, height, gradientBrush);
             }
 
             // 保存为 PNG 并转为 byte[]
-            using var stream = new InMemoryRandomAccessStream();
-            await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
-            var buffer = new byte[stream.Size];
-            using (var reader = new DataReader(stream.GetInputStreamAt(0)))
+            using (var stream = new InMemoryRandomAccessStream())
             {
-                await reader.LoadAsync((uint)stream.Size);
-                reader.ReadBytes(buffer);
+                await renderTarget.SaveAsync(stream, CanvasBitmapFileFormat.Png);
+                var buffer = new byte[stream.Size];
+                using (var reader = new DataReader(stream.GetInputStreamAt(0)))
+                {
+                    await reader.LoadAsync((uint)stream.Size);
+                    reader.ReadBytes(buffer);
+                }
+                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;
             }
-            return buffer;
         }
 
-        public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes, int count, bool? isDark = null)
+        public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes)
         {
-            using var image = Image.Load<Rgba32>(bytes);
-            var colorThief = new ColorThief.ImageSharp.ColorThief();
-            var mainColor = colorThief.GetColor(image, 10, false);
-            var palette = colorThief.GetPalette(image, 255, 10, false);
-            var topColors = palette
-                .OrderByDescending(x => x.Population)
-                .Where(x => x.IsDark == (isDark ?? mainColor.IsDark))
-                .Select(x => Windows.UI.Color.FromArgb(x.Color.A, x.Color.R, x.Color.G, x.Color.B))
-                .Take(count)
+            // 使用 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();
 
-            return topColors;
+            // 转换为 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)
@@ -138,7 +185,7 @@ namespace BetterLyrics.WinUI3.Helper
             return buffer;
         }
 
-        public static double GetAverageLuminance(CanvasBitmap bitmap)
+        public static float GetAverageLuminance(CanvasBitmap bitmap)
         {
             var pixels = bitmap.GetPixelBytes();
             double sum = 0;
@@ -152,7 +199,7 @@ namespace BetterLyrics.WinUI3.Helper
                 double y = 0.299 * r + 0.587 * g + 0.114 * b;
                 sum += y / 255.0;
             }
-            return (double)(sum / (pixels.Length / 4));
+            return (float)(sum / (pixels.Length / 4));
         }
 
         public static byte[] MakeSquareWithThemeColor(byte[] imageBytes)
@@ -167,15 +214,19 @@ namespace BetterLyrics.WinUI3.Helper
 
             int size = Math.Max(image.Width, image.Height);
 
-            var themeColor = Rgba32.ParseHex(GetAccentColorsFromByte(imageBytes, 1).FirstOrDefault().ToHex());
+            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();
@@ -183,41 +234,19 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static byte[] Resize(byte[] imageBytes, int size)
         {
-            using (Image image = Image.Load(imageBytes))
+            using Image image = Image.Load(imageBytes);
+            var factor = Math.Max(size / image.Width, size / image.Height);
+            if (factor <= 1)
             {
-                var factor = Math.Max((double)size / image.Width, (double)size / image.Height);
-
-                int width = (int)(image.Width * factor);
-                int height = (int)(image.Height * factor);
-
-                if (factor > 1)
-                {
-                    image.Mutate(x => x.Resize(width, height, KnownResamplers.Welch));
-                }
-                else
-                {
-                    image.Mutate(x => x.Resize(width, height, KnownResamplers.NearestNeighbor));
-                }
-
-                using var ms = new MemoryStream();
-                image.Save(ms, new JpegEncoder());
-                return ms.ToArray();
+                return imageBytes;
             }
-        }
+            int width = image.Width * factor;
+            int height = image.Height * factor;
+            image.Mutate(x => x.Resize(width, height, KnownResamplers.Welch));
 
-        public static byte[] GenerateNoiseBGRA(int width, int height)
-        {
-            var random = new Random();
-            var pixelData = new byte[width * height * 4];
-            for (int i = 0; i < width * height; i++)
-            {
-                byte gray = (byte)random.Next(0, 256);
-                pixelData[i * 4 + 0] = gray; // B
-                pixelData[i * 4 + 1] = gray; // G
-                pixelData[i * 4 + 2] = gray; // R
-                pixelData[i * 4 + 3] = 255;  // A
-            }
-            return pixelData;
+            using var ms = new MemoryStream();
+            image.Save(ms, new PngEncoder());
+            return ms.ToArray();
         }
     }
 }

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

@@ -1,11 +1,9 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Lyricify.Lyrics.Helpers.General;
 using NTextCat;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using TinyPinyin;
@@ -17,6 +15,7 @@ namespace BetterLyrics.WinUI3.Services
     {
         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 =>
         [
@@ -58,20 +57,36 @@ namespace BetterLyrics.WinUI3.Services
             _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;
 
-            var guessList = _identifier.Identify(text);
-            string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
-            code = code switch
+            string? code = ThreeLetterToTwoLetter(_identifier.Identify(text).FirstOrDefault()?.Item1.Iso639_2T);
+            if (code != null && code == "zh")
             {
-                "simple" => "en",
-                "zh_classical" => "zh-Hant",
-                "zh_yue" => "zh-Hant",
-                "zh" => text == ChineseConverter.ConvertToSimplifiedChinese(text) ? "zh-Hans" : "zh-Hant",
-                _ => code
-            };
+                if (ChineseConverter.ConvertToTraditionalChinese(text) == text)
+                {
+                    return "zh-Hant";
+                }
+                else
+                {
+                    return "zh-Hans";
+                }
+            }
             return code;
         }
 
@@ -99,6 +114,11 @@ namespace BetterLyrics.WinUI3.Services
             };
         }
 
+        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);

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

@@ -1,4 +1,5 @@
-using System;
+using Nito.AsyncEx;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -9,25 +10,33 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class LatestOnlyTaskRunner
     {
-        private CancellationTokenSource? _cts;
+        private readonly AsyncLock _mutex = new();
+        private CancellationTokenSource _cts;
 
-        public async Task RunAsync(Func<CancellationToken, Task> taskFactory)
+        public async Task RunAsync(Func<CancellationToken, Task> action)
         {
-            _cts?.Cancel();
-            _cts?.Dispose();
+            CancellationTokenSource oldCts;
 
-            _cts = new CancellationTokenSource();
-            var token = _cts.Token;
+            // 使用 AsyncLock 保证线程安全
+            using (await _mutex.LockAsync())
+            {
+                // 取消旧的
+                oldCts = _cts;
+                _cts = new CancellationTokenSource();
+            }
+
+            oldCts?.Cancel();
+            oldCts?.Dispose();
+
+            CancellationToken token = _cts.Token;
 
             try
             {
-                await taskFactory(token);
+                await action(token);
             }
             catch (OperationCanceledException)
             {
-            }
-            catch (Exception)
-            {
+                // 可以选择忽略取消异常
             }
         }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ListViewHelper.cs

@@ -0,0 +1,19 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class ListViewHelper
+    {
+        public static int FindChildIndex(this ListView listView, object frameworkElement)
+        {
+            var children = listView.ItemsPanelRoot.Children.Select(x => ((ListViewItem)x).ContentTemplateRoot).ToList();
+            return children.IndexOf((UIElement)frameworkElement);
+        }
+    }
+}

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

@@ -3,7 +3,6 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services;
-using Lyricify.Lyrics.Helpers.General;
 using Lyricify.Lyrics.Models;
 using System;
 using System.Collections.Generic;
@@ -48,57 +47,10 @@ namespace BetterLyrics.WinUI3.Helper
                         break;
                 }
             }
-            FillChineseLyricsData();
             _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
             return _lyricsDataArr;
         }
 
-        private void FillChineseLyricsData()
-        {
-            var simplifiedChinese = _lyricsDataArr.Where(x => x.LanguageCode == "zh-Hans").FirstOrDefault();
-            var traditionalChinese = _lyricsDataArr.Where(x => x.LanguageCode == "zh-Hant").FirstOrDefault();
-            if (simplifiedChinese != null && traditionalChinese == null)
-            {
-                // 如果没有繁体中文歌词，则将简体中文歌词转换为繁体中文
-                _lyricsDataArr.Add(new LyricsData
-                {
-                    LyricsLines = simplifiedChinese.LyricsLines.Select(line => new LyricsLine
-                    {
-                        StartMs = line.StartMs,
-                        EndMs = line.EndMs,
-                        OriginalText = ChineseConverter.ConvertToTraditionalChinese(line.OriginalText),
-                        LyricsChars = line.LyricsChars.Select(c => new LyricsChar
-                        {
-                            StartMs = c.StartMs,
-                            EndMs = c.EndMs,
-                            Text = ChineseConverter.ConvertToTraditionalChinese(c.Text),
-                            StartIndex = c.StartIndex
-                        }).ToList()
-                    }).ToList()
-                });
-            }
-            else if (traditionalChinese != null && simplifiedChinese == null)
-            {
-                // 如果没有简体中文歌词，则将繁体中文歌词转换为简体中文
-                _lyricsDataArr.Add(new LyricsData
-                {
-                    LyricsLines = traditionalChinese.LyricsLines.Select(line => new LyricsLine
-                    {
-                        StartMs = line.StartMs,
-                        EndMs = line.EndMs,
-                        OriginalText = ChineseConverter.ConvertToSimplifiedChinese(line.OriginalText),
-                        LyricsChars = line.LyricsChars.Select(c => new LyricsChar
-                        {
-                            StartMs = c.StartMs,
-                            EndMs = c.EndMs,
-                            Text = ChineseConverter.ConvertToSimplifiedChinese(c.Text),
-                            StartIndex = c.StartIndex
-                        }).ToList()
-                    }).ToList()
-                });
-            }
-        }
-
         private void ParseLrc(string raw)
         {
             var lines = raw.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries);
@@ -169,45 +121,39 @@ namespace BetterLyrics.WinUI3.Helper
             for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
 
             // 遍历每个时间分组
-            if (grouped != null)
+            foreach (var group in grouped)
             {
-                foreach (var group in grouped)
+                var linesInGroup = group.ToList();
+                for (int langIdx = 0; langIdx < languageCount; langIdx++)
                 {
-                    var linesInGroup = group.ToList();
-                    for (int langIdx = 0; langIdx < languageCount; langIdx++)
+                    // 如果该语言有翻译，取对应行，否则用原文（第一行）
+                    var (start, text, syllables) =
+                        langIdx < linesInGroup.Count ? linesInGroup[langIdx] : linesInGroup[0];
+                    var line = new LyricsLine
                     {
-                        // 只添加有对应行的语言，否则跳过
-                        if (langIdx < linesInGroup.Count)
+                        StartMs = start,
+                        OriginalText = text,
+                        LyricsChars = [],
+                    };
+                    if (syllables != null && syllables.Count > 0)
+                    {
+                        int currentIndex = 0;
+                        for (int j = 0; j < syllables.Count; j++)
                         {
-                            var (start, text, syllables) = linesInGroup[langIdx];
-                            var line = new LyricsLine
-                            {
-                                StartMs = start,
-                                OriginalText = text,
-                                LyricsChars = [],
-                            };
-                            if (syllables != null && syllables.Count > 0)
-                            {
-                                int currentIndex = 0;
-                                for (int j = 0; j < syllables.Count; j++)
+                            var (charStart, charText) = syllables[j];
+                            int startIndex = currentIndex;
+                            line.LyricsChars.Add(
+                                new LyricsChar
                                 {
-                                    var (charStart, charText) = syllables[j];
-                                    int startIndex = currentIndex;
-                                    line.LyricsChars.Add(
-                                        new LyricsChar
-                                        {
-                                            StartMs = charStart,
-                                            Text = charText ?? "",
-                                            StartIndex = startIndex,
-                                        }
-                                    );
-                                    currentIndex += charText?.Length ?? 0;
+                                    StartMs = charStart,
+                                    Text = charText ?? "",
+                                    StartIndex = startIndex,
                                 }
-                            }
-                            _lyricsDataArr[langIdx].LyricsLines.Add(line);
+                            );
+                            currentIndex += charText?.Length ?? 0;
                         }
-                        // 没有翻译行则不补原文，直接跳过
                     }
+                    _lyricsDataArr[langIdx].LyricsLines.Add(line);
                 }
             }
         }

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

@@ -1,11 +1,22 @@
 // 2025/6/23 by Zhe Fang
 
-using Windows.ApplicationModel;
-
 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
@@ -14,5 +25,24 @@ namespace BetterLyrics.WinUI3.Helper
                 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 const string TelegramUrl = "https://t.me/+svhSLZ7awPsxNGY1";
+
+        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/MonitorHelper.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Vanara.PInvoke;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class MonitorHelper
-    {
-        public static IEnumerable<string> GetAllMonitorDeviceNames()
-        {
-            var deviceNames = new List<string>();
-            User32.EnumDisplayMonitors(IntPtr.Zero, null, (hMonitor, hdcMonitor, lprcMonitor, dwData) =>
-            {
-                User32.MONITORINFOEX monitorInfoEx = new() { cbSize = (uint)Marshal.SizeOf<User32.MONITORINFOEX>() };
-                if (User32.GetMonitorInfo(hMonitor, ref monitorInfoEx))
-                {
-                    deviceNames.Add(monitorInfoEx.szDevice);
-                }
-                return true; // 继续枚举
-            }, IntPtr.Zero);
-            return deviceNames;
-        }
-
-        public static User32.MONITORINFOEX GetMonitorInfoExFromDeviceName(string deviceName)
-        {
-            User32.MONITORINFOEX? result = null;
-            User32.EnumDisplayMonitors(IntPtr.Zero, null, (hMonitor, hdcMonitor, lprcMonitor, dwData) =>
-            {
-                User32.MONITORINFOEX monitorInfoEx = new() { cbSize = (uint)Marshal.SizeOf<User32.MONITORINFOEX>() };
-                if (User32.GetMonitorInfo(hMonitor, ref monitorInfoEx))
-                {
-                    if (string.Equals(monitorInfoEx.szDevice, deviceName, StringComparison.OrdinalIgnoreCase))
-                    {
-                        result = monitorInfoEx;
-                        return false; // 找到后停止枚举
-                    }
-                }
-                return true; // 继续枚举
-            }, IntPtr.Zero);
-            return result ?? GetPrimaryMonitorInfoEx();
-        }
-
-        public static User32.MONITORINFOEX GetPrimaryMonitorInfoEx()
-        {
-            // (0,0) 总是在主屏
-            var ptZero = new POINT(0, 0);
-            HMONITOR hMonitor = User32.MonitorFromPoint(ptZero, User32.MonitorFlags.MONITOR_DEFAULTTOPRIMARY);
-            User32.MONITORINFOEX monitorInfoEx = new() { cbSize = (uint)Marshal.SizeOf<User32.MONITORINFOEX>() };
-            User32.GetMonitorInfo(hMonitor, ref monitorInfoEx);
-            return monitorInfoEx;
-        }
-
-        public static string GetPrimaryMonitorDeviceName()
-        {
-            var primaryMonitorInfo = GetPrimaryMonitorInfoEx();
-            return primaryMonitorInfo.szDevice;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NoiseGenerationHelper.cs

@@ -0,0 +1,331 @@
+using System;
+using System.Buffers;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Windows.Storage;
+using static BetterLyrics.WinUI3.Helper.NoiseOverlayHelper.BitmapFileCreator;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    internal static class NoiseOverlayHelper
+    {
+
+        const string NoiseOverlayFileName = "noise_overlay.bmp";
+
+        static readonly string NoiseOverlayFilePath = Path.Combine(ApplicationData.Current.LocalFolder.Path, "Assets", NoiseOverlayFileName);
+
+        /// <summary>
+        /// 生成 BGRA 格式的灰阶噪声像素数据
+        /// </summary>
+        public static byte[] GenerateNoiseBitmapBGRA(int width, int height)
+        {
+            var random = new Random();
+            var pixelData = new byte[width * height * 4];
+            for (int i = 0; i < width * height; i++)
+            {
+                byte gray = (byte)random.Next(0, 256);
+                pixelData[i * 4 + 0] = gray; // B
+                pixelData[i * 4 + 1] = gray; // G
+                pixelData[i * 4 + 2] = gray; // R
+                pixelData[i * 4 + 3] = 255;  // A
+            }
+            return pixelData;
+        }
+
+        /// <summary>
+        /// 生成单色灰阶随机噪声
+        /// </summary>
+        /// <param name="outputPath">输出文件路径</param>
+        /// <param name="width">图片宽度</param>
+        /// <param name="height">图片高度</param>
+        public static BitmapFile GenerateNoiseBitmap(int width, int height)
+        {
+            const uint NumOfGrayscale = 16;
+            uint bitCount = NextPowerOfTwo((uint)Math.Round(Math.Sqrt(NumOfGrayscale)));
+
+            var palette = BitmapFileCreator.CreateGrayscalePalette(16);
+            var pixelData = GenerateRandomNoise(width, height, bitCount);
+
+            var fileHeader = BitmapFileCreator.CreateFileHeader(palette, pixelData);
+            var infoHeader = BitmapFileCreator.CreateInfoHeader(width, height, bitCount);
+
+            return new BitmapFile(fileHeader, infoHeader, palette, pixelData);
+        }
+
+        /// <summary>
+        /// 读取噪声图片的位头信息
+        /// </summary>
+        public static BitmapFileCreator.WINBMPINFOHEADER ReadBitmapInfoHeaders(string? FilePath)
+        {
+            var _filePath = FilePath ?? NoiseOverlayFilePath;
+            using var fs = new FileStream(_filePath, FileMode.Open, FileAccess.Read);
+            using var br = new BinaryReader(fs);
+
+            // 跳过文件头
+            fs.Seek(Marshal.SizeOf<BitmapFileCreator.BITMAPFILEHEADER>(), SeekOrigin.Begin);
+
+            // 读取信息头
+            byte[] infoHeaderBytes = br.ReadBytes(Marshal.SizeOf<BitmapFileCreator.WINBMPINFOHEADER>());
+            return MemoryMarshal.Read<BitmapFileCreator.WINBMPINFOHEADER>(infoHeaderBytes);
+        }
+
+        public static BitmapFileCreator.WINBMPINFOHEADER ReadBitmapInfoHeaders(byte[] FileBytes)
+        {
+            // 跳过文件头
+            var offset = Marshal.SizeOf<BitmapFileCreator.BITMAPFILEHEADER>();
+
+            // 读取信息头
+            var infoHeaderLength = Marshal.SizeOf<BitmapFileCreator.WINBMPINFOHEADER>();
+            Span<byte> infoHeaderBytes = new(FileBytes, offset, infoHeaderLength);
+            return MemoryMarshal.Read<BitmapFileCreator.WINBMPINFOHEADER>(infoHeaderBytes);
+        }
+
+        /// <summary>
+        /// safe 的写入 struct 到流
+        /// </summary>
+        /// <typeparam name="T">值 strcut</typeparam>
+        /// <param name="stream">要写入的字节流</param>
+        /// <param name="structure">要被写入的结构</param>
+        public static void WriteStruct<T>(Stream stream, in T structure) where T : struct
+        {
+            int size = Unsafe.SizeOf<T>();
+            byte[] buffer = ArrayPool<byte>.Shared.Rent(size);
+            try
+            {
+                MemoryMarshal.Write(buffer, in structure);
+                stream.Write(buffer, 0, size);
+            }
+            finally
+            {
+                ArrayPool<byte>.Shared.Return(buffer);
+            }
+        }
+
+        /// <summary>
+        /// 随机填充位图内容
+        /// </summary>
+        /// <param name="width">填充宽度</param>
+        /// <param name="height">填充高度</param>
+        /// <param name="bitCount">单个调色盘索引所占比特位数</param>
+        /// <returns>字节数据</returns>
+        private static byte[] GenerateRandomNoise(int width, int height, uint bitCount)
+        {
+            // 创建位图行字节数，4K 对齐
+            int rowSize = ((width * (int)bitCount + 31) >> 5) << 2;
+
+            // 创建随机位图数据
+            Random rnd = new();
+            return Enumerable.Range(0, rowSize * height)
+                .Select(i => (byte)rnd.Next(0x00, 0xFF))
+                .ToArray();
+        }
+
+        private static uint NextPowerOfTwo(uint value)
+        {
+            value--;
+            value |= value >> 1;
+            value |= value >> 2;
+            value |= value >> 4;
+            value |= value >> 8;
+            value |= value >> 16;
+            return value + 1;
+        }
+        public static class BitmapFileCreator
+        {
+
+            /// <summary>
+            /// 创建BMP文件头
+            /// </summary>
+            /// <param name="palette">调色盘数据</param>
+            /// <param name="pixelData">像素数据</param>
+            /// <returns>文件头结构</returns>
+            public static BITMAPFILEHEADER CreateFileHeader(byte[] palette, byte[] pixelData)
+            {
+                return new BITMAPFILEHEADER
+                {
+                    bfType = 0x4D42,
+                    bfSize = (uint)(Marshal.SizeOf<BITMAPFILEHEADER>() +
+                                    Marshal.SizeOf<WINBMPINFOHEADER>() +
+                                    palette.Length +
+                                    pixelData.Length),
+                    bfReserved1 = 0,
+                    bfReserved2 = 0,
+                    bfOffBits = (uint)(Marshal.SizeOf<BITMAPFILEHEADER>() +
+                                        Marshal.SizeOf<WINBMPINFOHEADER>() +
+                                        palette.Length)
+                };
+            }
+
+            /// <summary>
+            /// 将指定值填充到为最接近的2的幂数
+            /// </summary>
+            /// <summary>
+            /// 生成灰阶调色盘
+            /// </summary>
+            /// <param name="colors">灰阶数量</param>
+            /// <returns>调色盘byte数组</returns>
+            public static byte[] CreateGrayscalePalette(int colors)
+            {
+                return Enumerable.Range(0, colors)
+                    .SelectMany(i => Enumerable.Repeat((byte)(i * 0x10), 4))
+                    .ToArray();
+            }
+
+            /// <summary>
+            /// 创建BMP信息头
+            /// </summary>
+            /// <param name="width">宽度</param>
+            /// <param name="height">高度</param>
+            /// <param name="bitCount">单个像素（调色盘索引）位数</param>
+            /// <returns>BMP信息头结构</returns>
+            public static WINBMPINFOHEADER CreateInfoHeader(int width, int height, uint bitCount)
+            {
+                return new WINBMPINFOHEADER
+                {
+                    biSize = (uint)Marshal.SizeOf<WINBMPINFOHEADER>(),
+                    biWidth = (uint)width,
+                    biHeight = (uint)height,
+                    biPlanes = 1,
+                    biBitCount = (ushort)bitCount,
+                    biCompression = 0,
+                    biSizeImage = 0,
+                    biXPelsPerMeter = 0,
+                    biYPelsPerMeter = 0,
+                    biClrUsed = 0,
+                    biClrImportant = 0
+                };
+            }
+
+            [StructLayout(LayoutKind.Sequential, Pack = 1)]
+            /// <summary>
+            /// BMP 位图文件头
+            /// </summary>
+            public struct BITMAPFILEHEADER
+            {
+                /// <summary>
+                /// 文件类型标识，用于指定文件格式
+                /// </summary>
+                public ushort bfType;
+                /// <summary>
+                /// 文件大小，以字节为单位
+                /// </summary>
+                public uint bfSize;
+                /// <summary>
+                /// 保留字段，未使用
+                /// </summary>
+                public ushort bfReserved1;
+                /// <summary>
+                /// 保留字段，未使用
+                /// </summary>
+                public ushort bfReserved2;
+                /// <summary>
+                /// 像素数据的起始位置，以字节为单位，从文件头开始计算
+                /// </summary>
+                public uint bfOffBits;
+            }
+
+            [StructLayout(LayoutKind.Sequential, Pack = 1)]
+            /// <summary>
+            /// BMP 位图信息头
+            /// </summary>
+            public struct WINBMPINFOHEADER
+            {
+                /// <summary>
+                /// 指定此结构体的字节大小。
+                /// </summary>
+                public uint biSize;
+
+                /// <summary>
+                /// 以像素为单位的位图宽度。
+                /// </summary>
+                public uint biWidth;
+
+                /// <summary>
+                /// 以像素为单位的位图高度。
+                /// </summary>
+                public uint biHeight;
+
+                /// <summary>
+                /// 目标设备的平面数，通常为1。
+                /// </summary>
+                public ushort biPlanes;
+
+                /// <summary>
+                /// 每个像素的位数，表示颜色深度，如1、4、8、16、24、32等。
+                /// </summary>
+                public ushort biBitCount;
+
+                /// <summary>
+                /// 压缩类型，0表示不压缩。
+                /// </summary>
+                public uint biCompression;
+
+                /// <summary>
+                /// 位图图像数据的大小（以字节为单位），若图像未压缩，该值可设为0。
+                /// </summary>
+                public uint biSizeImage;
+
+                /// <summary>
+                /// 每米X轴方向的像素数（水平分辨率），通常设为0。
+                /// </summary>
+                public uint biXPelsPerMeter;
+
+                /// <summary>
+                /// 每米Y轴方向的像素数（垂直分辨率），通常设为0。
+                /// </summary>
+                public uint biYPelsPerMeter;
+
+                /// <summary>
+                /// 实际使用的颜色索引数，若为0，则使用位图中实际出现的颜色数。
+                /// </summary>
+                public uint biClrUsed;
+
+                /// <summary>
+                /// 重要颜色索引数，0表示所有颜色都重要。
+                /// </summary>
+                public uint biClrImportant;
+            }
+        }
+
+        public class BitmapFile(BitmapFileCreator.BITMAPFILEHEADER fileHeader, BitmapFileCreator.WINBMPINFOHEADER infoHeader, byte[] palette, byte[] pixelData)
+        {
+            public BITMAPFILEHEADER FileHeader = fileHeader;
+            public WINBMPINFOHEADER InfoHeader = infoHeader;
+            public byte[] Palette = palette;
+            public byte[] PixelData = pixelData;
+
+            /// <summary>
+            /// 转换为byte[]
+            /// </summary>
+            /// <param name="bf"></param>
+            public static explicit operator byte[](BitmapFile bf)
+            {
+                var result = new byte[bf.FileHeader.bfSize];
+                var ms = new MemoryStream(result);
+                bf.WriteToStream(ms);
+                return result;
+            }
+
+            public byte[] ToByteArray() => (byte[])this;
+
+            public Task<byte[]> ToByteArrayAsync() { return Task.FromResult(ToByteArray());}
+
+            /// <summary>
+            /// 写入此结构到流中
+            /// </summary>
+            public void WriteToStream(Stream stream)
+            { 
+                NoiseOverlayHelper.WriteStruct(stream, FileHeader);
+                NoiseOverlayHelper.WriteStruct(stream, InfoHeader);
+                stream.Write(Palette);
+                stream.Write(PixelData);
+                stream.Flush();
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ObjectHelper.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class ObjectHelper
-    {
-        // Credit/Copyright to https://gist.github.com/tcartwright/dab50ebaff7c59f05013de0fb349cabd
-        public static bool IsDisposed(this IDisposable obj)
-        {
-            /*
-             TIM C: This hacky code is because MSFT does not provide a standard way to interrogate if an object is disposed or not. 
-                I wrote this based upon streams, but it should work for many other types of MSFT objects (maybe).
-            */
-            if (obj == null) { return true; }
-
-            var objType = obj.GetType();
-            //var foo = new System.IO.BufferedStream();
-
-            // the _disposed pattern should catch a lot of msft objects.... hopefully
-            var isDisposedField = objType.GetField("_disposed", BindingFlags.NonPublic | BindingFlags.Instance) ??
-                objType.GetField("disposed", BindingFlags.NonPublic | BindingFlags.Instance);
-
-            if (isDisposedField != null) { return Convert.ToBoolean(isDisposedField.GetValue(obj)); }
-
-            isDisposedField = objType.GetField("_isOpen", BindingFlags.NonPublic | BindingFlags.Instance);
-
-            if (isDisposedField != null) { return !Convert.ToBoolean(isDisposedField.GetValue(obj)); }
-
-            // Windows.Graphics.Imaging.SoftwareBitmap
-            isDisposedField = objType.GetField("_objRef_global__System_IDisposable", BindingFlags.NonPublic | BindingFlags.Instance);
-            if (isDisposedField != null) { return !Convert.ToBoolean(isDisposedField.GetValue(obj)); }
-
-            // System.IO.FileStream
-            var strategyField = objType.GetField("_strategy", BindingFlags.NonPublic | BindingFlags.Instance);
-            if (strategyField != null)
-            {
-                var strategy = strategyField.GetValue(obj);
-                var isClosedField = strategy.GetType().GetProperty("IsClosed", BindingFlags.NonPublic | BindingFlags.Instance);
-                if (isClosedField != null) { return Convert.ToBoolean(isClosedField.GetValue(strategy)); }
-            }
-
-            // other streams that use this pattern to determine if they are disposed
-            if (obj is Stream stream) { return !stream.CanRead && !stream.CanWrite; }
-
-            return false;
-        }
-    }
-}

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

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Security.Credentials;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class PasswordVaultHelper
-    {
-        /// <summary>
-        /// 保存敏感数据到 PasswordVault
-        /// </summary>
-        /// <param name="resource">资源标识，比如 "MyApp"</param>
-        /// <param name="key">键名，比如 "SessionKey"</param>
-        /// <param name="value">要保存的值</param>
-        public static void Save(string resource, string key, string value)
-        {
-            var vault = new PasswordVault();
-
-            // 删除旧值（避免重复存储）
-            try
-            {
-                var oldCredential = vault.Retrieve(resource, key);
-                if (oldCredential != null)
-                {
-                    vault.Remove(oldCredential);
-                }
-            }
-            catch
-            {
-                // 没有旧值就忽略
-            }
-
-            vault.Add(new PasswordCredential(resource, key, value));
-        }
-
-        /// <summary>
-        /// 从 PasswordVault 获取敏感数据
-        /// </summary>
-        /// <param name="resource">资源标识</param>
-        /// <param name="key">键名</param>
-        /// <returns>存储的值，若不存在则返回 null</returns>
-        public static string? Get(string resource, string key)
-        {
-            var vault = new PasswordVault();
-            try
-            {
-                var credential = vault.Retrieve(resource, key);
-                credential.RetrievePassword();
-                return credential.Password;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// 删除指定的敏感数据
-        /// </summary>
-        public static void Delete(string resource, string key)
-        {
-            var vault = new PasswordVault();
-            try
-            {
-                var credential = vault.Retrieve(resource, key);
-                vault.Remove(credential);
-            }
-            catch
-            {
-                // 不存在就忽略
-            }
-        }
-    }
-}

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

@@ -11,30 +11,11 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class PathHelper
     {
-        public static string LocalFolder => ApplicationData.Current.LocalFolder.Path;
+        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 SettingsDirectory => Path.Combine(LocalFolder, "settings");
-        public static string SettingsFilePath => Path.Combine(SettingsDirectory, "settings.json");
-
-        public static string LanguageProfilePath => Path.Combine(AssetsFolder, "Wiki82.profile.xml");
-        public static string LogoPath => Path.Combine(AssetsFolder, "Logo.ico");
-        public static string AIMPLogoPath => Path.Combine(AssetsFolder, "AIMP.png");
-        public static string Foobar2000LogoPath => Path.Combine(AssetsFolder, "foobar2000.png");
-        public static string MusicBeeLogoPath => Path.Combine(AssetsFolder, "MusicBee.png");
-        public static string SpotifyLogoPath => Path.Combine(AssetsFolder, "Spotify.png");
-        public static string AppleMusicLogoPath => Path.Combine(AssetsFolder, "AppleMusic.png");
-        public static string iTunesLogoPath => Path.Combine(AssetsFolder, "iTunes.png");
-        public static string KugouMusicLogoPath => Path.Combine(AssetsFolder, "KugouMusic.png");
-        public static string NetEaseCloudMusicLogoPath => Path.Combine(AssetsFolder, "NetEaseCloudMusic.png");
-        public static string QQMusicLogoPath => Path.Combine(AssetsFolder, "QQMusic.png");
-        public static string LXMusicLogoPath => Path.Combine(AssetsFolder, "LXMusic.png");
-        public static string MediaPlayerWindows11LogoPath => Path.Combine(AssetsFolder, "MediaPlayerWindows11.png");
-        public static string PotPlayerLogoPath => Path.Combine(AssetsFolder, "PotPlayer.png");
-        public static string ChromeLogoPath => Path.Combine(AssetsFolder, "Chrome.png");
-        public static string EdgeLogoPath => Path.Combine(AssetsFolder, "Edge.png");
-        public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
+        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");
@@ -60,8 +41,6 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static void EnsureDirectories()
         {
-            Directory.CreateDirectory(SettingsDirectory);
-
             Directory.CreateDirectory(LogDirectory);
 
             Directory.CreateDirectory(LrcLibLyricsCacheDirectory);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/RectHelper.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Graphics;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class RectHelper
-    {
-        public static RectInt32 ToRectInt32(this Windows.Foundation.Rect rect)
-        {
-            return new RectInt32(
-                (int)rect.X,
-                (int)rect.Y,
-                (int)rect.Width,
-                (int)rect.Height
-            );
-        }
-    }
-}

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

@@ -38,7 +38,7 @@ namespace BetterLyrics.WinUI3.Helper
         {
             if (_endpointVolume != null)
             {
-                double level = _endpointVolume.GetMasterVolumeLevelScalar();
+                float level = _endpointVolume.GetMasterVolumeLevelScalar();
                 _masterVolume = (int)(level * 100);
             }
 

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

@@ -10,22 +10,21 @@ namespace BetterLyrics.WinUI3.Helper
         where T : struct
     {
         private T _currentValue;
-        private double _durationSeconds;
+        private float _durationSeconds;
         private EasingType? _easingType;
-        private Func<T, T, double, T> _interpolator;
+        private Func<T, T, float, T> _interpolator;
         private bool _isTransitioning;
-        private double _progress;
+        private float _progress;
         private T _startValue;
         private T _targetValue;
 
-        public double DurationSeconds => _durationSeconds;
+        public float DurationSeconds => _durationSeconds;
 
         public bool IsTransitioning => _isTransitioning;
         public T Value => _currentValue;
         public T TargetValue => _targetValue;
-        public EasingType? EasingType => _easingType;
 
-        public ValueTransition(T initialValue, double durationSeconds, Func<T, T, double, T>? interpolator = null, EasingType? easingType = null)
+        public ValueTransition(T initialValue, float durationSeconds, Func<T, T, float, T>? interpolator = null, EasingType? easingType = null)
         {
             _currentValue = initialValue;
             _startValue = initialValue;
@@ -46,12 +45,12 @@ namespace BetterLyrics.WinUI3.Helper
             }
             else
             {
-                _easingType = Enums.EasingType.EaseInOutQuad;
+                _easingType = EasingType.Linear;
                 _interpolator = GetInterpolatorByEasingType(_easingType.Value);
             }
         }
 
-        public void SetDuration(double seconds)
+        public void SetDuration(float seconds)
         {
             if (seconds <= 0)
                 throw new ArgumentOutOfRangeException(nameof(seconds), "Duration must be positive.");
@@ -103,7 +102,7 @@ namespace BetterLyrics.WinUI3.Helper
         {
             if (!_isTransitioning) return;
 
-            _progress += (double)(elapsedTime / TimeSpan.FromSeconds(_durationSeconds));
+            _progress += (float)elapsedTime.TotalSeconds / _durationSeconds;
             if (_progress >= 1f)
             {
                 _progress = 1f;
@@ -116,51 +115,51 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        private Func<T, T, double, T> GetInterpolatorByEasingType(EasingType type)
+        private Func<T, T, float, T> GetInterpolatorByEasingType(EasingType type)
         {
-            if (typeof(T) == typeof(double))
+            if (typeof(T) == typeof(float))
             {
                 return (start, end, progress) =>
                 {
-                    double s = (double)(object)start;
-                    double e = (double)(object)end;
-                    double t = progress;
+                    float s = (float)(object)start;
+                    float e = (float)(object)end;
+                    float t = progress;
                     switch (type)
                     {
-                        case Enums.EasingType.EaseInOutSine:
+                        case EasingType.EaseInOutSine:
                             t = EasingHelper.EaseInOutSine(t);
                             break;
-                        case Enums.EasingType.EaseInOutQuad:
+                        case EasingType.EaseInOutQuad:
                             t = EasingHelper.EaseInOutQuad(t);
                             break;
-                        case Enums.EasingType.EaseInOutCubic:
+                        case EasingType.EaseInOutCubic:
                             t = EasingHelper.EaseInOutCubic(t);
                             break;
-                        case Enums.EasingType.EaseInOutQuart:
+                        case EasingType.EaseInOutQuart:
                             t = EasingHelper.EaseInOutQuart(t);
                             break;
-                        case Enums.EasingType.EaseInOutQuint:
+                        case EasingType.EaseInOutQuint:
                             t = EasingHelper.EaseInOutQuint(t);
                             break;
-                        case Enums.EasingType.EaseInOutExpo:
+                        case EasingType.EaseInOutExpo:
                             t = EasingHelper.EaseInOutExpo(t);
                             break;
-                        case Enums.EasingType.EaseInOutCirc:
+                        case EasingType.EaseInOutCirc:
                             t = EasingHelper.EaseInOutCirc(t);
                             break;
-                        case Enums.EasingType.EaseInOutBack:
+                        case EasingType.EaseInOutBack:
                             t = EasingHelper.EaseInOutBack(t);
                             break;
-                        case Enums.EasingType.EaseInOutElastic:
+                        case EasingType.EaseInOutElastic:
                             t = EasingHelper.EaseInOutElastic(t);
                             break;
-                        case Enums.EasingType.EaseInOutBounce:
+                        case EasingType.EaseInOutBounce:
                             t = EasingHelper.EaseInOutBounce(t);
                             break;
-                        case Enums.EasingType.SmoothStep:
+                        case EasingType.SmoothStep:
                             t = EasingHelper.SmoothStep(t);
                             break;
-                        case Enums.EasingType.Linear:
+                        case EasingType.Linear:
                             t = EasingHelper.Linear(t);
                             break;
                         default:

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

@@ -18,10 +18,6 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static void CloseWindow<T>()
         {
-            if (typeof(T) == typeof(LyricsWindow))
-            {
-                EnsureDockModeReleased();
-            }
             var window = _activeWindows.Find(w => w is T);
             if (window is Window w)
             {
@@ -64,31 +60,10 @@ namespace BetterLyrics.WinUI3.Helper
                     throw new ArgumentException("Unsupported window type", nameof(T));
                 }
                 TrackWindow(window);
-                var castedWindow = (Window)window;
-                castedWindow.Restore();
-                castedWindow.Activate();
-
-                if (typeof(T) == typeof(LyricsWindow))
-                {
-                    var lyricsWindow = (LyricsWindow)window;
-                    lyricsWindow.ViewModel.InitShortcuts();
-                    lyricsWindow.AutoSelectLyricsMode();
-                }
-            }
-            else
-            {
-                var castedWindow = (Window)window;
-                if (typeof(T) == typeof(LyricsWindow))
-                {
-                    var lyricsWindow = (LyricsWindow)window;
-                    lyricsWindow.Show();
-                }
-                else
-                {
-                    castedWindow.Restore();
-                    castedWindow.Activate();
-                }
             }
+            var castedWindow = (Window)window;
+            castedWindow.Restore();
+            castedWindow.Activate();
         }
 
         public static void RestartApp(string args = "")
@@ -111,21 +86,6 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static void ExitApp()
-        {
-            EnsureDockModeReleased();
-            Environment.Exit(0);
-        }
-
-        private static void EnsureDockModeReleased()
-        {
-            LyricsWindow? lyricsWindow = GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                DockModeHelper.Disable(lyricsWindow);
-            }
-        }
-
         private static void TrackWindow(object window)
         {
             if (!_activeWindows.Contains(window))

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

@@ -5,11 +5,13 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public partial class AlbumArtSearchProviderInfo : ObservableRecipient
+    public partial class AlbumArtSearchProviderInfo : ObservableObject
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; }
+        [ObservableProperty]
+        public partial bool IsEnabled { get; set; }
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtSearchProvider Provider { get; set; }
+        [ObservableProperty]
+        public partial AlbumArtSearchProvider Provider { get; set; }
 
         public AlbumArtSearchProviderInfo() { }
 

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

@@ -1,39 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Models.Settings;
-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 LiveStates : ObservableRecipient
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowMode CurrentLyricsWindowMode { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType CurrentLyricsDisplayType { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings CurrentLyricsStyleSettings { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings CurrentLyricsEffectSettings { get; set; }
-
-        public LiveStates(AppSettings appSettings)
-        {
-            CurrentLyricsWindowMode = LyricsWindowMode.StandardMode;
-            CurrentLyricsDisplayType = appSettings.StandardModeSettings.LyricsDisplayType;
-            CurrentLyricsStyleSettings = appSettings.StandardLyricsStyleSettings;
-            CurrentLyricsEffectSettings = appSettings.StandardLyricsEffectSettings;
-        }
-
-        public void ToggleLyricsWindowMode(LyricsWindowMode mode)
-        {
-            if (CurrentLyricsWindowMode == mode)
-            {
-                CurrentLyricsWindowMode = LyricsWindowMode.StandardMode;
-            }
-            else
-            {
-                CurrentLyricsWindowMode = mode;
-            }
-        }
-    }
-}

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

@@ -4,17 +4,20 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public partial class LocalMediaFolder : ObservableRecipient
+    public partial class LocalMediaFolder : ObservableObject
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsRealTimeWatchEnabled { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Path { get; set; }
+        [ObservableProperty]
+        public partial bool IsEnabled { get; set; }
+
+        [ObservableProperty]
+        public partial string Path { get; set; }
 
         public LocalMediaFolder() { }
 
-        public LocalMediaFolder(string path)
+        public LocalMediaFolder(string path, bool isEnabled)
         {
             Path = path;
+            IsEnabled = isEnabled;
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChangedEventArgs.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class LyricsChangedEventArgs : EventArgs
-    {
-    }
-}

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

@@ -26,7 +26,7 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void SetDisplayedTextAlongWith(LyricsData translationData, string separator, int toleranceMs = 0)
+        public void SetDisplayedTextAlongWith(LyricsData translationData, int toleranceMs = 0)
         {
             foreach (var line in LyricsLines)
             {
@@ -36,17 +36,33 @@ namespace BetterLyrics.WinUI3.Models
 
                 if (transLine != null)
                 {
-                    line.DisplayedText = $"{line.OriginalText}{separator}{transLine.OriginalText}";
+                    if (translationData.LanguageCode?.StartsWith("zh") == true)
+                    {
+                        string tmp = "";
+                        if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hant")
+                        {
+                            tmp = ChineseConverter.ConvertToTraditionalChinese(transLine.OriginalText);
+                        }
+                        else if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hans")
+                        {
+                            tmp = ChineseConverter.ConvertToSimplifiedChinese(transLine.OriginalText);
+                        }
+                        line.DisplayedText = $"{line.OriginalText}\n{tmp}";
+                    }
+                    else
+                    {
+                        line.DisplayedText = $"{line.OriginalText}\n{transLine.OriginalText}";
+                    }
                 }
                 else
                 {
                     // 没有匹配的翻译，翻译部分留空
-                    line.DisplayedText = $"{line.OriginalText}";
+                    line.DisplayedText = $"{line.OriginalText}\n";
                 }
             }
         }
 
-        public void SetDisplayedTextAlongWith(string translation, string separator)
+        public void SetDisplayedTextAlongWith(string translation)
         {
             List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
             int i = 0;
@@ -58,7 +74,7 @@ namespace BetterLyrics.WinUI3.Models
                 }
                 else
                 {
-                    line.DisplayedText = $"{line.OriginalText}{separator}{translationArr[i]}";
+                    line.DisplayedText = $"{line.OriginalText}{StringHelper.NewLine}{translationArr[i]}";
                 }
                 i++;
             }