fix: issue related with docked mode

Improve identification of NeteaseFamily and fix Lrc Parser unexpected behavior when parsing [Min:Sec:MillSec]

.github/FUNDING.yml

@@ -12,4 +12,4 @@ lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cl
 polar: # Replace with a single Polar username
 buy_me_a_coffee: founchoo
 thanks_dev: # Replace with a single thanks.dev username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://paypal.me/zhefangpay']

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

@@ -12,13 +12,13 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.60.0" />
+	  Version="1.0.83.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
 	<Properties>
 		<DisplayName>BetterLyrics</DisplayName>
-		<PublisherDisplayName>founchoo</PublisherDisplayName>
+		<PublisherDisplayName>Zhe Fang</PublisherDisplayName>
 		<Logo>Images\StoreLogo.png</Logo>
 	</Properties>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -58,6 +58,7 @@
             <converter:ShortcutToStringConverter x:Key="ShortcutToStringConverter" />
             <converter:BoolNegationToVisibilityConverter x:Key="BoolNegationToVisibilityConverter" />
             <converter:BoolToOpacityConverter x:Key="BoolToOpacityConverter" />
+            <converter:RectToMarginConverter x:Key="RectToMarginConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />

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

@@ -84,7 +84,7 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHelper.OpenWindow<LyricsWindow>();
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
         }
 
         private static void ConfigureServices()
@@ -113,12 +113,11 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<ILastFMService, LastFMService>()
                     // ViewModels
                     .AddSingleton<AppSettingsControlViewModel>()
-                    .AddSingleton<LyricsBackgroundSettingsControlViewModel>()
-                    .AddSingleton<AlbumArtLayoutSettingsControlViewModel>()
                     .AddSingleton<PlaybackSettingsControlViewModel>()
                     .AddSingleton<MediaSettingsControlViewModel>()
-                    .AddSingleton<AllLyricsSettingsControlViewModel>()
                     .AddSingleton<LyricsSearchControlViewModel>()
+                    .AddSingleton<LyricsWindowSettingsControlViewModel>()
+                    .AddSingleton<LyricsWindowSwitchControlViewModel>()
                     .AddSingleton<LyricsWindowViewModel>()
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()

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

@@ -20,18 +20,23 @@
 		<PRIResource Remove="ViewModels\Lyrics\**" />
 	</ItemGroup>
 	<ItemGroup>
+		<None Remove="Assets\effect.bin" />
 		<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\DemoWindowGrid.xaml" />
 		<None Remove="Controls\ExtendedSlider.xaml" />
 		<None Remove="Controls\LyricsSearchControl.xaml" />
 		<None Remove="Controls\LyricsSettingsControl.xaml" />
+		<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
+		<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
 		<None Remove="Controls\MediaSettingsControl.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
+		<None Remove="Views\LyricsSearchWindow.xaml" />
+		<None Remove="Views\LyricsWindowSwitchWindow.xaml" />
 		<None Remove="Views\MusicGalleryPage.xaml" />
 		<None Remove="Views\MusicGalleryWindow.xaml" />
 		<None Remove="Views\SettingsWindow.xaml" />
@@ -59,6 +64,7 @@
 		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
 		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
+		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
@@ -68,9 +74,11 @@
 		<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="NAudio.Wasapi" Version="2.2.1" />
 		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
 		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
 		<PackageReference Include="NTextCat" Version="0.3.65" />
+		<PackageReference Include="RomajiConverter.Core" Version="1.0.9" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.3-dev-02320" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
 		<PackageReference Include="ShadowViewer.Controls.Notification" Version="1.2.1" />
@@ -78,7 +86,6 @@
 		<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.8" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
-		<PackageReference Include="TinyPinyin.Net" Version="1.0.2" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
 		<PackageReference Include="Vanara.PInvoke.CoreAudio" Version="4.1.6" />
 		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.1.6" />
@@ -112,10 +119,10 @@
 	  <Content Update="Assets\Chrome.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Discord.png">
+	  <Content Update="Assets\Edge.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Edge.png">
+	  <Content Update="Assets\effect.bin">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Empty.png">
@@ -142,6 +149,9 @@
 	  <Content Update="Assets\Leaf.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\Listen1.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Logo.ico">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -154,6 +164,9 @@
 	  <Content Update="Assets\MediaPlayerWindows11.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\MoeKoeMusic.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\MusicBee.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -166,28 +179,50 @@
 	  <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\SaltPlayerForWindows.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Segoe Fluent Icons.ttf">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Spotify.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\Telegram.png">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </Content>
 	  <Content Update="Assets\Wiki82.profile.xml">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\LyricsWindowSwitchWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\LyricsWindowSwitchControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\DemoWindowGrid.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\LyricsWindowSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\LyricsSearchWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\LyricsSearchControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
@@ -203,11 +238,6 @@
 	    <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>
@@ -258,6 +288,11 @@
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
 	</ItemGroup>
+	<ItemGroup>
+	  <PRIResource Update="Strings\en-US\Resources.resw">
+	    <Generator></Generator>
+	  </PRIResource>
+	</ItemGroup>
 	<!-- Publish Properties -->
 	<PropertyGroup>
 		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>

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

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Constants
+{
+    public static class AppleMusic
+    {
+        public const string MediaUserTokenKey = "AppleMusicMediaUserToken";
+    }
+}

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

@@ -8,6 +8,6 @@ namespace BetterLyrics.WinUI3.Constants
 {
     public static class LXMusic
     {
-        public const string QuerySuffix = "/subscribe-player-status?filter=progress,duration";
+        public const string QuerySuffix = "/subscribe-player-status?filter=progress,duration,picUrl";
     }
 }

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

@@ -8,7 +8,8 @@ namespace BetterLyrics.WinUI3.Constants
 {
     public static class Link
     {
-        public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
+        public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics";
+        public const string FAQUrl = $"{GitHubUrl}/blob/dev/FAQ/FAQ.md";
         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

@@ -17,6 +17,7 @@ namespace BetterLyrics.WinUI3.Constants
         public const string PotPlayer = "PotPlayerMini64.exe";
         public const string Spotify = "Spotify.exe";
         public const string AppleMusic = "AppleInc.AppleMusicWin_nzyj5cx40ttqa!App";
+        public const string AppleMusicAlternative = "AppleMusic.exe";
         public const string NetEaseCloudMusic = "cloudmusic.exe";
         public const string KugouMusic = "kugou";
         public const string QQMusic = "QQMusic.exe";
@@ -25,5 +26,9 @@ namespace BetterLyrics.WinUI3.Constants
         public const string Edge = "MSEdge";
         public const string BetterLyrics = "37412.BetterLyrics_rd1g0rsrrtxw8!App";
         public const string BetterLyricsDebug = "37412.BetterLyrics_c8mj3v9sysxb4!App";
+        public const string SaltPlayerForWindows = "Sakawish.SaltPlayerforWindows_q65q631pyh094!SaltPlayerforWindows";
+        public const string MoeKoeMusic = "cn.MoeKoe.Music";
+        public const string MoeKoeMusicAlternative = "electron.app.MoeKoe Music";
+        public const string Listen1 = "com.listen1.listen1";
     }
 }

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

@@ -16,6 +16,7 @@ namespace BetterLyrics.WinUI3.Constants
         public const string PotPlayer = "PotPlayer";
         public const string Spotify = "Spotify";
         public const string AppleMusic = "Apple Music";
+        public const string AppleMusicAlternative = "Apple Music";
         public const string NetEaseCloudMusic = "网易云音乐";
         public const string KugouMusic = "酷狗音乐";
         public const string QQMusic = "QQ 音乐";
@@ -24,5 +25,8 @@ namespace BetterLyrics.WinUI3.Constants
         public const string Edge = "Microsoft Edge";
         public const string BetterLyrics = "BetterLyrics";
         public const string BetterLyricsDebug = "BetterLyrics (Debug)";
+        public const string SaltPlayerForWindows = "Salt Player for Windows";
+        public const string MoeKoeMusic = "MoeKoe Music";
+        public const string Listen1 = "Listen 1";
     }
 }

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

@@ -17,6 +17,27 @@
 
                     <TextBlock x:Uid="SettingsPageAlbumArt" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageAlbumArtSize"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE744;}"
+                        IsExpanded="True">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageAutoSize">
+                                <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard IsEnabled="{x:Bind AlbumArtLayoutSettings.AutoAlbumArtSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Frequency="2"
+                                    Maximum="800"
+                                    Minimum="10"
+                                    ResetButtonVisibility="Collapsed"
+                                    Unit="px"
+                                    Value="{x:Bind AlbumArtLayoutSettings.AlbumArtSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
                     <controls:SettingsCard x:Uid="SettingsPageAlbumRadius" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA3A;}">
                         <local:ExtendedSlider
                             Default="12"
@@ -24,7 +45,7 @@
                             Maximum="100"
                             Minimum="0"
                             Unit="%"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
+                            Value="{x:Bind AlbumArtLayoutSettings.CoverImageRadius, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
                     <controls:SettingsCard x:Uid="SettingsPageAlbumShadowAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF5EF;}">
@@ -33,22 +54,43 @@
                             Frequency="1"
                             Maximum="64"
                             Minimum="0"
-                            Value="{x:Bind ViewModel.AppSettings.AlbumArtLayoutSettings.CoverImageShadowAmount, Mode=TwoWay}" />
+                            Value="{x:Bind 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}}">
+                        <ComboBox SelectedIndex="{x:Bind AlbumArtLayoutSettings.SongInfoAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                             <ComboBoxItem x:Uid="SettingsPageSongInfoLeft" />
                             <ComboBoxItem x:Uid="SettingsPageSongInfoCenter" />
                             <ComboBoxItem x:Uid="SettingsPageSongInfoRight" />
                         </ComboBox>
                     </controls:SettingsCard>
 
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                        <local:ExtendedSlider
+                            Default="18"
+                            Frequency="2"
+                            Maximum="72"
+                            Minimum="8"
+                            Value="{x:Bind AlbumArtLayoutSettings.SongInfoFontSize, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageShowTitle"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEF3D;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageShowArtists">
+                                <ToggleSwitch IsEnabled="{x:Bind AlbumArtLayoutSettings.ShowTitle, Mode=OneWay}" IsOn="{x:Bind AlbumArtLayoutSettings.ShowArtists, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
                 </StackPanel>
             </Grid>
         </ScrollViewer>
-
     </Grid>
 </UserControl>

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

@@ -1,3 +1,4 @@
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
@@ -22,11 +23,18 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class AlbumArtLayoutSettingsControl : UserControl
     {
-        public AlbumArtLayoutSettingsControlViewModel ViewModel => (AlbumArtLayoutSettingsControlViewModel)DataContext;
+        public static readonly DependencyProperty AlbumArtLayoutSettingsProperty =
+            DependencyProperty.Register(nameof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettings), typeof(AlbumArtLayoutSettingsControl), new PropertyMetadata(default));
+
+        public AlbumArtLayoutSettings AlbumArtLayoutSettings
+        {
+            get => (AlbumArtLayoutSettings)GetValue(AlbumArtLayoutSettingsProperty);
+            set => SetValue(AlbumArtLayoutSettingsProperty, value);
+        }
+
         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/AppSettingsControl.xaml

@@ -50,126 +50,28 @@
                             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" />
-                            <ComboBoxItem x:Uid="SettingsPageAutoStartPIPLyrics" />
-                        </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 x:Uid="SettingsPageListenNewSession" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF270;}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.ListenOnNewPlaybackSource, Mode=TwoWay}" />
                     </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 x:Uid="SettingsPageShowHideHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ShowOrHideLyricsWindowShortcut, 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 x:Uid="SettingsPageBorderlessHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.BorderlessShortcut, Mode=TwoWay}" />
                     </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 x:Uid="SettingsPageClickThroughHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.ClickThroughShortcut, 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 x:Uid="SettingsPageLyricsWindowSwitchHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                        <local:ShortcutTextBox Shortcut="{x:Bind ViewModel.AppSettings.GeneralSettings.LyricsWindowSwitchShortcut, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
                     <!--  Playback shortcut  -->

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

@@ -1,5 +1,8 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;

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

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.DemoWindowGrid"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid
+        Width="{x:Bind LyricsWindowStatus.DemoMonitorBounds.Width, Mode=OneWay}"
+        Height="{x:Bind LyricsWindowStatus.DemoMonitorBounds.Height, Mode=OneWay}"
+        Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+        CornerRadius="4">
+        <Grid
+            Width="{x:Bind LyricsWindowStatus.DemoWindowBounds.Width, Mode=OneWay}"
+            Height="{x:Bind LyricsWindowStatus.DemoWindowBounds.Height, Mode=OneWay}"
+            Margin="{x:Bind LyricsWindowStatus.DemoWindowBounds, Converter={StaticResource RectToMarginConverter}, Mode=OneWay}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="{ThemeResource AccentAcrylicBackgroundFillColorDefaultBrush}"
+            BorderBrush="{ThemeResource AccentFillColorDefaultBrush}"
+            CornerRadius="4">
+            <interactivity:Interaction.Behaviors>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind LyricsWindowStatus.IsBorderless, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="True">
+                    <interactivity:ChangePropertyAction PropertyName="BorderThickness" Value="0" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind LyricsWindowStatus.IsBorderless, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="False">
+                    <interactivity:ChangePropertyAction PropertyName="BorderThickness" Value="1" />
+                </interactivity:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+        </Grid>
+        <!--  Is default  -->
+        <Grid
+            Margin="4"
+            Padding="6,3"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            CornerRadius="4"
+            Opacity="0.7"
+            Visibility="{x:Bind LyricsWindowStatus.IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <TextBlock
+                x:Uid="DemoWindowControlDefault"
+                FontSize="12"
+                TextWrapping="Wrap" />
+        </Grid>
+        <!--  Is always on top  -->
+        <Grid
+            Margin="4"
+            Padding="6,3"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            CornerRadius="4"
+            Opacity="0.7"
+            Visibility="{x:Bind LyricsWindowStatus.IsAlwaysOnTop, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <FontIcon
+                FontFamily="{StaticResource IconFontFamily}"
+                FontSize="12"
+                Glyph="&#xE718;" />
+            <FontIcon
+                FontFamily="{StaticResource IconFontFamily}"
+                FontSize="12"
+                Glyph="&#xE841;"
+                Visibility="{x:Bind LyricsWindowStatus.IsAlwaysOnTopPolling, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
+        </Grid>
+        <!--  Moniter name  -->
+        <Grid
+            Margin="4"
+            Padding="6,3"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Bottom"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            CornerRadius="4"
+            Opacity="0.7">
+            <TextBlock
+                FontSize="12"
+                Text="{x:Bind LyricsWindowStatus.MonitorDeviceName, Mode=OneWay}"
+                TextWrapping="Wrap" />
+        </Grid>
+        <!--  Config name  -->
+        <Grid
+            Padding="6,3"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            CornerRadius="4"
+            Opacity="0.7">
+            <TextBlock
+                FontWeight="ExtraBlack"
+                Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}"
+                TextWrapping="Wrap" />
+        </Grid>
+    </Grid>
+
+</UserControl>

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

@@ -0,0 +1,37 @@
+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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using BetterLyrics.WinUI3.Models;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class DemoWindowGrid : UserControl
+{
+    public DemoWindowGrid()
+    {
+        InitializeComponent();
+    }
+
+    public static readonly DependencyProperty LyricsWindowStatusProperty =
+        DependencyProperty.Register(nameof(LyricsWindowStatus), typeof(LyricsWindowStatus), typeof(DemoWindowGrid), new PropertyMetadata(default));
+
+    public LyricsWindowStatus LyricsWindowStatus
+    {
+        get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
+        set => SetValue(LyricsWindowStatusProperty, value);
+    }
+}

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

@@ -4,54 +4,58 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <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}" />
+    <StackPanel>
+
         <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"
+            TickPlacement="None"
             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 HorizontalAlignment="Right" Orientation="Horizontal">
+            <Button
+                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"
+                VerticalAlignment="Center"
+                Click="SubtractButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE738;}"
+                Style="{StaticResource GhostButtonStyle}" />
+
+            <StackPanel
+                Margin="3,-2,3,0"
+                Orientation="Horizontal"
+                Spacing="2">
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind Value, Mode=OneWay}" />
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind Unit, Mode=OneWay}" />
+            </StackPanel>
+
+            <Button
+                x:Name="AddButton"
+                VerticalAlignment="Center"
+                Click="AddButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE710;}"
+                Style="{StaticResource GhostButtonStyle}" />
+        </StackPanel>
+
     </StackPanel>
 </UserControl>

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

@@ -18,60 +18,112 @@
                     <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}}">
+                        <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind 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:SettingsExpander
+                        x:Uid="SettingsPagePureLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEB42;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
 
-                    <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="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.PureColorOverlayOpacity, 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:SettingsExpander.Items>
+                    </controls:SettingsExpander>
 
-                    <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:SettingsExpander
+                        x:Uid="SettingsPageAlbumArtLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE93C;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+
+                            <controls:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlayOpacity, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageSpeed" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="50"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlaySpeed, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageBlurAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="0"
+                                    Frequency="1"
+                                    Maximum="10"
+                                    Minimum="0"
+                                    Value="{x:Bind LyricsBackgroundSettings.CoverAcrylicEffectAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageFluidLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEDA8;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+
+                            <controls:SettingsCard x:Uid="SettingsPageOpacity" IsEnabled="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
+                                <uc:ExtendedSlider
+                                    Default="100"
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsBackgroundSettings.FluidOverlayOpacity, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageSpectrumLayer"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF61F;}"
+                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                    </controls:SettingsExpander>
 
-                    <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>

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

@@ -1,3 +1,4 @@
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
@@ -22,12 +23,18 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class LyricsBackgroundSettingsControl : UserControl
     {
-        public LyricsBackgroundSettingsControlViewModel ViewModel => (LyricsBackgroundSettingsControlViewModel)DataContext;
+        public static readonly DependencyProperty LyricsBackgroundSettingsProperty =
+            DependencyProperty.Register(nameof(LyricsBackgroundSettings), typeof(LyricsBackgroundSettings), typeof(LyricsBackgroundSettingsControl), new PropertyMetadata(default));
+
+        public LyricsBackgroundSettings LyricsBackgroundSettings
+        {
+            get => (LyricsBackgroundSettings)GetValue(LyricsBackgroundSettingsProperty);
+            set => SetValue(LyricsBackgroundSettingsProperty, value);
+        }
 
         public LyricsBackgroundSettingsControl()
         {
             InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<LyricsBackgroundSettingsControlViewModel>();
         }
     }
 }

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

@@ -13,61 +13,61 @@
 
     <Grid Padding="16" RowSpacing="6">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Margin="0,0,0,6">
-            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                <controls:SettingsExpander x:Uid="LyricsSearchControlSongInfoMapping" IsExpanded="True">
-                    <controls:SettingsExpander.Items>
-                        <controls:SettingsCard x:Uid="LyricsSearchControlTitle" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalTitle, Mode=OneWay}">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
-                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedTitle, Mode=TwoWay}" TextWrapping="Wrap" />
-                                <Button
-                                    VerticalAlignment="Center"
-                                    Command="{x:Bind ViewModel.ResetMappedTitleCommand}"
-                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                          FontSize=12,
-                                                          Glyph=&#xE777;}"
-                                    Style="{StaticResource GhostButtonStyle}" />
-                            </StackPanel>
-                        </controls:SettingsCard>
-                        <controls:SettingsCard x:Uid="LyricsSearchControlArtist" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalArtist, Mode=OneWay}">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
-                                <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}" TextWrapping="Wrap" />
-                                <Button
-                                    VerticalAlignment="Center"
-                                    Command="{x:Bind ViewModel.ResetMappedArtistCommand}"
-                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                          FontSize=12,
-                                                          Glyph=&#xE777;}"
-                                    Style="{StaticResource GhostButtonStyle}" />
-                            </StackPanel>
-                        </controls:SettingsCard>
-                        <controls:SettingsCard>
-                            <CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
-                        </controls:SettingsCard>
-                    </controls:SettingsExpander.Items>
-                </controls:SettingsExpander>
-
-                <controls:SettingsCard x:Uid="LyricsSearchControlTargetSearchProvider">
-                    <Button
-                        x:Uid="LyricsSearchControlSearch"
-                        Command="{x:Bind ViewModel.SearchCommand}"
-                        Style="{StaticResource AccentButtonStyle}" />
-                </controls:SettingsCard>
-            </StackPanel>
-        </Grid>
-        <!--  结果列表及原始歌词文件展示区域  -->
-        <Grid Grid.Row="1">
+        <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <Grid Grid.Column="0" RowSpacing="12">
+            <Grid Grid.Column="0">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                    <controls:SettingsExpander x:Uid="LyricsSearchControlSongInfoMapping" IsExpanded="True">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="LyricsSearchControlTitle" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalTitle, Mode=OneWay}">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
+                                    <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedTitle, Mode=TwoWay}" TextWrapping="Wrap" />
+                                    <Button
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind ViewModel.ResetMappedTitleCommand}"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE777;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </StackPanel>
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="LyricsSearchControlArtist" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalArtist, Mode=OneWay}">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
+                                    <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedArtist, Mode=TwoWay}" TextWrapping="Wrap" />
+                                    <Button
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind ViewModel.ResetMappedArtistCommand}"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE777;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </StackPanel>
+                            </controls:SettingsCard>
+                            <controls:SettingsCard>
+                                <CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsCard x:Uid="LyricsSearchControlTargetSearchProvider">
+                        <Button
+                            x:Uid="LyricsSearchControlSearch"
+                            Command="{x:Bind ViewModel.SearchCommand}"
+                            Style="{StaticResource AccentButtonStyle}" />
+                    </controls:SettingsCard>
+
+                </StackPanel>
+            </Grid>
+            <Grid Grid.Column="1">
                 <ListView ItemsSource="{x:Bind ViewModel.LyricsSearchResults, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLyricsSearchResult, Mode=TwoWay}">
                     <ListView.ItemTemplate>
                         <DataTemplate>
@@ -144,8 +144,8 @@
                     ShowPaused="False"
                     Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
             </Grid>
-            <Grid Grid.Column="1">
-                <ListView SelectedItem="{x:Bind ViewModel.SelectedLyricsLine, Mode=TwoWay}" ItemsSource="{x:Bind ViewModel.LyricsData.LyricsLines, Mode=OneWay}">
+            <Grid Grid.Column="2">
+                <ListView ItemsSource="{x:Bind ViewModel.LyricsData.LyricsLines, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLyricsLine, Mode=TwoWay}">
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
                             Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
@@ -197,13 +197,13 @@
                 </StackPanel>
             </Grid>
         </Grid>
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="1">
             <RelativePanel>
                 <TextBlock
                     x:Uid="LyricsSearchControlHelp"
                     Margin="0,0,24,0"
                     FontSize="12"
-                    Foreground="{StaticResource TextFillColorSecondaryBrush}"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                     RelativePanel.AlignVerticalCenterWithPanel="True"
                     RelativePanel.LeftOf="Reset"
                     TextWrapping="Wrap" />

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

@@ -175,14 +175,25 @@
                         </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:SettingsExpander
+                        x:Uid="SettingsPageLyricsFontSize"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE8E9;}"
+                        IsExpanded="True">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageDynamicLyricsFontSize">
+                                <ToggleSwitch IsOn="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard IsEnabled="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Frequency="2"
+                                    Maximum="96"
+                                    Minimum="12"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsStyleSettings.LyricsFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
 
                     <controls:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
                         <local:ExtendedSlider

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

@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsWindowSettingsControl"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid ColumnSpacing="6">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+                <Grid Style="{StaticResource SettingsGridStyle}">
+
+                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                        <TextBlock
+                            x:Uid="SettingsPageRecordedWindowStatus"
+                            RelativePanel.AlignLeftWithPanel="True"
+                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <Button x:Uid="SettingsPageCreateFromCurrent" Command="{x:Bind ViewModel.CopyLyricsWindowStatusCommand}" />
+                        <Button
+                            x:Uid="SettingsPageCreateFromTemplates"
+                            VerticalAlignment="Center"
+                            RelativePanel.AlignRightWithPanel="True">
+                            <Button.Flyout>
+                                <MenuFlyout>
+                                    <MenuFlyoutItem x:Uid="SettingsPageStandardMode" Command="{x:Bind ViewModel.CreateStandardLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageDesktopMode" Command="{x:Bind ViewModel.CreateTransparentLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageDockedMode" Command="{x:Bind ViewModel.CreateDockedLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageFullscreenMode" Command="{x:Bind ViewModel.CreateFullLyricsWindowStatusCommand}" />
+                                    <MenuFlyoutItem x:Uid="SettingsPageNarrowMode" Command="{x:Bind ViewModel.CreateNarrowLyricsWindowStatusCommand}" />
+                                </MenuFlyout>
+                            </Button.Flyout>
+                        </Button>
+
+                        <StackPanel
+                            Padding="24,0"
+                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                            CornerRadius="4"
+                            Spacing="16"
+                            Visibility="{Binding ElementName=LyricsWindowManagerExpander, Path=IsExpanded, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+
+                            <ListView
+                                x:Name="WindowStatusListView"
+                                Padding="0,12"
+                                CornerRadius="4"
+                                ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+                                SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel
+                                            Padding="0,10"
+                                            RightTapped="StackPanel_RightTapped"
+                                            Spacing="6">
+                                            <StackPanel.ContextFlyout>
+                                                <MenuBarItemFlyout>
+                                                    <MenuFlyoutItem
+                                                        x:Uid="LyricsWindowSettingsControlSetDefault"
+                                                        Click="SetDefaultMenuFlyoutItem_Click"
+                                                        IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
+                                                    <MenuFlyoutItem
+                                                        x:Uid="SettingsPageDelete"
+                                                        Click="DeleteMenuFlyoutItem_Click"
+                                                        IsEnabled="{Binding IsDefault, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
+                                                </MenuBarItemFlyout>
+                                            </StackPanel.ContextFlyout>
+                                            <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </StackPanel>
+
+                    </StackPanel>
+
+                </Grid>
+            </ScrollViewer>
+        </Grid>
+        <Grid Grid.Column="1">
+
+            <controls:SwitchPresenter Margin="0,100,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
+                <controls:SwitchPresenter.ContentTransitions>
+                    <TransitionCollection>
+                        <PopupThemeTransition />
+                    </TransitionCollection>
+                </controls:SwitchPresenter.ContentTransitions>
+
+                <!--  General  -->
+                <controls:Case Value="General">
+                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+                        <Grid Style="{StaticResource SettingsGridStyle}">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                                <controls:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8AC;}">
+                                    <StackPanel
+                                        Margin="0,6,0,0"
+                                        Orientation="Horizontal"
+                                        Spacing="6">
+                                        <TextBox Text="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
+                                        <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageDisplayTypeSwitcher"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xF246;}"
+                                    IsExpanded="True">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsDisplayType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <ComboBoxItem x:Uid="MainPageAlbumArtOnly" />
+                                        <ComboBoxItem x:Uid="MainPageLyriscOnly" />
+                                        <ComboBoxItem x:Uid="MainPageSplitView" />
+                                    </ComboBox>
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageLayoutOrientation">
+                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsLayoutOrientation, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                                <ComboBoxItem x:Uid="SettingsPageLayoutOrientationHorizontal" />
+                                                <ComboBoxItem x:Uid="SettingsPageLayoutOrientationVertical" />
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageAdaptEnvColor"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xE88F;}"
+                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=TwoWay}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageEnvColorSample" Header="Environment color sample mode">
+                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.EnvironmentSampleMode, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleBelow" />
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleAbove" />
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleInner" />
+                                                <ComboBoxItem x:Uid="SettingsPageEnvColorSampleEdge" />
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <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.LiveStates.LyricsWindowStatus.MonitorDeviceName, Mode=TwoWay}" />
+                                        <Button
+                                            Command="{x:Bind ViewModel.RefreshMonitorDeviceNamesCommand}"
+                                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                                  FontSize=12,
+                                                                  Glyph=&#xE72C;}"
+                                            Style="{StaticResource GhostButtonStyle}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageWindowBounds"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xF16B;}"
+                                    IsExpanded="True">
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard Header="X">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Right, Mode=OneWay}"
+                                                Minimum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Left, Mode=OneWay}"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowX, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard Header="Y">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom, Mode=OneWay}"
+                                                Minimum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Top, Mode=OneWay}"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowY, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard x:Uid="SettingsPageWidth">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Width, Mode=OneWay}"
+                                                Minimum="64"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard x:Uid="SettingsPageHeight">
+                                            <uc:ExtendedSlider
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
+                                                Minimum="64"
+                                                ResetButtonVisibility="Collapsed"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowHeight, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageAOT"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xE718;}"
+                                    IsExpanded="True">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=TwoWay}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageForceAlwaysOnTop" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTop, Mode=OneWay}">
+                                            <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAlwaysOnTopPolling, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageWorkArea"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xE78B;}"
+                                    IsExpanded="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=TwoWay}" />
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageWorkAreaHeight" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                            <uc:ExtendedSlider
+                                                Default="64"
+                                                Frequency="1"
+                                                Maximum="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}"
+                                                Minimum="64"
+                                                Unit="px"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockHeight, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+
+                                        <controls:SettingsCard x:Uid="SettingsPageDockPlacement" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                            <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                                <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
+                                                <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
+                                <controls:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                            </StackPanel>
+                        </Grid>
+                    </ScrollViewer>
+                </controls:Case>
+
+                <!--  Album art area style  -->
+                <controls:Case Value="AlbumArtStyle">
+                    <uc:AlbumArtLayoutSettingsControl AlbumArtLayoutSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.AlbumArtLayoutSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Lyrics style and effect  -->
+                <controls:Case Value="Lyrics">
+                    <uc:LyricsSettingsControl LyricsEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" LyricsStyleSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Lyrics background  -->
+                <controls:Case Value="LyricsBackground">
+                    <uc:LyricsBackgroundSettingsControl LyricsBackgroundSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Advanced  -->
+                <controls:Case Value="Advanced">
+                    <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+                        <Grid Style="{StaticResource SettingsGridStyle}">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                                <controls:SettingsCard x:Uid="SettingsPageShowInSwitchers" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C4;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsShownInSwitchers, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageClickThrough" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C9;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsClickThrough, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageBorderless" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8B2;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsBorderless, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageDragArea" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB41;}">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.TitleBarArea, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaNone" />
+                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaTop" />
+                                        <ComboBoxItem x:Uid="SettingsPageTitleBarAreaWhole" />
+                                    </ComboBox>
+                                </controls:SettingsCard>
+
+                            </StackPanel>
+                        </Grid>
+                    </ScrollViewer>
+                </controls:Case>
+
+            </controls:SwitchPresenter>
+
+            <Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <ListView
+                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                        ScrollViewer.HorizontalScrollMode="Enabled"
+                        ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                        ScrollViewer.VerticalScrollMode="Disabled"
+                        SelectionChanged="ListView_SelectionChanged">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <ItemsStackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+                        <ListView.Items>
+
+                            <ListViewItem Tag="General">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xECAA;" />
+                                    <TextBlock x:Uid="AppSettingsControlGeneral" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="AlbumArtStyle">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE93C;" />
+                                    <TextBlock x:Uid="SettingsPageAlbumStyle" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="Lyrics">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xEDC6;" />
+                                    <TextBlock x:Uid="SettingsPageLyrics" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="LyricsBackground">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xF5EF;" />
+                                    <TextBlock x:Uid="SettingsPageBackgroundOverlay" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                            <ListViewItem Tag="Advanced">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <FontIcon
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xEC7A;" />
+                                    <TextBlock x:Uid="SettingsPageAdvanced" VerticalAlignment="Center" />
+                                </StackPanel>
+                            </ListViewItem>
+
+                        </ListView.Items>
+
+                    </ListView>
+
+                </StackPanel>
+            </Grid>
+
+        </Grid>
+    </Grid>
+</UserControl>

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

@@ -0,0 +1,84 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using NTextCat.Commons;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using static Vanara.PInvoke.ComCtl32;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class LyricsWindowSettingsControl : UserControl
+    {
+        public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
+
+        private ISettingsService _settingsService;
+
+        public LyricsWindowSettingsControl()
+        {
+            InitializeComponent();
+            DataContext = Ioc.Default.GetRequiredService<LyricsWindowSettingsControlViewModel>();
+            _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        }
+
+        private void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuFlyoutItem menuFlyoutItem)
+            {
+                var data = menuFlyoutItem.DataContext as LyricsWindowStatus;
+                if (data != null)
+                {
+                    ViewModel.AppSettings.WindowBoundsRecords.Remove(data);
+                }
+            }
+        }
+
+        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ViewModel?.ListViewSelectedItemTag = ((sender as ListView)!.SelectedItem as ListViewItem)!.Tag;
+        }
+
+        private void SetDefaultMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is MenuFlyoutItem menuFlyoutItem)
+            {
+                var data = menuFlyoutItem.DataContext as LyricsWindowStatus;
+                if (data != null)
+                {
+                    ViewModel.AppSettings.WindowBoundsRecords.ForEach(x => x.IsDefault = false);
+                    data.IsDefault = true;
+                }
+            }
+        }
+
+        private void StackPanel_RightTapped(object sender, RightTappedRoutedEventArgs e)
+        {
+            if (sender is StackPanel stackPanel)
+            {
+                if (stackPanel.DataContext is MenuBarItemFlyout menuBarItemFlyout)
+                {
+                    menuBarItemFlyout.ShowAt(stackPanel);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsWindowSwitchControl"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="using:BetterLyrics.WinUI3.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+        CornerRadius="12">
+        <Button
+            Margin="12"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Click="Button_Click"
+            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                  Glyph=&#xE653;}"
+            Style="{StaticResource GhostButtonStyle}" />
+        <ListView
+            Margin="48"
+            ItemsSource="{x:Bind ViewModel.AppSettings.WindowBoundsRecords, Mode=OneWay}"
+            SelectedItem="{x:Bind ViewModel.LiveStates.LyricsWindowStatus, Mode=TwoWay}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <controls:WrapPanel HorizontalSpacing="0" VerticalSpacing="0" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid
+                        Margin="0,10"
+                        Padding="5"
+                        AllowFocusOnInteraction="True"
+                        CornerRadius="4"
+                        Tapped="Grid_Tapped">
+                        <uc:DemoWindowGrid LyricsWindowStatus="{Binding}" />
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</UserControl>

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

@@ -1,4 +1,6 @@
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.ViewModels;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -20,13 +22,24 @@ using Windows.Foundation.Collections;
 
 namespace BetterLyrics.WinUI3.Controls
 {
-    public sealed partial class AllLyricsSettingsControl : UserControl
+    public sealed partial class LyricsWindowSwitchControl : UserControl
     {
-        public AllLyricsSettingsControlViewModel ViewModel => (AllLyricsSettingsControlViewModel)DataContext;
-        public AllLyricsSettingsControl()
+        public LyricsWindowSwitchControlViewModel ViewModel => (LyricsWindowSwitchControlViewModel)DataContext;
+
+        public LyricsWindowSwitchControl()
         {
             InitializeComponent();
-            DataContext = Ioc.Default.GetRequiredService<AllLyricsSettingsControlViewModel>();
+            DataContext = Ioc.Default.GetRequiredService<LyricsWindowSwitchControlViewModel>();
+        }
+
+        private void Grid_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.HideWindow<LyricsWindowSwitchWindow>();
         }
     }
 }

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

@@ -122,8 +122,15 @@
                     </StackPanel>
                 </Grid>
             </ScrollViewer>
+
+            <!--  播放源列表  -->
             <ListView
+                x:Name="MediaSourceProvidersListView"
                 VerticalAlignment="Top"
+                AllowDrop="True"
+                CanDragItems="True"
+                CanReorderItems="True"
+                DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
                 ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                 ScrollViewer.HorizontalScrollMode="Enabled"
@@ -138,6 +145,10 @@
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="models:MediaSourceProviderInfo">
                         <StackPanel Orientation="Horizontal" Spacing="6">
+                            <FontIcon
+                                FontFamily="Segoe UI Symbol"
+                                FontSize="12"
+                                Glyph="&#x283F;" />
                             <ImageIcon Height="16" Source="{Binding Provider, Converter={StaticResource MediaSourceProviderToLogoUriConverter}, Mode=OneWay}" />
                             <TextBlock
                                 MaxWidth="200"
@@ -162,6 +173,7 @@
                 </interactivity:DataTriggerBehavior>
             </interactivity:Interaction.Behaviors>
         </Grid>
+
         <StackPanel
             Grid.Column="0"
             HorizontalAlignment="Center"
@@ -191,6 +203,132 @@
             <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
                 <Grid Style="{StaticResource SettingsGridStyle}">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                        <!--  Provider info  -->
+                        <TextBlock x:Uid="SettingsPageRealtimeStatus" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <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>
+
+                        <!--  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" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.SelectedTargetLanguageIndex, Mode=TwoWay}">
+                                        <ComboBoxItem Content="العربية" Tag="ar" />
+                                        <ComboBoxItem Content="Azərbaycan dili" Tag="az" />
+                                        <ComboBoxItem Content="Български" Tag="bg" />
+                                        <ComboBoxItem Content="বাংলা" Tag="bn" />
+                                        <ComboBoxItem Content="Català" Tag="ca" />
+                                        <ComboBoxItem Content="Čeština" Tag="cs" />
+                                        <ComboBoxItem Content="Dansk" Tag="da" />
+                                        <ComboBoxItem Content="Deutsch" Tag="de" />
+                                        <ComboBoxItem Content="Ελληνικά" Tag="el" />
+                                        <ComboBoxItem Content="English" Tag="en" />
+                                        <ComboBoxItem Content="Esperanto" Tag="eo" />
+                                        <ComboBoxItem Content="Español" Tag="es" />
+                                        <ComboBoxItem Content="Eesti" Tag="et" />
+                                        <ComboBoxItem Content="Euskara" Tag="eu" />
+                                        <ComboBoxItem Content="فارسی" Tag="fa" />
+                                        <ComboBoxItem Content="Suomi" Tag="fi" />
+                                        <ComboBoxItem Content="Français" Tag="fr" />
+                                        <ComboBoxItem Content="Gaeilge" Tag="ga" />
+                                        <ComboBoxItem Content="Galego" Tag="gl" />
+                                        <ComboBoxItem Content="עברית" Tag="he" />
+                                        <ComboBoxItem Content="हिन्दी" Tag="hi" />
+                                        <ComboBoxItem Content="Magyar" Tag="hu" />
+                                        <ComboBoxItem Content="Bahasa Indonesia" Tag="id" />
+                                        <ComboBoxItem Content="Italiano" Tag="it" />
+                                        <ComboBoxItem Content="日本語" Tag="ja" />
+                                        <ComboBoxItem Content="한국어" Tag="ko" />
+                                        <ComboBoxItem Content="Кыргызча" Tag="ky" />
+                                        <ComboBoxItem Content="Lietuvių" Tag="lt" />
+                                        <ComboBoxItem Content="Latviešu" Tag="lv" />
+                                        <ComboBoxItem Content="Bahasa Melayu" Tag="ms" />
+                                        <ComboBoxItem Content="Norsk bokmål" Tag="nb" />
+                                        <ComboBoxItem Content="Nederlands" Tag="nl" />
+                                        <ComboBoxItem Content="Português (Brasil)" Tag="pt-BR" />
+                                        <ComboBoxItem Content="Polski" Tag="pl" />
+                                        <ComboBoxItem Content="Português" Tag="pt" />
+                                        <ComboBoxItem Content="Română" Tag="ro" />
+                                        <ComboBoxItem Content="Русский" Tag="ru" />
+                                        <ComboBoxItem Content="Slovenčina" Tag="sk" />
+                                        <ComboBoxItem Content="Slovenščina" Tag="sl" />
+                                        <ComboBoxItem Content="Shqip" Tag="sq" />
+                                        <ComboBoxItem Content="Српски" Tag="sr" />
+                                        <ComboBoxItem Content="Svenska" Tag="sv" />
+                                        <ComboBoxItem Content="ไทย" Tag="th" />
+                                        <ComboBoxItem Content="Filipino" Tag="tl" />
+                                        <ComboBoxItem Content="Türkçe" Tag="tr" />
+                                        <ComboBoxItem Content="Українська" Tag="uk" />
+                                        <ComboBoxItem Content="اردو" Tag="ur" />
+                                        <ComboBoxItem Content="Tiếng Việt" Tag="vi" />
+                                        <ComboBoxItem Content="中文" Tag="zh" />
+                                    </ComboBox>
+                                </controls:SettingsCard>
+                                <controls:SettingsCard x:Uid="SettingsPageTranslationConfig" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
+                                    <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>
+
+                        <!--  Lyrics phonetic  -->
+                        <controls:SettingsExpander
+                            x:Uid="SettingsPageChinese"
+                            IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}"
+                            IsExpanded="True">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsChineseRomanizationEnabled, Mode=TwoWay}" />
+                            <controls:SettingsExpander.Items>
+                                <controls:SettingsCard>
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.TranslationSettings.ChineseRomanization, Converter={StaticResource EnumToIntConverter}, Mode=TwoWay}">
+                                        <ComboBoxItem x:Uid="SettingsPagePinyin" />
+                                        <ComboBoxItem x:Uid="SettingsPageJyutping" />
+                                    </ComboBox>
+                                </controls:SettingsCard>
+                            </controls:SettingsExpander.Items>
+                        </controls:SettingsExpander>
+                        <controls:SettingsCard x:Uid="SettingsPageJapanese" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=TwoWay}" />
+                        </controls:SettingsCard>
+
+                        <!--  中文简体繁体偏好  -->
+                        <controls:SettingsCard x:Uid="SettingsPageChinesePreference">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTraditionalChineseEnabled, Mode=TwoWay}" />
+                        </controls:SettingsCard>
+
                         <!--  Last.fm  -->
                         <TextBlock x:Uid="SettingsPageLastFM" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
                         <controls:SettingsExpander
@@ -222,85 +360,7 @@
                                 </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>
@@ -315,6 +375,28 @@
                                     IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
                             </StackPanel>
                         </controls:SettingsCard>
+
+                        <!--  Apple Music token  -->
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="media-user-token (for Apple Muisc)" />
+                        <controls:SettingsCard
+                            Background="{ThemeResource SystemFillColorCautionBackgroundBrush}"
+                            Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                            Header="Use at your own risk">
+                            <StackPanel Orientation="Horizontal" Spacing="6">
+                                <TextBox
+                                    MaxWidth="250"
+                                    PlaceholderText="media-user-token"
+                                    Text="{x:Bind ViewModel.AppleMusicMediaUserToken, Mode=TwoWay}"
+                                    TextWrapping="Wrap" />
+                                <Button
+                                    Command="{x:Bind ViewModel.SaveAppleMusicMediaUserTokenCommand}"
+                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                          FontSize=12,
+                                                          Glyph=&#xE8FB;}"
+                                    Style="{StaticResource GhostButtonStyle}" />
+                            </StackPanel>
+                        </controls:SettingsCard>
+
                     </StackPanel>
                 </Grid>
             </ScrollViewer>

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

@@ -41,5 +41,11 @@ namespace BetterLyrics.WinUI3.Controls
             // <20><> LyricsSearchProvidersInfo <20><><EFBFBD><EFBFBD> CollectionChanged <20>¼<EFBFBD>
             ViewModel.SelectedMediaSourceProvider?.LyricsSearchProvidersInfo?.Refresh();
         }
+
+        private void MediaSourceProvidersListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+        {
+            // <20><> MediaSourceProvidersInfo <20><><EFBFBD><EFBFBD> CollectionChanged <20>¼<EFBFBD>
+            ViewModel.AppSettings.MediaSourceProvidersInfo?.Refresh();
+        }
     }
 }

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

@@ -50,12 +50,6 @@
                     Command="{x:Bind ViewModel.ResetWindowPositionCommand}"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                        Glyph=}" />
-                <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"

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

@@ -19,6 +19,7 @@ namespace BetterLyrics.WinUI3.Converter
                     LyricsSearchProvider.Netease => "网易云音乐",
                     LyricsSearchProvider.Kugou => "酷狗音乐",
                     LyricsSearchProvider.AmllTtmlDb => "amll-ttml-db",
+                    LyricsSearchProvider.AppleMusic => "Apple Music",
                     LyricsSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
                     LyricsSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),
                     LyricsSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderEslrcFile"),

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

@@ -33,6 +33,10 @@ namespace BetterLyrics.WinUI3.Converter
                     PlayerID.Edge => PlayerName.Edge,
                     PlayerID.BetterLyrics => PlayerName.BetterLyrics,
                     PlayerID.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
+                    PlayerID.SaltPlayerForWindows => PlayerName.SaltPlayerForWindows,
+                    PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
+                    PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
+                    PlayerID.Listen1 => PlayerName.Listen1,
                     _ => provider,
                 };
             }

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

@@ -2,10 +2,6 @@
 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
 {
@@ -19,6 +15,7 @@ namespace BetterLyrics.WinUI3.Converter
                 {
                     PlayerID.Spotify => PathHelper.SpotifyLogoPath,
                     PlayerID.AppleMusic => PathHelper.AppleMusicLogoPath,
+                    PlayerID.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
                     PlayerID.iTunes  => PathHelper.iTunesLogoPath,
                     PlayerID.KugouMusic => PathHelper.KugouMusicLogoPath,
                     PlayerID.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
@@ -33,6 +30,10 @@ namespace BetterLyrics.WinUI3.Converter
                     PlayerID.Edge => PathHelper.EdgeLogoPath,
                     PlayerID.BetterLyrics => PathHelper.LogoPath,
                     PlayerID.BetterLyricsDebug => PathHelper.LogoPath,
+                    PlayerID.SaltPlayerForWindows => PathHelper.SaltPlayerForWindowsLogoPath,
+                    PlayerID.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
+                    PlayerID.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
+                    PlayerID.Listen1 => PathHelper.Listen1LogoPath,
                     _ => PathHelper.UnknownPlayerLogoPath,
                 };
             }

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

@@ -0,0 +1,26 @@
+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 RectToMarginConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is Windows.Foundation.Rect rect)
+            {
+                return new Microsoft.UI.Xaml.Thickness(rect.X, rect.Y, 0, 0);
+            }
+            return new Microsoft.UI.Xaml.Thickness(0);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -19,6 +19,7 @@ namespace BetterLyrics.WinUI3.Converter
                     TranslationSearchProvider.Netease => "网易云音乐",
                     TranslationSearchProvider.Kugou => "酷狗音乐",
                     TranslationSearchProvider.AmllTtmlDb => "amll-ttml-db",
+                    TranslationSearchProvider.AppleMusic => "Apple Music",
                     TranslationSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
                     TranslationSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),
                     TranslationSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderEslrcFile"),

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

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

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

@@ -15,6 +15,7 @@ namespace BetterLyrics.WinUI3.Enums
         LocalLrcFile,
         LocalEslrcFile,
         LocalTtmlFile,
+        AppleMusic,
     }
 
     public static class LyricsSearchProviderExtensions
@@ -28,6 +29,7 @@ namespace BetterLyrics.WinUI3.Enums
                 LyricsSearchProvider.Netease => PathHelper.NeteaseLyricsCacheDirectory,
                 LyricsSearchProvider.Kugou => PathHelper.KugouLyricsCacheDirectory,
                 LyricsSearchProvider.AmllTtmlDb => PathHelper.AmllTtmlDbLyricsCacheDirectory,
+                LyricsSearchProvider.AppleMusic => PathHelper.AppleMusicCacheDirectory,
                 _ => throw new System.ArgumentOutOfRangeException(nameof(provider)),
             };
         }
@@ -41,6 +43,7 @@ namespace BetterLyrics.WinUI3.Enums
                 LyricsSearchProvider.Kugou => LyricsFormat.Krc,
                 LyricsSearchProvider.Netease => LyricsFormat.Lrc,
                 LyricsSearchProvider.AmllTtmlDb => LyricsFormat.Ttml,
+                LyricsSearchProvider.AppleMusic => LyricsFormat.Ttml,
                 LyricsSearchProvider.LocalLrcFile => LyricsFormat.Lrc,
                 LyricsSearchProvider.LocalEslrcFile => LyricsFormat.Eslrc,
                 LyricsSearchProvider.LocalTtmlFile => LyricsFormat.Ttml,
@@ -71,6 +74,7 @@ namespace BetterLyrics.WinUI3.Enums
                 LyricsSearchProvider.Kugou => TranslationSearchProvider.Kugou,
                 LyricsSearchProvider.Netease => TranslationSearchProvider.Netease,
                 LyricsSearchProvider.AmllTtmlDb => TranslationSearchProvider.AmllTtmlDb,
+                LyricsSearchProvider.AppleMusic => TranslationSearchProvider.AppleMusic,
                 LyricsSearchProvider.LocalMusicFile => TranslationSearchProvider.LocalMusicFile,
                 LyricsSearchProvider.LocalLrcFile => TranslationSearchProvider.LocalLrcFile,
                 LyricsSearchProvider.LocalEslrcFile => TranslationSearchProvider.LocalEslrcFile,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsWindowMode.cs

@@ -1,12 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum LyricsWindowMode
-    {
-        StandardMode,
-        DockMode,
-        DesktopMode,
-        PictureInPictureMode,
-    }
-}

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

@@ -8,10 +8,10 @@ namespace BetterLyrics.WinUI3.Enums
 {
     public enum ShortcutID
     {
-        DesktopLock,
-        DesktopToggle,
-        DockToggle,
-        PictureInPictureToggle,
+        LyricsWindowShowOrHide,
+        Borderless,
+        ClickThrough,
+        LyricsWindowSwitch,
         PlayOrPauseSong,
         NextSong,
         PreviousSong,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TitleBarArea.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public  enum TitleBarArea
+    {
+        None,
+        Top,
+        Whole,
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/TranslationSearchProvider.cs

@@ -13,6 +13,7 @@ namespace BetterLyrics.WinUI3.Enums
         Netease,
         LrcLib,
         AmllTtmlDb,
+        AppleMusic,
         LocalMusicFile,
         LocalLrcFile,
         LocalEslrcFile,

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

@@ -8,11 +8,11 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Events
 {
-    public class AlbumArtChangedEventArgs(byte[]? bytes, SoftwareBitmap? albumArtSwBitmap, Color? albumArtLightAccentColor, Color? albumArtDarkAccentColor) : EventArgs
+    public class AlbumArtChangedEventArgs(byte[]? bytes, SoftwareBitmap? albumArtSwBitmap, List<Color> albumArtLightAccentColors, List<Color> albumArtDarkAccentColors) : 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 List<Color> AlbumArtLightAccentColors { get; set; } = albumArtLightAccentColors;
+        public List<Color> AlbumArtDarkAccentColors { get; set; } = albumArtDarkAccentColors;
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppleMusic.cs

@@ -0,0 +1,126 @@
+using BetterLyrics.WinUI3.Constants;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class AppleMusic
+    {
+        private readonly HttpClient _client;
+        private string _accessToken = "";
+        private string _storefront = "";
+        private string _language = "";
+
+        public AppleMusic()
+        {
+            _client = new HttpClient();
+            _client.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36");
+            _client.DefaultRequestHeaders.Add("Accept", "application/json");
+            _client.DefaultRequestHeaders.Add("Origin", "https://music.apple.com");
+            _client.DefaultRequestHeaders.Add("Referer", "https://music.apple.com/");
+        }
+
+        public async Task<bool> InitAsync()
+        {
+            await GetAccessTokenAsync();
+            await SetMediaUserTokenAsync();
+            return
+                !string.IsNullOrEmpty(_accessToken) &&
+                !string.IsNullOrEmpty(PasswordVaultHelper.Get(Constants.App.AppName, Constants.AppleMusic.MediaUserTokenKey));
+        }
+
+        private async Task GetAccessTokenAsync()
+        {
+            var resp = await _client.GetStringAsync("https://music.apple.com/us/browse");
+            var jsMatch = Regex.Match(resp, "(?<=index)(.*?)(?=\\.js\")");
+            if (!jsMatch.Success) throw new Exception("Failed to find index.js");
+            var jsUrl = $"https://music.apple.com/assets/index{jsMatch.Value}.js";
+            var jsResp = await _client.GetStringAsync(jsUrl);
+            var tokenMatch = Regex.Match(jsResp, "(?=eyJh)(.*?)(?=\")");
+            if (!tokenMatch.Success) throw new Exception("Failed to find access token");
+            _accessToken = tokenMatch.Value;
+            _client.DefaultRequestHeaders.Remove("Authorization");
+            _client.DefaultRequestHeaders.Add("Authorization", $"Bearer {_accessToken}");
+        }
+
+        private async Task SetMediaUserTokenAsync()
+        {
+            _client.DefaultRequestHeaders.Remove("media-user-token");
+            _client.DefaultRequestHeaders.Add("media-user-token",
+                PasswordVaultHelper.Get(Constants.App.AppName, Constants.AppleMusic.MediaUserTokenKey));
+            var resp = await _client.GetStringAsync("https://amp-api.music.apple.com/v1/me/storefront");
+            var json = JsonSerializer.Deserialize(resp, Serialization.SourceGenerationContext.Default.JsonElement);
+            _storefront = json.GetProperty("data")[0].GetProperty("id").ToString();
+            _language = json.GetProperty("data")[0].GetProperty("attributes").GetProperty("defaultLanguageTag").ToString();
+            _client.DefaultRequestHeaders.Remove("Accept-Language");
+            _client.DefaultRequestHeaders.Add("Accept-Language", $"{_language},en;q=0.9");
+        }
+
+        public async Task<string?> GetLyricsAsync(string title, string artist)
+        {
+            string id = await SearchSongInfoAsync(artist, title);
+
+            var apiUrl = $"https://amp-api.music.apple.com/v1/catalog/{_storefront}/songs/{id}";
+            var url = apiUrl + $"?include[songs]=lyrics,syllable-lyrics&l={_language}";
+            var resp = await _client.GetStringAsync(url);
+            var json = JsonSerializer.Deserialize(resp, Serialization.SourceGenerationContext.Default.JsonElement);
+            var data = json.GetProperty("data");
+            if (data.GetArrayLength() == 0) return string.Empty;
+            var song = data[0];
+
+            if (!song.TryGetProperty("relationships", out var relationships))
+                return string.Empty;
+
+            if (relationships.TryGetProperty("syllable-lyrics", out var syllableLyrics) &&
+                syllableLyrics.GetProperty("data").GetArrayLength() > 0)
+            {
+                var syllableLyric = syllableLyrics.GetProperty("data")[0];
+                if (syllableLyric.TryGetProperty("attributes", out var attributes) &&
+                    attributes.TryGetProperty("ttml", out var ttml))
+                {
+                    string? raw = ttml.GetString();
+                    if (raw != null && raw.Contains("begin=") && raw.Contains("end="))
+                    {
+                        return raw;
+                    }
+                }
+            }
+
+            //if (relationships.TryGetProperty("lyrics", out var lyrics) &&
+            //    lyrics.GetProperty("data").GetArrayLength() > 0)
+            //{
+            //    var lyric = lyrics.GetProperty("data")[0];
+            //    if (lyric.TryGetProperty("attributes", out var attributes) &&
+            //        attributes.TryGetProperty("ttml", out var ttml))
+            //    {
+            //        return ttml.GetString();
+            //    }
+            //}
+
+            return null;
+        }
+
+        private async Task<string> SearchSongInfoAsync(string artist, string title)
+        {
+            var query = $"{artist} {title}";
+            var apiUrl = $"https://amp-api.music.apple.com/v1/catalog/{_storefront}/search";
+            var url = apiUrl + $"?term={WebUtility.UrlEncode(query)}&types=songs&limit=1&l={_language}";
+            var resp = await _client.GetStringAsync(url);
+            var json = JsonSerializer.Deserialize(resp, Serialization.SourceGenerationContext.Default.JsonElement);
+            var results = json.GetProperty("results");
+            if (results.TryGetProperty("songs", out var songs) && songs.GetProperty("data").GetArrayLength() > 0)
+            {
+                var song = songs.GetProperty("data")[0];
+                return song.GetProperty("id").ToString();
+            }
+            return string.Empty;
+        }
+    }
+}

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

@@ -74,9 +74,17 @@ namespace BetterLyrics.WinUI3.Helper
             using var ds = list.CreateDrawingSession();
             if (strokeWidth > 0)
             {
+                if (lyricsLine.TextGeometry == null)
+                {
+                    return list;
+                }
                 ds.DrawGeometry(lyricsLine.TextGeometry, lyricsLine.Position, strokeColor, strokeWidth); // 描边
             }
-            ds.FillGeometry(lyricsLine.TextGeometry, lyricsLine.Position, fontColor); // 填充
+            if (lyricsLine.CanvasTextLayout == null)
+            {
+                return list;
+            }
+            ds.DrawTextLayout(lyricsLine.CanvasTextLayout, lyricsLine.Position, fontColor); // 绘制文本（填充）
             return list;
         }
 

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

@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.Numerics;
 using Vanara.PInvoke;
 using Windows.UI;
 
@@ -94,6 +95,11 @@ namespace BetterLyrics.WinUI3.Helper
             return Color.FromArgb(alpha, color.R, color.G, color.B);
         }
 
+        public static Color WithOpacity(this Color color, float opacity)
+        {
+            return Color.FromArgb((byte)(opacity * 255), color.R, color.G, color.B);
+        }
+
         public static Color WithBrightness(this Color color, double brightness)
         {
             // 确保亮度因子在合理范围内
@@ -106,6 +112,11 @@ namespace BetterLyrics.WinUI3.Helper
             return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
         }
 
+        public static Vector3 ToVector3RGB(this Color color)
+        {
+            return new Vector3((float)color.R / 0xff, (float)color.G / 0xff, (float)color.B / 0xff);
+        }
+
         public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, string monitorDeviceName, WindowPixelSampleMode mode)
         {
             if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
@@ -116,15 +127,11 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 case WindowPixelSampleMode.BelowWindow:
                     {
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Bottom + 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Bottom + 2, screenWidth, 1);
                     }
                 case WindowPixelSampleMode.AboveWindow:
                     {
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Top - 1;
-                        return GetAverageColorFromScreenRegion(myRect.Left, sampleY, screenWidth, sampleHeight);
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top - 2, screenWidth, 1);
                     }
                 case WindowPixelSampleMode.WindowArea:
                     {
@@ -142,49 +149,21 @@ namespace BetterLyrics.WinUI3.Helper
                         if (width <= 0 || height <= 0)
                             return System.Drawing.Color.Transparent;
 
-                        var edgeThickness = new Thickness(36, 0, 36, 0);
+                        var edgeThickness = new Thickness(36, 36, 36, 36);
                         List<System.Drawing.Color> edgeColors = [];
 
                         // Top edge
-                        if (edgeThickness.Top > 0 && edgeThickness.Top < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top,
-                                    width,
-                                    (int)edgeThickness.Top
-                                )
-                            );
+                        if (edgeThickness.Top > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Left, myRect.Top - (int)edgeThickness.Top, width, (int)edgeThickness.Top));
                         // Bottom edge
-                        if (edgeThickness.Bottom > 0 && edgeThickness.Bottom < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Bottom - (int)edgeThickness.Bottom,
-                                    width,
-                                    (int)edgeThickness.Bottom
-                                )
-                            );
+                        if (edgeThickness.Bottom > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Left, myRect.Bottom, width, (int)edgeThickness.Bottom));
                         // Left edge
-                        if (edgeThickness.Left > 0 && edgeThickness.Left < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Left,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
+                        if (edgeThickness.Left > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Left - (int)edgeThickness.Left, myRect.Top, (int)edgeThickness.Left, height));
                         // Right edge
-                        if (edgeThickness.Right > 0 && edgeThickness.Right < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Right - (int)edgeThickness.Right,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Right,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
+                        if (edgeThickness.Right > 0)
+                            edgeColors.Add(GetAverageColorFromScreenRegion(myRect.Right, myRect.Top, (int)edgeThickness.Right, height));
 
                         // 合并四边平均色
                         if (edgeColors.Count == 0)
@@ -246,6 +225,5 @@ namespace BetterLyrics.WinUI3.Helper
             if (count == 0) return System.Drawing.Color.Transparent;
             return System.Drawing.Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
         }
-
     }
 }

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

@@ -1,109 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class DesktopModeHelper
-    {
-        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
-
-        private static readonly Dictionary<IntPtr, bool> _originalTopmostStates = [];
-        private static readonly Dictionary<IntPtr, (double X, double Y, double Width, double Height)> _originalWindowBounds = [];
-        private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
-
-        private delegate nint WndProcDelegate(nint hWnd, uint msg, nint wParam, nint lParam);
-
-        public static void Disable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20>ָ<EFBFBD>TopMost״̬
-            if (_originalTopmostStates.TryGetValue(hwnd, out var wasTopMost))
-            {
-                window.SetIsAlwaysOnTop(wasTopMost);
-                _originalTopmostStates.Remove(hwnd);
-            }
-
-            // <20>ָ<EFBFBD><D6B8><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            if (_originalWindowBounds.TryGetValue(hwnd, out var bounds))
-            {
-                window.AppWindow.MoveAndResize(
-                    new Windows.Graphics.RectInt32(
-                        (int)bounds.X,
-                        (int)bounds.Y,
-                        (int)bounds.Width,
-                        (int)bounds.Height
-                    )
-                );
-                _originalWindowBounds.Remove(hwnd);
-            }
-
-            window.SetIsShownInSwitchers(true);
-        }
-
-        public static void Enable(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20><>¼ԭʼ<D4AD><CABC><EFBFBD><EFBFBD>λ<EFBFBD>úʹ<C3BA>С
-            if (!_originalWindowBounds.ContainsKey(hwnd))
-            {
-                _originalWindowBounds[hwnd] = (
-                    window.AppWindow.Position.X,
-                    window.AppWindow.Position.Y,
-                    window.AppWindow.Size.Width,
-                    window.AppWindow.Size.Height
-                );
-            }
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
-            window.AppWindow.MoveAndResize(_settingsService.AppSettings.DesktopModeSettings.WindowBounds.ToRectInt32());
-
-            // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
-            if (!_originalTopmostStates.ContainsKey(hwnd))
-                _originalTopmostStates[hwnd] = window.GetIsAlwaysOnTop();
-
-            // <20><><EFBFBD>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>ö<EFBFBD>
-            window.SetIsAlwaysOnTop(true);
-
-            window.SetIsShownInSwitchers(false);
-        }
-
-        public static void SetClickThrough(Window window, bool enable)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-            int exStyle = User32.GetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE);
-
-            if (enable)
-            {
-                // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
-                if (!_originalWindowStyles.ContainsKey(hwnd))
-                    _originalWindowStyles[hwnd] = window.GetWindowStyle();
-
-                window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
-                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle | (int)User32.WindowStylesEx.WS_EX_TRANSPARENT | (int)User32.WindowStylesEx.WS_EX_LAYERED);
-            }
-            else
-            {
-                User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle & ~(int)User32.WindowStylesEx.WS_EX_TRANSPARENT);
-                // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
-                if (_originalWindowStyles.TryGetValue(hwnd, out var style))
-                {
-                    window.SetWindowStyle(style);
-                    _originalWindowStyles.Remove(hwnd);
-                }
-            }
-        }
-    }
-}

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

@@ -1,205 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Vanara.PInvoke;
-using WinRT.Interop;
-using WinUIEx;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class DockModeHelper
-    {
-        private static readonly 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);
-
-            if (!_registered.Contains(hwnd)) return;
-
-            window.SetIsShownInSwitchers(true);
-            window.ExtendsContentIntoTitleBar = true;
-            window.SetIsAlwaysOnTop(false);
-
-            UnregisterAppBar(hwnd);
-
-            window.SetWindowStyle(_originalWindowStyle[hwnd]);
-            _originalWindowStyle.Remove(hwnd);
-
-            window.ExtendsContentIntoTitleBar = true;
-
-            if (_originalPositions.TryGetValue(hwnd, out var rect))
-            {
-                User32.SetWindowPos(
-                    hwnd,
-                    IntPtr.Zero,
-                    rect.Left,
-                    rect.Top,
-                    rect.Right - rect.Left,
-                    rect.Bottom - rect.Top,
-                    User32.SetWindowPosFlags.SWP_SHOWWINDOW
-                );
-                _originalPositions.Remove(hwnd);
-            }
-        }
-
-        public static void Enable(Window window, string monitorDeviceName, int appBarHeight, DockPlacement dockPlacement)
-        {
-            window.SetIsShownInSwitchers(false);
-            window.SetIsAlwaysOnTop(true);
-
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            if (!_originalWindowStyle.ContainsKey(hwnd))
-            {
-                _originalWindowStyle[hwnd] = window.GetWindowStyle();
-            }
-
-            if (!_originalPositions.ContainsKey(hwnd))
-            {
-                if (User32.GetWindowRect(hwnd, out var rect))
-                {
-                    _originalPositions[hwnd] = rect;
-                }
-            }
-
-            RegisterAppBar(hwnd, monitorDeviceName, 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;
-
-            User32.SetWindowPos(
-                hwnd,
-                IntPtr.Zero,
-                monitorInfo.rcMonitor.Left,
-                y,
-                screenWidth,
-                appBarHeight,
-                User32.SetWindowPosFlags.SWP_HIDEWINDOW
-            );
-            window.ExtendsContentIntoTitleBar = false;
-            window.ToggleWindowStyle(true, WindowStyle.Popup);
-            window.Show();
-        }
-
-        private static void RegisterAppBar(IntPtr hwnd, string monitorDeviceName, 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;
-
-            Shell32.APPBARDATA abd = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd,
-                uEdge = uEdge,
-                rc = new RECT
-                {
-                    Left = monitorInfo.rcMonitor.Left,
-                    Top = top,
-                    Right = monitorInfo.rcMonitor.Right,
-                    Bottom = bottom,
-                },
-            };
-
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
-
-            _registered.Add(hwnd);
-        }
-
-        private static void UnregisterAppBar(IntPtr hwnd)
-        {
-            if (!_registered.Contains(hwnd))
-                return;
-
-            Shell32.APPBARDATA abd = new()
-            {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd
-            };
-
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
-
-            _registered.Remove(hwnd);
-        }
-
-        public static void UpdateAppBarHeight(IntPtr hwnd, string monitorDeviceName, int newHeight, DockPlacement dockPlacement)
-        {
-            App.DispatcherQueueTimer?.Debounce(() =>
-            {
-                if (!_registered.Contains(hwnd))
-                    return;
-
-                var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
-
-                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;
-
-                Shell32.APPBARDATA abd = new()
-                {
-                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                    hWnd = hwnd,
-                    uEdge = uEdge,
-                    rc = new RECT
-                    {
-                        Left = monitorInfo.rcMonitor.Left,
-                        Top = top,
-                        Right = monitorInfo.rcMonitor.Right,
-                        Bottom = bottom,
-                    },
-                };
-
-                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
-                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
-                    );
-                }
-            }, TimeSpan.FromMilliseconds(100));
-        }
-    }
-}

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

@@ -17,7 +17,6 @@ namespace BetterLyrics.WinUI3.Helper
         private readonly List<User32.HWINEVENTHOOK> _hooks = new();
         private HWND _currentForeground = HWND.NULL;
         private readonly IntPtr _selfHwnd;
-        private readonly ThrottleHelper _winEventProcThrottle = new(TimeSpan.FromSeconds(1));
 
         public delegate void WindowChangedHandler(HWND hwnd);
         private readonly WindowChangedHandler _onWindowChanged;
@@ -73,7 +72,7 @@ namespace BetterLyrics.WinUI3.Helper
 
             _hooks.Clear();
 
-            _timer.Stop();
+            //_timer.Stop();
         }
 
         private void Timer_Tick(object? sender, object e)

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

@@ -14,6 +14,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Numerics;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
@@ -219,5 +220,68 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return pixelData;
         }
+
+        public static async Task<byte[]> DownloadImageAsByteArrayAsync(string url)
+        {
+            using var httpClient = new HttpClient();
+            return await httpClient.GetByteArrayAsync(url);
+        }
+
+        public static byte[]? DataUrlToByteArray(string dataUrl)
+        {
+            const string base64Marker = ";base64,";
+            int base64Index = dataUrl.IndexOf(base64Marker, StringComparison.OrdinalIgnoreCase);
+            if (base64Index >= 0)
+            {
+                string base64Data = dataUrl.Substring(base64Index + base64Marker.Length);
+                return Convert.FromBase64String(base64Data);
+            }
+            else
+            {
+                // 非 base64，直接取逗号后内容并解码
+                int commaIndex = dataUrl.IndexOf(',');
+                if (commaIndex >= 0)
+                {
+                    string rawData = dataUrl.Substring(commaIndex + 1);
+                    return System.Text.Encoding.UTF8.GetBytes(Uri.UnescapeDataString(rawData));
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
+        public static async Task<byte[]?> GetImageBytesFromUrlAsync(string url)
+        {
+            if (string.IsNullOrWhiteSpace(url))
+            {
+                return null;
+            }
+
+            try
+            {
+                if (url.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
+                {
+                    // data URL，直接解析
+                    return DataUrlToByteArray(url);
+                }
+                else if (Uri.TryCreate(url, UriKind.Absolute, out var uri) &&
+                         (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
+                {
+                    // 普通网络图片，下载
+                    return await DownloadImageAsByteArrayAsync(url);
+                }
+                else
+                {
+                    // 其他类型暂不支持
+                    return null;
+                }
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
     }
 }

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

@@ -1,14 +1,7 @@
 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;
 using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Services
@@ -18,49 +11,83 @@ namespace BetterLyrics.WinUI3.Services
         private static readonly RankedLanguageIdentifierFactory _factory = new();
         private static readonly RankedLanguageIdentifier _identifier;
 
-        public static List<Models.LanguageInfo> SupportedTargetLanguages =>
+        public static List<Models.LanguageInfo> SupportedTargetLanguages { get; set; } =
         [
             new Models.LanguageInfo("ar", "العربية"),
             new Models.LanguageInfo("az", "Azərbaycan dili"),
-            new Models.LanguageInfo("zh-Hans", "简体中文"),
-            new Models.LanguageInfo("zh-Hant", "繁體中文"),
+
+            new Models.LanguageInfo("bg", "Български"),
+            new Models.LanguageInfo("bn", "বাংলা"),
+
+            new Models.LanguageInfo("ca", "Català"),
             new Models.LanguageInfo("cs", "Čeština"),
+
             new Models.LanguageInfo("da", "Dansk"),
-            new Models.LanguageInfo("nl", "Nederlands"),
+            new Models.LanguageInfo("de", "Deutsch"),
+
+            new Models.LanguageInfo("el", "Ελληνικά"),
             new Models.LanguageInfo("en", "English"),
             new Models.LanguageInfo("eo", "Esperanto"),
+            new Models.LanguageInfo("es", "Español"),
+            new Models.LanguageInfo("et", "Eesti"),
+            new Models.LanguageInfo("eu", "Euskara"),
+
+            new Models.LanguageInfo("fa", "فارسی"),
             new Models.LanguageInfo("fi", "Suomi"),
             new Models.LanguageInfo("fr", "Français"),
-            new Models.LanguageInfo("de", "Deutsch"),
-            new Models.LanguageInfo("el", "Ελληνικά"),
+
+            new Models.LanguageInfo("ga", "Gaeilge"),
+            new Models.LanguageInfo("gl", "Galego"),
+
             new Models.LanguageInfo("he", "עברית"),
             new Models.LanguageInfo("hi", "हिन्दी"),
             new Models.LanguageInfo("hu", "Magyar"),
+
             new Models.LanguageInfo("id", "Bahasa Indonesia"),
-            new Models.LanguageInfo("ga", "Gaeilge"),
             new Models.LanguageInfo("it", "Italiano"),
+
             new Models.LanguageInfo("ja", "日本語"),
+
             new Models.LanguageInfo("ko", "한국어"),
-            new Models.LanguageInfo("fa", "فارسی"),
+            new Models.LanguageInfo("ky", "Кыргызча"),
+
+            new Models.LanguageInfo("lt", "Lietuvių"),
+            new Models.LanguageInfo("lv", "Latviešu"),
+
+            new Models.LanguageInfo("ms", "Bahasa Melayu"),
+
+            new Models.LanguageInfo("nb", "Norsk bokmål"),
+            new Models.LanguageInfo("nl", "Nederlands"),
+
+            new Models.LanguageInfo("pt-BR", "Português (Brasil)"),
             new Models.LanguageInfo("pl", "Polski"),
             new Models.LanguageInfo("pt", "Português"),
+
+            new Models.LanguageInfo("ro", "Română"),
             new Models.LanguageInfo("ru", "Русский"),
+
             new Models.LanguageInfo("sk", "Slovenčina"),
-            new Models.LanguageInfo("es", "Español"),
+            new Models.LanguageInfo("sl", "Slovenščina"),
+            new Models.LanguageInfo("sq", "Shqip"),
+            new Models.LanguageInfo("sr", "Српски"),
             new Models.LanguageInfo("sv", "Svenska"),
+
+            new Models.LanguageInfo("th", "ไทย"),
+            new Models.LanguageInfo("tl", "Filipino"),
             new Models.LanguageInfo("tr", "Türkçe"),
+
             new Models.LanguageInfo("uk", "Українська"),
+            new Models.LanguageInfo("ur", "اردو"),
+
             new Models.LanguageInfo("vi", "Tiếng Việt"),
+
+            new Models.LanguageInfo("zh", "中文"),
         ];
 
         static LanguageHelper()
         {
             _identifier = _factory.Load(PathHelper.LanguageProfilePath);
-        }
-
-        private static string SimplifiedChineseOrTraditionalChinese(string text)
-        {
-            return text == ChineseConverter.ConvertToSimplifiedChinese(text) ? "zh-Hans" : "zh-Hant";
+            RomajiConverter.Core.Helpers.RomajiHelper.Init();
         }
 
         public static string? DetectLanguageCode(string? text)
@@ -72,9 +99,8 @@ namespace BetterLyrics.WinUI3.Services
             code = code switch
             {
                 "simple" => "en",
-                "zh_classical" => SimplifiedChineseOrTraditionalChinese(text),
-                "zh_yue" => SimplifiedChineseOrTraditionalChinese(text),
-                "zh" => SimplifiedChineseOrTraditionalChinese(text),
+                "zh_classical" => "zh",
+                "zh_yue" => "zh",
                 _ => code
             };
             return code;
@@ -89,26 +115,17 @@ namespace BetterLyrics.WinUI3.Services
             };
         }
 
-        public static string ConvertToCountryCode(string? languageCode)
+        public static string GetDefaultTargetLanguageCode()
         {
-            if (languageCode == null) return "us";
-
-            return languageCode switch
+            var found = SupportedTargetLanguages.Find(x => ApplicationLanguages.Languages.FirstOrDefault()?.Contains(x.Code) == true);
+            if (found == null)
             {
-                "zh" => "cn",
-                "zh-Hans" => "cn",
-                "zh-Hant" => "tw",
-                "ja" => "jp",
-                "ko" => "kr",
-                _ => "us"
-            };
-        }
-
-        public static int GetDefaultTargetLanguageIndex()
-        {
-            int found = SupportedTargetLanguages.FindIndex(x => ApplicationLanguages.Languages.FirstOrDefault()?.Contains(x.Code) == true);
-            if (found == -1) found = 7; // 默认使用英语
-            return found;
+                return "en";
+            }
+            else
+            {
+                return found.Code;
+            }
         }
 
         public static string GetOrderChar(string text)
@@ -118,12 +135,17 @@ namespace BetterLyrics.WinUI3.Services
             if (char.IsLetter(c) && c < 128)
                 return char.ToUpper(c).ToString();
 
-            if (PinyinHelper.IsChinese(c))
+            if (Pinyin.Pinyin.Instance.IsHanzi(c.ToString()))
             {
-                return PinyinHelper.GetPinyinInitials($"{c}");
+                return Pinyin.Pinyin.Instance.HanziToPinyin(c.ToString(), Pinyin.ManTone.Style.NORMAL).ToStr().ToUpper().FirstOrDefault().ToString();
             }
 
             return "#";
         }
+
+        public static string ToRomaji(string text)
+        {
+            return string.Join(" ", RomajiConverter.Core.Helpers.RomajiHelper.SentenceToRomaji(text).Select(x => x.Romaji));
+        }
     }
 }

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

@@ -3,19 +3,18 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services;
-using Lyricify.Lyrics.Helpers.General;
 using Lyricify.Lyrics.Models;
+using Lyricify.Lyrics.Parsers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
-using Windows.Globalization.Fonts;
 using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    public class LyricsParser
+    public partial class LyricsParser
     {
         private List<LyricsData> _lyricsDataArr = [];
 
@@ -36,10 +35,10 @@ namespace BetterLyrics.WinUI3.Helper
                         ParseLrc(raw);
                         break;
                     case LyricsFormat.Qrc:
-                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines);
+                        ParseQQNeteaseKugou(QrcParser.Parse(raw).Lines);
                         break;
                     case LyricsFormat.Krc:
-                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines);
+                        ParseQQNeteaseKugou(KrcParser.Parse(raw).Lines);
                         break;
                     case LyricsFormat.Ttml:
                         ParseTtml(raw);
@@ -48,50 +47,67 @@ namespace BetterLyrics.WinUI3.Helper
                         break;
                 }
             }
-            FillChineseLyricsData();
+            FillRomanizationLyricsData();
             _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
             return _lyricsDataArr;
         }
 
-        private void FillChineseLyricsData()
+        private void FillRomanizationLyricsData()
         {
-            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)
+            var chinese = _lyricsDataArr.Where(x => x.LanguageCode == "zh").FirstOrDefault();
+            if (chinese != null)
             {
-                // 如果没有繁体中文歌词，则将简体中文歌词转换为繁体中文
                 _lyricsDataArr.Add(new LyricsData
                 {
-                    LyricsLines = simplifiedChinese.LyricsLines.Select(line => new LyricsLine
+                    LanguageCode = "pinyin",
+                    LyricsLines = chinese.LyricsLines.Select(line => new LyricsLine
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = ChineseConverter.ConvertToTraditionalChinese(line.OriginalText),
+                        OriginalText = Pinyin.Pinyin.Instance.HanziToPinyin(line.OriginalText).ToStr(),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = ChineseConverter.ConvertToTraditionalChinese(c.Text),
+                            Text = Pinyin.Pinyin.Instance.HanziToPinyin(c.Text).ToStr(),
+                            StartIndex = c.StartIndex
+                        }).ToList()
+                    }).ToList()
+                });
+                _lyricsDataArr.Add(new LyricsData
+                {
+                    LanguageCode = "jyutping",
+                    LyricsLines = chinese.LyricsLines.Select(line => new LyricsLine
+                    {
+                        StartMs = line.StartMs,
+                        EndMs = line.EndMs,
+                        OriginalText = Pinyin.Jyutping.Instance.HanziToPinyin(line.OriginalText).ToStr(),
+                        LyricsChars = line.LyricsChars.Select(c => new LyricsChar
+                        {
+                            StartMs = c.StartMs,
+                            EndMs = c.EndMs,
+                            Text = Pinyin.Jyutping.Instance.HanziToPinyin(c.Text).ToStr(),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
                 });
             }
-            else if (traditionalChinese != null && simplifiedChinese == null)
+            var japanese = _lyricsDataArr.Where(x => x.LanguageCode == "ja").FirstOrDefault();
+            if (japanese != null)
             {
-                // 如果没有简体中文歌词，则将繁体中文歌词转换为简体中文
                 _lyricsDataArr.Add(new LyricsData
                 {
-                    LyricsLines = traditionalChinese.LyricsLines.Select(line => new LyricsLine
+                    LanguageCode = "romaji",
+                    LyricsLines = japanese.LyricsLines.Select(line => new LyricsLine
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = ChineseConverter.ConvertToSimplifiedChinese(line.OriginalText),
+                        OriginalText = LanguageHelper.ToRomaji(line.OriginalText),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = ChineseConverter.ConvertToSimplifiedChinese(c.Text),
+                            Text = LanguageHelper.ToRomaji(c.Text),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
@@ -106,9 +122,7 @@ namespace BetterLyrics.WinUI3.Helper
                 new List<(int time, string text, List<(int time, string text)> syllables)>();
 
             // 支持 [mm:ss.xx]字、<mm:ss.xx>字，毫秒两位或三位
-            var syllableRegex = new Regex(
-                @"(\[|\<)(\d{2}):(\d{2})\.(\d{2,3})(\]|\>)([^\[\]\<\>]*)"
-            );
+            var syllableRegex = SyllableRegex();
 
             foreach (var line in lines)
             {
@@ -125,7 +139,7 @@ namespace BetterLyrics.WinUI3.Helper
 
                     syllables.Add((totalMs, text));
                 }
-                if (syllables.Count > 0)
+                if (syllables.Count > 1)
                 {
                     lrcLines.Add(
                         (
@@ -138,18 +152,19 @@ namespace BetterLyrics.WinUI3.Helper
                 else
                 {
                     // 普通LRC行
-                    var bracketRegex = new Regex(@"\[(\d{2}):(\d{2})\.(\d{2,3})\]");
+                    Regex? bracketRegex = LrcRegex();
                     var bracketMatches = bracketRegex.Matches(line);
+
                     string content = line;
                     int? lineStartTime = null;
                     if (bracketMatches.Count > 0)
                     {
-                        var m = bracketMatches[0];
+                        var m = bracketMatches![0];
                         int min = int.Parse(m.Groups[1].Value);
                         int sec = int.Parse(m.Groups[2].Value);
-                        int ms = int.Parse(m.Groups[3].Value.PadRight(3, '0'));
+                        int ms = int.Parse(m.Groups[4].Value.PadRight(3, '0'));
                         lineStartTime = min * 60_000 + sec * 1000 + ms;
-                        content = bracketRegex.Replace(line, "");
+                        content = bracketRegex!.Replace(line, "");
                         lrcLines.Add((lineStartTime.Value, content, new List<(int, string)>()));
                     }
                 }
@@ -230,10 +245,11 @@ namespace BetterLyrics.WinUI3.Helper
                     int pStartMs = ParseTtmlTime(pBegin);
                     int pEndMs = ParseTtmlTime(pEnd);
 
-                    // 只获取一级span，且排除ttm:role="x-bg"的span
+                    // 只获取一级span，且排除 ttm:role="x-bg" 的 span 和 ttm:role="x-roman"
                     var spans = p.Elements()
                         .Where(s => s.Name.LocalName == "span" &&
-                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg")
+                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg" &&
+                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-roman")
                         .ToList();
 
                     // 原文和翻译分离
@@ -434,5 +450,10 @@ namespace BetterLyrics.WinUI3.Helper
 
             _lyricsDataArr.Add(new LyricsData(lyricsLines));
         }
+
+        [GeneratedRegex(@"\[(\d*):(\d*)(\.|\:)(\d*)\]")]
+        private static partial Regex LrcRegex();
+        [GeneratedRegex(@"(\[|\<)(\d*):(\d*)\.(\d*)(\]|\>)([^\[\]\<\>]*)")]
+        private static partial Regex SyllableRegex();
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/MonitorHelper.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.UI.Xaml;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -6,6 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Vanara.PInvoke;
+using WinRT.Interop;
 
 namespace BetterLyrics.WinUI3.Helper
 {
@@ -60,5 +62,14 @@ namespace BetterLyrics.WinUI3.Helper
             var primaryMonitorInfo = GetPrimaryMonitorInfoEx();
             return primaryMonitorInfo.szDevice;
         }
+
+        public static User32.MONITORINFOEX GetMonitorInfoExFromWindow(Window window)
+        {
+            var hwnd = WindowNative.GetWindowHandle(window);
+            var hMonitor = User32.MonitorFromWindow(hwnd, User32.MonitorFlags.MONITOR_DEFAULTTONEAREST);
+            User32.MONITORINFOEX monitorInfoEx = new() { cbSize = (uint)Marshal.SizeOf<User32.MONITORINFOEX>() };
+            User32.GetMonitorInfo(hMonitor, ref monitorInfoEx);
+            return monitorInfoEx;
+        }
     }
 }

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

@@ -34,6 +34,10 @@ namespace BetterLyrics.WinUI3.Helper
         public static string PotPlayerLogoPath => Path.Combine(AssetsFolder, "PotPlayer.png");
         public static string ChromeLogoPath => Path.Combine(AssetsFolder, "Chrome.png");
         public static string EdgeLogoPath => Path.Combine(AssetsFolder, "Edge.png");
+        public static string SaltPlayerForWindowsLogoPath => Path.Combine(AssetsFolder, "SaltPlayerForWindows.png");
+        public static string MoeKoeMusicLogoPath => Path.Combine(AssetsFolder, "MoeKoeMusic.png");
+        public static string Listen1LogoPath => Path.Combine(AssetsFolder, "Listen1.png");
+
         public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
 
         public static string LogDirectory => Path.Combine(CacheFolder, "logs");
@@ -46,6 +50,7 @@ namespace BetterLyrics.WinUI3.Helper
         public static string QQLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "qq");
         public static string KugouLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "kugou");
         public static string AmllTtmlDbLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "amll-ttml-db");
+        public static string AppleMusicCacheDirectory => Path.Combine(LyricsCacheDirectory, "apple-music");
         public static string AmllTtmlDbIndexPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-index.json");
         public static string AmllTtmlDbLastUpdatedPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-last-updated.txt");
 
@@ -53,6 +58,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static string QQTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "qq");
         public static string NeteaseTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "netease");
+        public static string KugouTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "kugou");
 
         public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
 
@@ -69,9 +75,11 @@ namespace BetterLyrics.WinUI3.Helper
             Directory.CreateDirectory(KugouLyricsCacheDirectory);
             Directory.CreateDirectory(NeteaseLyricsCacheDirectory);
             Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
+            Directory.CreateDirectory(AppleMusicCacheDirectory);
 
             Directory.CreateDirectory(QQTranslationCacheDirectory);
             Directory.CreateDirectory(NeteaseTranslationCacheDirectory);
+            Directory.CreateDirectory(KugouTranslationCacheDirectory);
 
             Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
         }

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

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class PlayerIdMatcher
+    {
+        private static readonly List<string> _neteaseFamilyRegex =
+        [
+            "cloudmusic.exe", //NetEaseCloudMusic
+            "^17588BrandonWong\\.LyricEase_", //LyricEase
+            "^48848aaaaaaccd\\.HyPlayer_" //HyPlayer
+        ];
+
+        public static bool IsNeteaseFamily(string player)
+        {
+            foreach (var regex in _neteaseFamilyRegex)
+            {
+                var isMatch = Regex.IsMatch(player, regex);
+                if (isMatch) return true;
+            }
+            return false;
+        }
+    }
+}

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

@@ -18,5 +18,45 @@ namespace BetterLyrics.WinUI3.Helper
                 (int)rect.Height
             );
         }
+
+        public static Windows.Foundation.Rect WithHeight(this Windows.Foundation.Rect rect, double height)
+        {
+            return new Windows.Foundation.Rect(
+                rect.X,
+                rect.Y,
+                rect.Width,
+                height
+            );
+        }
+
+        public static Windows.Foundation.Rect WithWidth(this Windows.Foundation.Rect rect, double width)
+        {
+            return new Windows.Foundation.Rect(
+                rect.X,
+                rect.Y,
+                width,
+                rect.Height
+            );
+        }
+
+        public static Windows.Foundation.Rect WithX(this Windows.Foundation.Rect rect, double x)
+        {
+            return new Windows.Foundation.Rect(
+                x,
+                rect.Y,
+                rect.Width,
+                rect.Height
+            );
+        }
+
+        public static Windows.Foundation.Rect WithY(this Windows.Foundation.Rect rect, double y)
+        {
+            return new Windows.Foundation.Rect(
+                rect.X,
+                y,
+                rect.Width,
+                rect.Height
+            );
+        }
     }
 }

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

@@ -0,0 +1,181 @@
+using BetterLyrics.WinUI3.Models.Settings;
+using NAudio.Dsp;
+using NAudio.Wave;
+using System;
+using System.Diagnostics;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class SpectrumAnalyzer : IDisposable
+    {
+        private WasapiLoopbackCapture _capture;
+        
+        private int _sampleRate = 48000;
+        private readonly int _fftLength = 2048;
+        
+        private readonly float[] _fftLeftBuffer;
+        private readonly float[] _fftRightBuffer;
+
+        private readonly Complex[] _fftLeftData;
+        private readonly Complex[] _fftRightData;
+        
+        private float[] _spectrumLeftData;
+        private float[] _spectrumRightData;
+        private float[] _spectrumData;
+
+        private bool _disposed = false;
+        
+        private double[] _hammingWindow;
+
+        private float[] _currentSpectrum;
+        public float[] SmoothSpectrum { get; private set; }
+        
+        public int BarCount { get; set; } = 32;
+        public int Sensitivity { get; set; } = 10;
+        public float SmoothingFactor { get; set; } = 0.95f;
+        public bool IsCapturing { get; private set; } = false;
+
+        public SpectrumAnalyzer()
+        {
+            _fftLeftBuffer = new float[_fftLength];
+            _fftLeftData = new Complex[_fftLength];
+            _fftRightBuffer = new float[_fftLength];
+            _fftRightData = new Complex[_fftLength];
+            _hammingWindow = new double[_fftLength];
+            //汉明窗
+            for (int i = 0; i < _fftLength; i++)
+            {
+                _hammingWindow[i] = 0.54 - 0.46 * Math.Cos((2 * Math.PI * i) / (_fftLength - 1));
+            }
+        }
+
+        public void StartCapture()
+        {
+            _currentSpectrum = new float[BarCount];
+            SmoothSpectrum = new float[BarCount];
+
+            try
+            {
+                _capture = new WasapiLoopbackCapture();
+                _sampleRate = _capture.WaveFormat.SampleRate;
+                _spectrumLeftData = new float[(int)(24000.0f / _sampleRate * _fftLength) / 2];
+                _spectrumRightData = new float[(int)(24000.0f / _sampleRate * _fftLength) / 2];
+                _spectrumData = new float[(int)(24000.0f / _sampleRate * _fftLength)];
+                _capture.DataAvailable += OnDataAvailable;
+                _capture.RecordingStopped += OnRecordingStopped;
+                _capture.StartRecording();
+
+                IsCapturing = true;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        public void StopCapture()
+        {
+            _capture?.DataAvailable -= OnDataAvailable;
+            _capture?.RecordingStopped -= OnRecordingStopped;
+            _capture?.StopRecording();
+
+            IsCapturing = false;
+        }
+
+        private void OnDataAvailable(object? sender, WaveInEventArgs e)
+        {
+            if (_disposed || e.BytesRecorded == 0) return;
+            // 将字节转换为浮点数
+            int samples = e.BytesRecorded / 8;
+            if (samples < _fftLength) return;
+            for (int i = 0; i < _fftLength; i++)
+            {
+                _fftLeftBuffer[i] = BitConverter.ToSingle(e.Buffer, i * 8);
+                _fftRightBuffer[i] = BitConverter.ToSingle(e.Buffer, i * 8 + 4);
+            }
+            for (int i = 0; i < _fftLength; i++)
+            {
+                _fftLeftData[i].X = _fftLeftBuffer[i] * (float)_hammingWindow[i]; // Real part
+                _fftLeftData[i].Y = 0;             // Imaginary part
+                _fftRightData[i].X = _fftRightBuffer[i] * (float)_hammingWindow[i];
+                _fftRightData[i].Y = 0;
+            }
+
+            // FFT
+            FastFourierTransform.FFT(true, (int)Math.Log(_fftLength, 2), _fftLeftData);
+            FastFourierTransform.FFT(true, (int)Math.Log(_fftLength, 2), _fftRightData);
+            for (int i = 0; i < _spectrumLeftData.Length; i++)
+            {
+                float real = (float)_fftLeftData[i].X;
+                float imaginary = (float)_fftLeftData[i].Y;
+                float magnitude = (float)Math.Sqrt(real * real + imaginary * imaginary);
+                float frequency = i * _sampleRate / _fftLength;
+                float compensationFactor = GetCompensationFactor(frequency);
+                _spectrumLeftData[i] = magnitude * compensationFactor;
+                _spectrumRightData[i] = (float)Math.Sqrt((float)_fftRightData[i].X * (float)_fftRightData[i].X + (float)_fftRightData[i].Y * (float)_fftRightData[i].Y) * compensationFactor;
+                for (int j = 0; j < _spectrumLeftData.Length; j++)
+                {
+                    _spectrumData[j] = _spectrumLeftData[_spectrumLeftData.Length - 1 - j];
+                }
+                Array.Copy(_spectrumRightData, 0, _spectrumData, _spectrumLeftData.Length, _spectrumRightData.Length);
+            }
+
+            for (int i = 0; i < BarCount; i++)
+            {
+                int index = (int)((float)i / BarCount * _spectrumData.Length);
+                if (index < _spectrumData.Length)
+                {
+                    _currentSpectrum[i] = _spectrumData[index] * 250f * Sensitivity;
+                }
+            }
+
+        }
+
+        public void UpdateSmoothSpectrum()
+        {
+            for (int i = 0; i < BarCount; i++)
+            {
+                SmoothSpectrum[i] = SmoothSpectrum[i] * SmoothingFactor +
+                    _currentSpectrum[i] * (1 - SmoothingFactor);
+            }
+        }
+
+        private float GetCompensationFactor(float freq)
+        {
+            // 补偿曲线
+            float[] frequencies = { 20, 50, 100, 200, 500, 1000, 2000, 4000, 8000, 16000, 20000 };
+            float[] gains = { 0.5f, 0.3f, 0.4f, 0.6f, 0.8f, 1.0f, 1.2f, 1.3f, 1.1f, 0.9f, 0.8f };
+            if (freq <= frequencies[0])
+            {
+                return gains[0];
+            }
+            if (freq >= frequencies[frequencies.Length - 1])
+            {
+                return gains[gains.Length - 1];
+            }
+            int i = 0;
+            while (freq > frequencies[i + 1])
+            {
+                i++;
+            }
+            // 线性插值
+            float x1 = frequencies[i];
+            float y1 = gains[i];
+            float x2 = frequencies[i + 1];
+            float y2 = gains[i + 1];
+            return y1 + (freq - x1) * ((y2 - y1) / (x2 - x1));
+        }
+
+        private void OnRecordingStopped(object? sender, StoppedEventArgs e)
+        {
+        }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _capture?.Dispose();
+                _disposed = true;
+            }
+        }
+    }
+}

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

@@ -1,12 +1,19 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
+using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Vanara.PInvoke;
 using Windows.ApplicationModel.Core;
+using Windows.Foundation;
 using WinRT.Interop;
 using WinUIEx;
 
@@ -15,6 +22,22 @@ namespace BetterLyrics.WinUI3.Helper
     public static class WindowHelper
     {
         private static List<object> _activeWindows = [];
+        private static List<object> _workAreas = [];
+
+        private static readonly Dictionary<HWND, WindowStyle> _defaultWindowStyle = [];
+        private static readonly Dictionary<HWND, ExtendedWindowStyle> _defaultExtendedWindowStyle = [];
+
+        private static readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
+        private static readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
+
+        public static void HideWindow<T>()
+        {
+            var window = _activeWindows.Find(w => w is T);
+            if (window is Window w)
+            {
+                w.Hide();
+            }
+        }
 
         public static void CloseWindow<T>()
         {
@@ -41,7 +64,8 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return default;
         }
-        public static void OpenWindow<T>()
+
+        public static void OpenOrShowWindow<T>()
         {
             var window = _activeWindows.Find(w => w is T);
             if (window == null)
@@ -59,6 +83,14 @@ namespace BetterLyrics.WinUI3.Helper
                 {
                     window = new MusicGalleryWindow();
                 }
+                else if (typeof(T) == typeof(LyricsSearchWindow))
+                {
+                    window = new LyricsSearchWindow();
+                }
+                else if (typeof(T) == typeof(LyricsWindowSwitchWindow))
+                {
+                    window = new LyricsWindowSwitchWindow();
+                }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));
@@ -70,9 +102,14 @@ namespace BetterLyrics.WinUI3.Helper
 
                 if (typeof(T) == typeof(LyricsWindow))
                 {
+                    var hwnd = WindowNative.GetWindowHandle(castedWindow);
+                    _defaultWindowStyle.Add(hwnd, castedWindow.GetWindowStyle());
+                    _defaultExtendedWindowStyle.Add(hwnd, castedWindow.GetExtendedWindowStyle());
+
                     var lyricsWindow = (LyricsWindow)window;
                     lyricsWindow.ViewModel.InitShortcuts();
-                    lyricsWindow.AutoSelectLyricsMode();
+                    lyricsWindow.ViewModel.InitFgWindowWatcher();
+                    lyricsWindow.ViewModel.RefreshLyricsWindowStatus();
                 }
             }
             else
@@ -119,11 +156,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         private static void EnsureDockModeReleased()
         {
-            LyricsWindow? lyricsWindow = GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                DockModeHelper.Disable(lyricsWindow);
-            }
+            SetIsWorkArea<LyricsWindow>(false);
         }
 
         private static void TrackWindow(object window)
@@ -141,7 +174,224 @@ namespace BetterLyrics.WinUI3.Helper
             if (_activeWindows.Contains(sender))
             {
                 _activeWindows.Remove(sender);
+
+                var hwnd = WindowNative.GetWindowHandle(sender);
+                _defaultWindowStyle.Remove(hwnd);
+                _defaultExtendedWindowStyle.Remove(hwnd);
             }
         }
+
+        public static void SetIsClickThrough<T>(bool enable)
+        {
+            Window? window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (enable)
+            {
+                window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd] | ExtendedWindowStyle.Transparent | ExtendedWindowStyle.Layered);
+            }
+            else
+            {
+                window.SetExtendedWindowStyle(_defaultExtendedWindowStyle[hwnd]);
+            }
+        }
+
+        public static void SetIsWorkArea<T>(bool enable)
+        {
+            Window? window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            if (enable)
+            {
+                EnableWorkArea(window);
+            }
+            else
+            {
+                DisableWorkArea(window);
+            }
+        }
+
+        public static void SetIsBorderless<T>(bool enable)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            var hwnd = WindowNative.GetWindowHandle(window);
+
+            if (enable)
+            {
+                window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
+            }
+            else
+            {
+                window.SetWindowStyle(_defaultWindowStyle[hwnd]);
+            }
+        }
+
+        public static void SetIsShowInSwitchers<T>(bool enable)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            window.AppWindow.IsShownInSwitchers = enable;
+        }
+
+        public static void SetIsAlwaysOnTop<T>(bool enable)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            if (window.AppWindow.Presenter is OverlappedPresenter presenter)
+            {
+                presenter.IsAlwaysOnTop = enable;
+            }
+        }
+
+        public static void MoveAndResize<T>(Rect rect)
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            window.AppWindow.MoveAndResize(rect.ToRectInt32());
+        }
+
+        public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
+        {
+            if (typeof(T) == typeof(LyricsWindow))
+            {
+                LyricsWindow? lyricsWindow = GetWindowByWindowType<LyricsWindow>();
+                lyricsWindow?.SetTitleBarArea(titleBarArea);
+            }
+            else
+            {
+                throw new Exception($"Unsupported window type: {typeof(T).FullName}");
+            }
+        }
+
+        private static void DisableWorkArea(Window window)
+        {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_workAreas.Contains(hwnd)) return;
+
+            UnregisterWorkArea(hwnd);
+        }
+
+        private static void EnableWorkArea(Window window)
+        {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (_workAreas.Contains(hwnd)) return;
+
+            RegisterWorkArea(hwnd);
+        }
+
+        private static void RegisterWorkArea(IntPtr hwnd)
+        {
+            if (_workAreas.Contains(hwnd)) return;
+
+            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+
+            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top : _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+
+            Shell32.APPBARDATA abd = new()
+            {
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd,
+                uEdge = uEdge,
+                rc = new RECT
+                {
+                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Top = (int)top,
+                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Bottom = (int)bottom,
+                },
+            };
+
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
+
+            _workAreas.Add(hwnd);
+        }
+
+        private static void UnregisterWorkArea(IntPtr hwnd)
+        {
+            if (!_workAreas.Contains(hwnd))
+                return;
+
+            Shell32.APPBARDATA abd = new()
+            {
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd
+            };
+
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
+
+            _workAreas.Remove(hwnd);
+        }
+
+        public static void UpdateWorkArea<T>()
+        {
+            var window = GetWindowByWindowType<T>() as Window;
+            if (window == null) return;
+
+            var hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_workAreas.Contains(hwnd))
+                return;
+
+            var uEdge = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+
+            double top = _liveStatesService.LiveStates.LyricsWindowStatus.DockPlacement == DockPlacement.Top ?
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Top :
+                _liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+
+            double bottom = top + _liveStatesService.LiveStates.LyricsWindowStatus.DockHeight;
+
+            Shell32.APPBARDATA abd = new()
+            {
+                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                hWnd = hwnd,
+                uEdge = uEdge,
+                rc = new RECT
+                {
+                    Left = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Left,
+                    Top = (int)top,
+                    Right = (int)_liveStatesService.LiveStates.LyricsWindowStatus.MonitorBounds.Right,
+                    Bottom = (int)bottom,
+                },
+            };
+
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
+        }
+
+        public static void SetLyricsWindowVisibilityByPlayingStatus()
+        {
+            var window = GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && !_mediaSessionsService.IsPlaying)
+            {
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                {
+                    SetIsWorkArea<LyricsWindow>(false);
+                }
+                HideWindow<LyricsWindow>();
+            }
+            else if (_liveStatesService.LiveStates.LyricsWindowStatus.AutoShowOrHideWindow && _mediaSessionsService.IsPlaying)
+            {
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.IsWorkArea)
+                {
+                    SetIsWorkArea<LyricsWindow>(true);
+                }
+                OpenOrShowWindow<LyricsWindow>();
+            }
+        }
+
     }
 }

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

@@ -1,39 +1,26 @@
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Vanara.PInvoke;
+using Windows.Foundation;
 
 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; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; }
 
-        public LiveStates(AppSettings appSettings)
+        public LiveStates()
         {
-            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;
-            }
+            LyricsWindowStatus = new LyricsWindowStatus();
         }
     }
 }

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

@@ -1,4 +1,5 @@
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services;
 using Lyricify.Lyrics.Helpers.General;
 using System;
@@ -13,7 +14,12 @@ namespace BetterLyrics.WinUI3.Models
     public class LyricsData
     {
         public List<LyricsLine> LyricsLines { get; set; }
-        public string? LanguageCode => LanguageHelper.DetectLanguageCode(WrappedOriginalText);
+        private string? _languageCode;
+        public string? LanguageCode
+        {
+            get => _languageCode ?? LanguageHelper.DetectLanguageCode(WrappedOriginalText);
+            set => _languageCode = value;
+        }
         public string WrappedOriginalText => string.Join(StringHelper.NewLine, LyricsLines.Select(line => line.OriginalText));
 
         public LyricsData()
@@ -120,5 +126,18 @@ namespace BetterLyrics.WinUI3.Models
                 },
             ]);
         }
+
+        public LyricsLine? GetLyricsLine(double sec)
+        {
+            for (int i = 0; i < LyricsLines.Count; i++)
+            {
+                var line = LyricsLines[i];
+                if (line.StartMs > sec * 1000)
+                {
+                    return LyricsLines.ElementAtOrDefault(i - 1);
+                }
+            }
+            return null;
+        }
     }
 }

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

@@ -0,0 +1,283 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Windowing;
+using System;
+using Windows.Foundation;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class LyricsWindowStatus : ObservableRecipient, ICloneable
+    {
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Name { get; set; } = string.Empty;
+        [ObservableProperty] public partial bool IsDefault { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string MonitorDeviceName { get; set; } = string.Empty;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsWorkArea { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsBorderless { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTop { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAlwaysOnTopPolling { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsShownInSwitchers { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsClickThrough { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsLayoutOrientation LyricsLayoutOrientation { get; set; } = LyricsLayoutOrientation.Horizontal;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType LyricsDisplayType { get; set; } = LyricsDisplayType.SplitView;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 800, 500);
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double DockHeight { get; set; } = 64;
+        [ObservableProperty] public partial Rect DemoWindowBounds { get; set; }
+        [ObservableProperty] public partial Rect MonitorBounds { get; set; }
+        [ObservableProperty] public partial Rect DemoMonitorBounds { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DockPlacement DockPlacement { get; set; } = DockPlacement.Top;
+        [ObservableProperty] public partial LyricsStyleSettings LyricsStyleSettings { get; set; } = new();
+        [ObservableProperty] public partial LyricsEffectSettings LyricsEffectSettings { get; set; } = new(500, 500, 500, EasingType.EaseInOutQuad);
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsBackgroundSettings LyricsBackgroundSettings { get; set; } = new();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtLayoutSettings AlbumArtLayoutSettings { get; set; } = new();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsAdaptToEnvironment { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial WindowPixelSampleMode EnvironmentSampleMode { get; set; } = WindowPixelSampleMode.WindowEdge;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoShowOrHideWindow { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TitleBarArea TitleBarArea { get; set; } = TitleBarArea.Top;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowX { get; set; } = 100;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowY { get; set; } = 100;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowWidth { get; set; } = 800;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial double WindowHeight { get; set; } = 500;
+
+        public LyricsWindowStatus()
+        {
+            UpdateMonitorNameAndBounds();
+            UpdateDemoWindowAndMonitorBounds();
+        }
+
+        partial void OnWindowXChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithX(value);
+        }
+
+        partial void OnWindowYChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithY(value);
+        }
+
+        partial void OnWindowWidthChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithWidth(value);
+        }
+
+        partial void OnWindowHeightChanged(double value)
+        {
+            WindowBounds = WindowBounds.WithHeight(value);
+        }
+
+        partial void OnLyricsStyleSettingsChanged(LyricsStyleSettings oldValue, LyricsStyleSettings newValue)
+        {
+            oldValue.PropertyChanged -= OldLyricsStyleSettings_PropertyChanged;
+            newValue.PropertyChanged += OldLyricsStyleSettings_PropertyChanged;
+        }
+
+        partial void OnLyricsEffectSettingsChanged(LyricsEffectSettings oldValue, LyricsEffectSettings newValue)
+        {
+            oldValue.PropertyChanged -= OldLyricsEffectSettings_PropertyChanged;
+            newValue.PropertyChanged += OldLyricsEffectSettings_PropertyChanged;
+        }
+
+        partial void OnLyricsBackgroundSettingsChanged(LyricsBackgroundSettings oldValue, LyricsBackgroundSettings newValue)
+        {
+            oldValue.PropertyChanged -= OldLyricsBackgroundSettings_PropertyChanged;
+            newValue.PropertyChanged += OldLyricsBackgroundSettings_PropertyChanged;
+        }
+
+        partial void OnAlbumArtLayoutSettingsChanged(AlbumArtLayoutSettings oldValue, AlbumArtLayoutSettings newValue)
+        {
+            oldValue.PropertyChanged -= OldAlbumArtLayoutSettings_PropertyChanged;
+            newValue.PropertyChanged += OldAlbumArtLayoutSettings_PropertyChanged;
+        }
+
+        private void OldLyricsStyleSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            this.OnPropertyChanged(nameof(LyricsStyleSettings));
+        }
+
+        private void OldLyricsEffectSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            this.OnPropertyChanged(nameof(LyricsEffectSettings));
+        }
+
+        private void OldLyricsBackgroundSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            this.OnPropertyChanged(nameof(LyricsBackgroundSettings));
+        }
+
+        private void OldAlbumArtLayoutSettings_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            this.OnPropertyChanged(nameof(AlbumArtLayoutSettings));
+        }
+
+        partial void OnWindowBoundsChanged(Rect value)
+        {
+            UpdateMonitorNameAndBounds();
+            UpdateDemoWindowAndMonitorBounds();
+        }
+
+        partial void OnAutoShowOrHideWindowChanged(bool value)
+        {
+            WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
+        }
+
+        public void UpdateMonitorNameAndBounds()
+        {
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow == null) return;
+
+            var mointor = MonitorHelper.GetMonitorInfoExFromWindow(lyricsWindow);
+            MonitorDeviceName = mointor.szDevice;
+            MonitorBounds = new Rect(
+                mointor.rcMonitor.Left,
+                mointor.rcMonitor.Top,
+                mointor.rcMonitor.Width,
+                mointor.rcMonitor.Height
+            );
+        }
+
+        public void UpdateDemoWindowAndMonitorBounds(double factor = 0.1)
+        {
+            DemoWindowBounds = new Rect(
+                (WindowBounds.X - MonitorBounds.Left) * factor,
+                (WindowBounds.Y - MonitorBounds.Top) * factor,
+                WindowBounds.Width * factor,
+                WindowBounds.Height * factor
+            );
+            DemoMonitorBounds = new Rect(
+                MonitorBounds.Left * factor,
+                MonitorBounds.Top * factor,
+                MonitorBounds.Width * factor,
+                MonitorBounds.Height * factor
+            );
+        }
+
+        public object Clone()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = this.Name,
+                IsDefault = this.IsDefault,
+                MonitorDeviceName = this.MonitorDeviceName,
+                IsWorkArea = this.IsWorkArea,
+                IsBorderless = this.IsBorderless,
+                IsAlwaysOnTop = this.IsAlwaysOnTop,
+                IsAlwaysOnTopPolling = this.IsAlwaysOnTopPolling,
+                IsShownInSwitchers = this.IsShownInSwitchers,
+                IsClickThrough = this.IsClickThrough,
+                LyricsLayoutOrientation = this.LyricsLayoutOrientation,
+                LyricsDisplayType = this.LyricsDisplayType,
+                WindowBounds = this.WindowBounds,
+                DockHeight = this.DockHeight,
+                DemoWindowBounds = this.DemoWindowBounds,
+                MonitorBounds = this.MonitorBounds,
+                DemoMonitorBounds = this.DemoMonitorBounds,
+                LyricsStyleSettings = (LyricsStyleSettings)this.LyricsStyleSettings.Clone(),
+                LyricsEffectSettings = (LyricsEffectSettings)this.LyricsEffectSettings.Clone(),
+                LyricsBackgroundSettings = (LyricsBackgroundSettings)this.LyricsBackgroundSettings.Clone(),
+                AlbumArtLayoutSettings = (AlbumArtLayoutSettings)this.AlbumArtLayoutSettings.Clone(),
+                IsAdaptToEnvironment = this.IsAdaptToEnvironment,
+                EnvironmentSampleMode = this.EnvironmentSampleMode,
+                AutoShowOrHideWindow = this.AutoShowOrHideWindow,
+                TitleBarArea = this.TitleBarArea,
+            };
+        }
+    }
+
+    public static class LyricsWindowStatusExtensions
+    {
+        public static LyricsWindowStatus DesktopMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("DesktopMode"),
+                LyricsDisplayType = LyricsDisplayType.LyricsOnly,
+                WindowBounds = new Rect(100, 100, 600, 250),
+                IsAlwaysOnTop = true,
+                IsAlwaysOnTopPolling = true,
+                IsBorderless = true,
+                IsClickThrough = true,
+                IsAdaptToEnvironment = true,
+                EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
+                LyricsStyleSettings = new()
+                {
+                    LyricsFontSize = 20,
+                    LyricsAlignmentType = TextAlignmentType.Center,
+                },
+                LyricsBackgroundSettings = new LyricsBackgroundSettings
+                {
+                    IsPureColorOverlayEnabled = false,
+                    IsCoverOverlayEnabled = false,
+                }
+            };
+        }
+
+        public static LyricsWindowStatus DockedMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("DockedMode"),
+                IsWorkArea = true,
+                IsAlwaysOnTop = true,
+                IsAlwaysOnTopPolling = true,
+                IsBorderless = true,
+                IsAdaptToEnvironment = true,
+                LyricsDisplayType = LyricsDisplayType.LyricsOnly,
+                EnvironmentSampleMode = WindowPixelSampleMode.BelowWindow,
+                TitleBarArea = TitleBarArea.None,
+                LyricsStyleSettings = new LyricsStyleSettings
+                {
+                    LyricsAlignmentType = TextAlignmentType.Center,
+                    LyricsFontSize = 18,
+                },
+                LyricsBackgroundSettings = new LyricsBackgroundSettings
+                {
+                    IsCoverOverlayEnabled = false,
+                }
+            };
+        }
+
+        public static LyricsWindowStatus FullscreenMode(Rect monitorBounds)
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("FullscreenMode"),
+                WindowBounds = monitorBounds,
+                IsAlwaysOnTop = true,
+                IsBorderless = true,
+                TitleBarArea = Enums.TitleBarArea.None,
+                LyricsLayoutOrientation = Enums.LyricsLayoutOrientation.Vertical,
+                LyricsStyleSettings = new LyricsStyleSettings
+                {
+                    LyricsFontSize = 96,
+                    LyricsAlignmentType = Enums.TextAlignmentType.Center,
+                },
+                AlbumArtLayoutSettings = new AlbumArtLayoutSettings
+                {
+                    AutoAlbumArtSize = false,
+                    AlbumArtSize = 148,
+                    SongInfoFontSize = 48,
+                }
+            };
+        }
+
+        public static LyricsWindowStatus StandardMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("StandardMode"),
+            };
+        }
+
+        public static LyricsWindowStatus NarrowMode()
+        {
+            return new LyricsWindowStatus
+            {
+                Name = App.ResourceLoader!.GetString("NarrowMode"),
+                WindowBounds = new Rect(100, 100, 400, 800),
+                LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
+            };
+        }
+    }
+}

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

@@ -36,8 +36,9 @@ namespace BetterLyrics.WinUI3.Models
             PositionOffset = 0;
         }
 
-        public MediaSourceProviderInfo(string provider) : base()
+        public MediaSourceProviderInfo(string provider, bool isEnable = true)
         {
+            IsEnabled = isEnable;
             switch (provider)
             {
                 case Constants.PlayerID.AppleMusic:
@@ -53,6 +54,12 @@ namespace BetterLyrics.WinUI3.Models
             }
 
             Provider = provider;
+
+            AlbumArtSearchProvidersInfo.ItemPropertyChanged += AlbumArtSearchProvidersInfo_ItemPropertyChanged;
+            AlbumArtSearchProvidersInfo.CollectionChanged += AlbumArtSearchProvidersInfo_CollectionChanged;
+
+            LyricsSearchProvidersInfo.ItemPropertyChanged += LyricsSearchProvidersInfo_ItemPropertyChanged;
+            LyricsSearchProvidersInfo.CollectionChanged += LyricsSearchProvidersInfo_CollectionChanged;
         }
 
         partial void OnAlbumArtSearchProvidersInfoChanged(FullyObservableCollection<AlbumArtSearchProviderInfo> oldValue, FullyObservableCollection<AlbumArtSearchProviderInfo> newValue)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AlbumArtLayoutSettings.cs

@@ -8,12 +8,32 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class AlbumArtLayoutSettings : ObservableRecipient
+    public partial class AlbumArtLayoutSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType SongInfoAlignmentType { get; set; } = TextAlignmentType.Left;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageRadius { get; set; } = 12; // 12 % of the cover image size
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverImageShadowAmount { get; set; } = 12;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SongInfoFontSize { get; set; } = 18;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowTitle { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowArtists { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int AlbumArtSize { get; set; } = 64;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoAlbumArtSize { get; set; } = true;
 
         public AlbumArtLayoutSettings() { }
+
+        public object Clone()
+        {
+            return new AlbumArtLayoutSettings
+            {
+                SongInfoAlignmentType = this.SongInfoAlignmentType,
+                CoverImageRadius = this.CoverImageRadius,
+                CoverImageShadowAmount = this.CoverImageShadowAmount,
+                SongInfoFontSize = this.SongInfoFontSize,
+                ShowTitle = this.ShowTitle,
+                ShowArtists = this.ShowArtists,
+                AlbumArtSize = this.AlbumArtSize,
+                AutoAlbumArtSize = this.AutoAlbumArtSize,
+            };
+        }
     }
 }

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

@@ -10,23 +10,6 @@ namespace BetterLyrics.WinUI3.Models.Settings
     {
         public string Version { get; set; } = Helper.MetadataHelper.AppVersion;
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings StandardLyricsStyleSettings { get; set; } = new LyricsStyleSettings(32, TextAlignmentType.Left, 0);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings DesktopLyricsStyleSettings { get; set; } = new LyricsStyleSettings(28, TextAlignmentType.Center, 2);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings DockLyricsStyleSettings { get; set; } = new LyricsStyleSettings(16, TextAlignmentType.Center, 0);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsStyleSettings PictureInPictureLyricsStyleSettings { get; set; } = new LyricsStyleSettings(28, TextAlignmentType.Left, 0);
-
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings StandardLyricsEffectSettings { get; set; } = new LyricsEffectSettings(100, 500, 1000, EasingType.EaseInOutQuad);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings DesktopLyricsEffectSettings { get; set; } = new LyricsEffectSettings(500, 500, 500, EasingType.EaseInOutQuad);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings DockLyricsEffectSettings { get; set; } = new LyricsEffectSettings(500, 500, 500, EasingType.EaseInOutQuad);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectSettings PictureInPictureLyricsEffectSettings { get; set; } = new LyricsEffectSettings(500, 500, 500, EasingType.EaseInOutQuad);
-
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial StandardModeSettings StandardModeSettings { get; set; } = new StandardModeSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DesktopModeSettings DesktopModeSettings { get; set; } = new DesktopModeSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DockModeSettings DockModeSettings { get; set; } = new DockModeSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial PictureInPictureModeSettings PictureInPictureModeSettings { get; set; } = new PictureInPictureModeSettings();
-
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsBackgroundSettings LyricsBackgroundSettings { get; set; } = new LyricsBackgroundSettings();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AlbumArtLayoutSettings AlbumArtLayoutSettings { get; set; } = new AlbumArtLayoutSettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial TranslationSettings TranslationSettings { get; set; } = new TranslationSettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial GeneralSettings GeneralSettings { get; set; } = new GeneralSettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial MusicGallerySettings MusicGallerySettings { get; set; } = new MusicGallerySettings();
@@ -34,8 +17,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; } = [];
-
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MappedSongSearchQuery> MappedSongSearchQueries { get; set; } = [];
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LyricsWindowStatus> WindowBoundsRecords { get; set; } = [];
 
         public AppSettings() { }
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/BaseModeSettings.cs

@@ -10,6 +10,5 @@ namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class BaseModeSettings : ObservableRecipient
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsDisplayType LyricsDisplayType { get; set; }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/DesktopModeSettings.cs

@@ -1,24 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Graphics;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class DesktopModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 400, 200);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool AutoLockOnDesktopMode { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> LockShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "U" };
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ToggleShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "D" };
-
-        public DesktopModeSettings()
-        {
-            LyricsDisplayType = Enums.LyricsDisplayType.LyricsOnly;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/DockModeSettings.cs

@@ -1,24 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class DockModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DockPlacement DockPlacement { get; set; } = DockPlacement.Top;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int DockWindowHeight { get; set; } = 64;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string DockMonitorDeviceName { get; set; } = MonitorHelper.GetPrimaryMonitorDeviceName();
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ToggleShortcut { get; set; } = new List<string> { "Ctrl", "Shift", "D" };
-
-        public DockModeSettings()
-        {
-            LyricsDisplayType = LyricsDisplayType.LyricsOnly;
-        }
-    }
-}

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

@@ -10,14 +10,14 @@ namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class GeneralSettings : ObservableRecipient
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowMode AutoStartWindowType { get; set; } = LyricsWindowMode.StandardMode;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Language Language { get; set; } = Language.FollowSystem;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IgnoreFullscreenWindow { get; set; } = false;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LXMusicServer { get; set; } = string.Empty;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool HideWindowWhenNotPlaying { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsDragEverywhereEnabled { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsImmersiveMode { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ShowOrHideLyricsWindowShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "H" };
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ListenOnNewPlaybackSource { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> BorderlessShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "B" };
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ClickThroughShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "C" };
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> LyricsWindowSwitchShortcut { get; set; } = new List<string>() { "Ctrl", "Alt", "S" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> PlayOrPauseShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "P" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> NextSongShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "Right" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> PreviousSongShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "Left" };

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

@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
@@ -8,15 +9,37 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class LyricsBackgroundSettings : ObservableRecipient
+    public partial class LyricsBackgroundSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial ElementTheme LyricsBackgroundTheme { get; set; } = ElementTheme.Dark;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsPureColorOverlayEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PureColorOverlayOpacity { get; set; } = 100; // 100 % = 1.0
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsCoverOverlayEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlayBlurAmount { get; set; } = 100; // 100 % of the cover image size
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlayOpacity { get; set; } = 100; // 100 % = 1.0
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PureColorOverlayOpacity { get; set; } = 100; // 100 % = 1.0
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverOverlaySpeed { get; set; } = 50; // 50 % of the base rotate speed
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int CoverAcrylicEffectAmount { get; set; } = 0;
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsFluidOverlayEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int FluidOverlayOpacity { get; set; } = 100;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsSpectrumOverlayEnabled { get; set; } = false;
+
         public LyricsBackgroundSettings() { }
+
+        public object Clone()
+        {
+            return new LyricsBackgroundSettings
+            {
+                LyricsBackgroundTheme = this.LyricsBackgroundTheme,
+                CoverOverlayBlurAmount = this.CoverOverlayBlurAmount,
+                CoverOverlayOpacity = this.CoverOverlayOpacity,
+                PureColorOverlayOpacity = this.PureColorOverlayOpacity,
+                CoverOverlaySpeed = this.CoverOverlaySpeed,
+                CoverAcrylicEffectAmount = this.CoverAcrylicEffectAmount,
+            };
+        }
     }
 }

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

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class LyricsEffectSettings : ObservableRecipient
+    public partial class LyricsEffectSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsBlurAmount { get; set; } = 5;
 
@@ -47,5 +47,29 @@ namespace BetterLyrics.WinUI3.Models.Settings
             LyricsScrollBottomDuration = lyricsScrollBottomDuration;
             LyricsScrollEasingType = lyricsScrollEasingType;
         }
+
+        public object Clone()
+        {
+            return new LyricsEffectSettings(this.LyricsScrollTopDuration, this.LyricsScrollDuration, this.LyricsScrollBottomDuration, this.LyricsScrollEasingType)
+            {
+                LyricsBlurAmount = this.LyricsBlurAmount,
+                IsLyricsLineFadeEnabled = this.IsLyricsLineFadeEnabled,
+                IsLyricsGlowEffectEnabled = this.IsLyricsGlowEffectEnabled,
+                LyricsGlowEffectScope = this.LyricsGlowEffectScope,
+                LyricsGlowEffectAmount = this.LyricsGlowEffectAmount,
+                IsLyricsShadowEnabled = this.IsLyricsShadowEnabled,
+                LyricsShadowScope = this.LyricsShadowScope,
+                LyricsShadowAmount = this.LyricsShadowAmount,
+                LyricsHighlightScope = this.LyricsHighlightScope,
+                LyricsHighlightAmount = this.LyricsHighlightAmount,
+                LyricsTranslationHighlightAmount = this.LyricsTranslationHighlightAmount,
+                IsLyricsFloatAnimationEnabled = this.IsLyricsFloatAnimationEnabled,
+                LyricsFloatAmount = this.LyricsFloatAmount,
+                LyricsScrollTopDelay = this.LyricsScrollTopDelay,
+                LyricsScrollBottomDelay = this.LyricsScrollBottomDelay,
+                LyricsVerticalEdgeOpacity = this.LyricsVerticalEdgeOpacity,
+                IsFanLyricsEnabled = this.IsFanLyricsEnabled
+            };
+        }
     }
 }

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

@@ -11,12 +11,13 @@ using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
-    public partial class LyricsStyleSettings : ObservableRecipient
+    public partial class LyricsStyleSettings : ObservableRecipient, ICloneable
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontSize { get; set; }
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsDynamicLyricsFontSize { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontSize { get; set; } = 24;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial TextAlignmentType LyricsAlignmentType { get; set; } = TextAlignmentType.Left;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsBgFontOpacity { get; set; } = 30; // 30% opacity
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontStrokeWidth { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontStrokeWidth { get; set; } = 0;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomBgFontColor { get; set; } = Colors.White;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomFgFontColor { get; set; } = Colors.White;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial Color LyricsCustomStrokeFontColor { get; set; } = Colors.White;
@@ -36,5 +37,27 @@ namespace BetterLyrics.WinUI3.Models.Settings
             LyricsAlignmentType = lyricsAlignmentType;
             LyricsFontStrokeWidth = lyricsFontStrokeWidth;
         }
+
+        public object Clone()
+        {
+            return new LyricsStyleSettings
+            {
+                IsDynamicLyricsFontSize = this.IsDynamicLyricsFontSize,
+                LyricsFontSize = this.LyricsFontSize,
+                LyricsAlignmentType = this.LyricsAlignmentType,
+                LyricsBgFontOpacity = this.LyricsBgFontOpacity,
+                LyricsFontStrokeWidth = this.LyricsFontStrokeWidth,
+                LyricsCustomBgFontColor = this.LyricsCustomBgFontColor,
+                LyricsCustomFgFontColor = this.LyricsCustomFgFontColor,
+                LyricsCustomStrokeFontColor = this.LyricsCustomStrokeFontColor,
+                LyricsBgFontColorType = this.LyricsBgFontColorType,
+                LyricsFgFontColorType = this.LyricsFgFontColorType,
+                LyricsStrokeFontColorType = this.LyricsStrokeFontColorType,
+                LyricsFontWeight = this.LyricsFontWeight,
+                LyricsLineSpacingFactor = this.LyricsLineSpacingFactor,
+                LyricsTranslationSeparator = this.LyricsTranslationSeparator,
+                LyricsFontFamily = this.LyricsFontFamily
+            };
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/PictureInPictureModeSettings.cs

@@ -1,21 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class PictureInPictureModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Point WindowPosition { get; set; } = new Point(100, 100);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ToggleShortcut { get; set; } = new List<string>() { "Ctrl", "Shift", "P" };
-
-        public PictureInPictureModeSettings()
-        {
-            LyricsDisplayType = Enums.LyricsDisplayType.SplitView;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/StandardModeSettings.cs

@@ -1,23 +0,0 @@
-using BetterLyrics.WinUI3.Enums;
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Foundation;
-using Windows.Graphics;
-
-namespace BetterLyrics.WinUI3.Models.Settings
-{
-    public partial class StandardModeSettings : BaseModeSettings
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Rect WindowBounds { get; set; } = new Rect(100, 100, 1000, 600);
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMaximized { get; set; } = false;
-
-        public StandardModeSettings()
-        {
-            LyricsDisplayType = LyricsDisplayType.SplitView;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/TranslationSettings.cs

@@ -1,4 +1,5 @@
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
@@ -14,7 +15,12 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LibreTranslateServer { get; set; } = string.Empty;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsTranslationEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ShowTranslationOnly { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SelectedTargetLanguageIndex { get; set; } = LanguageHelper.GetDefaultTargetLanguageIndex();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string SelectedTargetLanguageCode { get; set; } = LanguageHelper.GetDefaultTargetLanguageCode();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsJyutpingEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial ChineseRomanization ChineseRomanization { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsChineseRomanizationEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsJapaneseRomanizationEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsTraditionalChineseEnabled { get; set; } = false;
 
         public TranslationSettings() { }
     }

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

@@ -21,11 +21,14 @@ namespace BetterLyrics.WinUI3.Models
         public partial double? DurationMs { get; set; }
 
         [ObservableProperty]
-        public partial string? SourceAppUserModelId { get; set; } = null;
+        public partial string? PlayerId { get; set; } = null;
 
         [ObservableProperty]
         public partial string Title { get; set; }
 
+        [ObservableProperty]
+        public partial string? SongId { get; set; } = null;
+
         public SongInfo() { }
     }
 }

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

@@ -14,6 +14,7 @@
     <Grid>
         <canvas:CanvasAnimatedControl
             x:Name="LyricsCanvas"
+            CreateResources="LyricsCanvas_CreateResources"
             Draw="LyricsCanvas_Draw"
             Update="LyricsCanvas_Update" />
     </Grid>

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

@@ -2,7 +2,11 @@
 
 using BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.WinUI;
+using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.UI.Xaml.Controls;
+using Windows.Storage;
+using Windows.Storage.Streams;
 
 namespace BetterLyrics.WinUI3.Renderer
 {
@@ -31,5 +35,10 @@ namespace BetterLyrics.WinUI3.Renderer
             LyricsCanvas.RemoveFromVisualTree();
             LyricsCanvas = null;
         }
+
+        private async void LyricsCanvas_CreateResources(Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedControl sender, Microsoft.Graphics.Canvas.UI.CanvasCreateResourcesEventArgs args)
+        {
+            await ViewModel.CreateResourcesAsync(sender);
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/ILiveStatesService.cs

@@ -10,5 +10,6 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
     public interface ILiveStatesService
     {
         LiveStates LiveStates { get; set; }
+        void RefreshLyricsWindowStatus();
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LiveStatesService/LiveStatesService.cs

@@ -1,110 +1,138 @@
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.Mvvm.Messaging.Messages;
-using System;
-using System.Collections.Generic;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.WinUI.Controls;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.LiveStatesService
 {
-    public class LiveStatesService : BaseViewModel, ILiveStatesService,
-        IRecipient<PropertyChangedMessage<LyricsWindowMode>>,
-        IRecipient<PropertyChangedMessage<LyricsDisplayType>>
+    public partial class LiveStatesService : BaseViewModel, ILiveStatesService
     {
         private readonly ISettingsService _settingsService;
 
-        public LiveStates LiveStates { get; set; }
+        public LiveStates LiveStates { get; set; } = new();
 
         public LiveStatesService(ISettingsService settingsService)
         {
             _settingsService = settingsService;
-
-            LiveStates = new LiveStates(_settingsService.AppSettings);
+            LiveStates.PropertyChanged += LiveStates_PropertyChanged;
+            LiveStates.PropertyChanging += LiveStates_PropertyChanging;
+            InitLyricsWindowStatus();
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowMode> message)
+        private void LiveStates_PropertyChanging(object? sender, System.ComponentModel.PropertyChangingEventArgs e)
         {
-            if (message.Sender is LiveStates)
+            if (e.PropertyName == nameof(LiveStates.LyricsWindowStatus))
             {
-                if (message.PropertyName == nameof(LiveStates.CurrentLyricsWindowMode))
-                {
-                    switch (message.NewValue)
-                    {
-                        case LyricsWindowMode.StandardMode:
-                            LiveStates.CurrentLyricsStyleSettings = _settingsService.AppSettings.StandardLyricsStyleSettings;
-                            LiveStates.CurrentLyricsEffectSettings = _settingsService.AppSettings.StandardLyricsEffectSettings;
-                            LiveStates.CurrentLyricsDisplayType = _settingsService.AppSettings.StandardModeSettings.LyricsDisplayType;
-                            break;
-                        case LyricsWindowMode.DockMode:
-                            LiveStates.CurrentLyricsStyleSettings = _settingsService.AppSettings.DockLyricsStyleSettings;
-                            LiveStates.CurrentLyricsEffectSettings = _settingsService.AppSettings.DockLyricsEffectSettings;
-                            LiveStates.CurrentLyricsDisplayType = _settingsService.AppSettings.DockModeSettings.LyricsDisplayType;
-                            break;
-                        case LyricsWindowMode.DesktopMode:
-                            LiveStates.CurrentLyricsStyleSettings = _settingsService.AppSettings.DesktopLyricsStyleSettings;
-                            LiveStates.CurrentLyricsEffectSettings = _settingsService.AppSettings.DesktopLyricsEffectSettings;
-                            LiveStates.CurrentLyricsDisplayType = _settingsService.AppSettings.DesktopModeSettings.LyricsDisplayType;
-                            break;
-                        case LyricsWindowMode.PictureInPictureMode:
-                            LiveStates.CurrentLyricsStyleSettings = _settingsService.AppSettings.PictureInPictureLyricsStyleSettings;
-                            LiveStates.CurrentLyricsEffectSettings = _settingsService.AppSettings.PictureInPictureLyricsEffectSettings;
-                            LiveStates.CurrentLyricsDisplayType = _settingsService.AppSettings.PictureInPictureModeSettings.LyricsDisplayType;
-                            break;
-                        default:
-                            break;
-                    }
-                }
+                LiveStates.LyricsWindowStatus.PropertyChanged -= LyricsWindowStatus_PropertyChanged;
             }
         }
 
-        public void Receive(PropertyChangedMessage<LyricsDisplayType> message)
+        private void LyricsWindowStatus_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (message.Sender is StandardModeSettings)
+            switch (e.PropertyName)
             {
-                if (message.PropertyName == nameof(StandardModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.StandardMode)
+                case nameof(LyricsWindowStatus.IsWorkArea):
+                    WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
+                    if (LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
-                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
+                        UpdateWindowBoundsWhenWorkArea();
                     }
-                }
+                    break;
+                case nameof(LyricsWindowStatus.DockHeight):
+                case nameof(LyricsWindowStatus.DockPlacement):
+                case nameof(LyricsWindowStatus.MonitorDeviceName):
+                    WindowHelper.UpdateWorkArea<LyricsWindow>();
+                    if (LiveStates.LyricsWindowStatus.IsWorkArea)
+                    {
+                        UpdateWindowBoundsWhenWorkArea();
+                    }
+                    break;
+                case nameof(LyricsWindowStatus.IsShownInSwitchers):
+                    WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
+                    break;
+                case nameof(LyricsWindowStatus.IsAlwaysOnTop):
+                    WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
+                    break;
+                case nameof(LyricsWindowStatus.IsClickThrough):
+                    WindowHelper.SetIsClickThrough<LyricsWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
+                    break;
+                case nameof(LyricsWindowStatus.IsBorderless):
+                    WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
+                    break;
+                case nameof(LyricsWindowStatus.WindowBounds):
+                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+                    break;
+                case nameof(LyricsWindowStatus.TitleBarArea):
+                    WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
+                    break;
+                default:
+                    break;
             }
-            else if (message.Sender is DockModeSettings)
+        }
+
+        private void LiveStates_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(LiveStates.LyricsWindowStatus))
             {
-                if (message.PropertyName == nameof(DockModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.DockMode)
-                    {
-                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
-                    }
-                }
+                LiveStates.LyricsWindowStatus.PropertyChanged += LyricsWindowStatus_PropertyChanged;
+                RefreshLyricsWindowStatus();
             }
-            else if (message.Sender is DesktopModeSettings)
+        }
+
+        private void InitLyricsWindowStatus()
+        {
+            var defaultLyricsWindowStatus = _settingsService.AppSettings.WindowBoundsRecords.FirstOrDefault(x => x.IsDefault);
+            if (defaultLyricsWindowStatus == null)
             {
-                if (message.PropertyName == nameof(DesktopModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.DesktopMode)
-                    {
-                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
-                    }
-                }
+                defaultLyricsWindowStatus = LyricsWindowStatusExtensions.StandardMode();
+                defaultLyricsWindowStatus.IsDefault = true;
+                _settingsService.AppSettings.WindowBoundsRecords.Add(defaultLyricsWindowStatus);
             }
-            else if (message.Sender is PictureInPictureModeSettings)
+            LiveStates.LyricsWindowStatus = defaultLyricsWindowStatus;
+        }
+
+        public void RefreshLyricsWindowStatus()
+        {
+            WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
+
+            if (LiveStates.LyricsWindowStatus.IsWorkArea)
             {
-                if (message.PropertyName == nameof(PictureInPictureModeSettings.LyricsDisplayType))
-                {
-                    if (LiveStates.CurrentLyricsWindowMode == LyricsWindowMode.PictureInPictureMode)
-                    {
-                        LiveStates.CurrentLyricsDisplayType = message.NewValue;
-                    }
-                }
+                UpdateWindowBoundsWhenWorkArea();
             }
+
+            WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+            LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
+            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
+
+            WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
+            WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
+            WindowHelper.SetIsClickThrough<LyricsWindow>(LiveStates.LyricsWindowStatus.IsClickThrough);
+            WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
+            WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
+            WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
+        }
+
+        private void UpdateWindowBoundsWhenWorkArea()
+        {
+            LiveStates.LyricsWindowStatus.WindowBounds = new Windows.Foundation.Rect(
+                LiveStates.LyricsWindowStatus.MonitorBounds.X,
+                LiveStates.LyricsWindowStatus.DockPlacement switch
+                {
+                    Enums.DockPlacement.Top => LiveStates.LyricsWindowStatus.MonitorBounds.Top,
+                    Enums.DockPlacement.Bottom => LiveStates.LyricsWindowStatus.MonitorBounds.Bottom - LiveStates.LyricsWindowStatus.DockHeight - 1,
+                    _ => LiveStates.LyricsWindowStatus.MonitorBounds.Top,
+                },
+                LiveStates.LyricsWindowStatus.MonitorBounds.Width,
+                LiveStates.LyricsWindowStatus.DockPlacement switch
+                {
+                    Enums.DockPlacement.Top => LiveStates.LyricsWindowStatus.DockHeight,
+                    Enums.DockPlacement.Bottom => LiveStates.LyricsWindowStatus.DockHeight + 1,
+                    _ => LiveStates.LyricsWindowStatus.DockHeight,
+                }
+            );
         }
     }
 }

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

@@ -11,7 +11,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
 {
     public interface ILyricsSearchService
     {
-        Task<LyricsSearchResult> SearchSmartlyAsync(string mediaSessionId, string title, string artist, string album, double durationMs, CancellationToken token);
+        Task<LyricsSearchResult> SearchSmartlyAsync(string mediaSessionId, string title, string artist, string album, double durationMs, string? songId, CancellationToken token);
 
         Task<List<LyricsSearchResult>> SearchAllAsync(string title, string artist, string album, double durationMs, CancellationToken token);
     }

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

@@ -28,6 +28,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
     {
         private readonly HttpClient _amllTtmlDbHttpClient;
         private readonly HttpClient _lrcLibHttpClient;
+        private readonly AppleMusic _appleMusic;
 
         private readonly ISettingsService _settingsService;
         private readonly ILogger _logger;
@@ -40,9 +41,10 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             _lrcLibHttpClient = new();
             _lrcLibHttpClient.DefaultRequestHeaders.Add(
                 "User-Agent",
-                $"{Constants.App.AppName} {MetadataHelper.AppVersion} ({Constants.Link.GithubUrl})"
+                $"{Constants.App.AppName} {MetadataHelper.AppVersion} ({Constants.Link.GitHubUrl})"
             );
             _amllTtmlDbHttpClient = new();
+            _appleMusic = new AppleMusic();
         }
 
         private static bool IsAmllTtmlDbIndexInvalid()
@@ -89,7 +91,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             }
         }
 
-        public async Task<LyricsSearchResult> SearchSmartlyAsync(string mediaSessionId, string title, string artist, string album, double durationMs, CancellationToken token)
+        public async Task<LyricsSearchResult> SearchSmartlyAsync(string mediaSessionId, string title, string artist, string album, double durationMs, string? songId, CancellationToken token)
         {
             var lyricsSearchResult = new LyricsSearchResult();
 
@@ -121,7 +123,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                 var targetProvider = found.LyricsSearchProvider;
                 if (targetProvider != null)
                 {
-                    return await SearchSingleAsync(targetProvider.Value, overridenTitle, overridenArtist, album, durationMs, token);
+                    return await SearchSingleAsync(targetProvider.Value, overridenTitle, overridenArtist, album, durationMs, songId, token);
                 }
             }
 
@@ -132,7 +134,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                     continue;
                 }
 
-                lyricsSearchResult = await SearchSingleAsync(provider.Provider, overridenTitle, overridenArtist, album, durationMs, token);
+                lyricsSearchResult = await SearchSingleAsync(provider.Provider, overridenTitle, overridenArtist, album, durationMs, null, token);
 
                 if (lyricsSearchResult.IsFound)
                 {
@@ -149,13 +151,13 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             var results = new List<LyricsSearchResult>();
             foreach (var provider in Enum.GetValues<LyricsSearchProvider>())
             {
-                var searchResult = await SearchSingleAsync(provider, title, artist, album, durationMs, token);
+                var searchResult = await SearchSingleAsync(provider, title, artist, album, durationMs, null, token);
                 results.Add(searchResult);
             }
             return results;
         }
 
-        private async Task<LyricsSearchResult> SearchSingleAsync(LyricsSearchProvider provider, string title, string artist, string album, double durationMs, CancellationToken token)
+        private async Task<LyricsSearchResult> SearchSingleAsync(LyricsSearchProvider provider, string title, string artist, string album, double durationMs, string? songId, CancellationToken token)
         {
             var lyricsSearchResult = new LyricsSearchResult
             {
@@ -198,17 +200,20 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                             lyricsSearchResult = await SearchLrcLibAsync(title, artist, album, (int)(durationMs / 1000));
                             break;
                         case LyricsSearchProvider.QQ:
-                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.QQMusic);
+                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, songId, Searchers.QQMusic);
                             break;
                         case LyricsSearchProvider.Kugou:
-                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.Kugou);
+                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, songId, Searchers.Kugou);
                             break;
                         case LyricsSearchProvider.Netease:
-                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.Netease);
+                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, songId, Searchers.Netease);
                             break;
                         case LyricsSearchProvider.AmllTtmlDb:
                             lyricsSearchResult = await SearchAmllTtmlDbAsync(title, artist);
                             break;
+                        case LyricsSearchProvider.AppleMusic:
+                            lyricsSearchResult = await SearchAppleMusicAsync(title, artist, album, (int)durationMs);
+                            break;
                         default:
                             break;
                     }
@@ -431,7 +436,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             return lyricsSearchResult;
         }
 
-        private static async Task<LyricsSearchResult> SearchQQNeteaseKugouAsync(string title, string artist, string album, int durationMs, Searchers searchers)
+        private static async Task<LyricsSearchResult> SearchQQNeteaseKugouAsync(string title, string artist, string album, int durationMs, string? songId, Searchers searchers)
         {
             var lyricsSearchResult = new LyricsSearchResult();
 
@@ -452,15 +457,23 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                     break;
             }
 
-            var result = await SearchersHelper.GetSearcher(searchers).SearchForResult(
-                new Lyricify.Lyrics.Models.TrackMultiArtistMetadata()
-                {
-                    DurationMs = durationMs,
-                    Album = album,
-                    Artists = [artist],
-                    Title = title,
-                }
-            );
+            ISearchResult? result;
+            if (searchers == Searchers.Netease && songId != null)
+            {
+                result = new NeteaseSearchResult(title, [artist], album, null, durationMs, songId);
+            }
+            else
+            {
+                result = await SearchersHelper.GetSearcher(searchers).SearchForResult(
+                    new Lyricify.Lyrics.Models.TrackMultiArtistMetadata()
+                    {
+                        DurationMs = durationMs,
+                        Album = album,
+                        Artists = [artist],
+                        Title = title,
+                    }
+                );
+            }
 
             if (result is QQMusicSearchResult qqResult)
             {
@@ -508,7 +521,21 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                 string? original = null;
                 if (response?.Candidates.FirstOrDefault() is SearchLyricsResponse.Candidate candidate)
                 {
-                    original = Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyrics(candidate.Id, candidate.AccessKey);
+                    original = await Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyricsAsync(candidate.Id, candidate.AccessKey);
+                    if (candidate.TransId != null)
+                    {
+                        string? translated = await Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyricsAsync(candidate.TransId, candidate.AccessKey);
+                        if (!string.IsNullOrEmpty(translated))
+                        {
+                            FileHelper.WriteLyricsCache(
+                                title,
+                                artist,
+                                translated,
+                                LyricsFormat.Lrc,
+                                PathHelper.KugouTranslationCacheDirectory
+                            );
+                        }
+                    }
                 }
 
                 lyricsSearchResult.Raw = original;
@@ -518,5 +545,24 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
 
             return lyricsSearchResult;
         }
+
+        private async Task<LyricsSearchResult> SearchAppleMusicAsync(string title, string artist, string album, int durationMs)
+        {
+            var lyricsSearchResult = new LyricsSearchResult
+            {
+                Provider = LyricsSearchProvider.AppleMusic,
+            };
+
+            if (await _appleMusic.InitAsync())
+            {
+                var raw = await _appleMusic.GetLyricsAsync(title, artist);
+                _logger.LogInformation("Apple Music lyrics search result for {Title} - {Artist}: {Raw}", title, artist, raw ?? "null");
+                lyricsSearchResult.Raw = raw;
+                lyricsSearchResult.Title = title;
+                lyricsSearchResult.Artist = artist;
+            }
+
+            return lyricsSearchResult;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/IMediaSessionsService.cs

@@ -27,9 +27,13 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
         MediaSourceProviderInfo? GetCurrentMediaSourceProviderInfo();
 
+        void UpdateLyrics();
+        void UpdateTranslations();
+
         bool IsPlaying { get; }
         SongInfo? SongInfo { get; }
         TimeSpan Position { get; }
+        LyricsData? CurrentLyricsData { get; }
 
         LyricsSearchProvider? LyricsSearchProvider { get; }
         TranslationSearchProvider? TranslationSearchProvider { get; }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs

@@ -34,7 +34,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             }
 
             byte[]? bytes = await Task.Run(async () => await _albumArtSearchService.SearchAsync(
-                SongInfo?.SourceAppUserModelId ?? "",
+                SongInfo?.PlayerId ?? "",
                 _cachedSongInfo.Title,
                 _cachedSongInfo.Artist,
                 _cachedSongInfo?.Album ?? string.Empty,
@@ -62,10 +62,10 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             albumArtSwBitmap = SoftwareBitmap.Copy(albumArtSwBitmap);
             token.ThrowIfCancellationRequested();
 
-            var albumArtLightAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, false).FirstOrDefault();
-            var albumArtDarkAccentColor = ImageHelper.GetAccentColorsFromByte(bytes, 1, true).FirstOrDefault();
+            var albumArtLightAccentColors = ImageHelper.GetAccentColorsFromByte(bytes, 4, false);
+            var albumArtDarkAccentColors = ImageHelper.GetAccentColorsFromByte(bytes, 4, true);
 
-            AlbumArtChanged?.Invoke(this, new AlbumArtChangedEventArgs(null, albumArtSwBitmap, albumArtLightAccentColor, albumArtDarkAccentColor));
+            AlbumArtChanged?.Invoke(this, new AlbumArtChangedEventArgs(null, albumArtSwBitmap, albumArtLightAccentColors, albumArtDarkAccentColors));
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs

@@ -3,6 +3,7 @@ using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
+using Lyricify.Lyrics.Helpers.General;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -22,7 +23,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private int _langIndex = 0;
         private List<LyricsData> _lyricsDataArr = [];
 
-        private LyricsData? CurrentLyricsData => _lyricsDataArr.ElementAtOrDefault(_langIndex);
+        public LyricsData? CurrentLyricsData => _lyricsDataArr.ElementAtOrDefault(_langIndex);
 
         public event EventHandler<LyricsChangedEventArgs>? LyricsChanged;
 
@@ -57,7 +58,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private async Task SetDisplayedAlongWithTranslationsAsync(CancellationToken token)
         {
             _logger.LogInformation("Showing translation for lyrics...");
-            string targetLangCode = LanguageHelper.SupportedTargetLanguages[_settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageIndex].Code;
+            string targetLangCode = _settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageCode;
             _logger.LogInformation("Target language code: {TargetLangCode}", targetLangCode);
             string? originalText = _lyricsDataArr.FirstOrDefault()?.WrappedOriginalText;
             if (originalText == null) return;
@@ -65,6 +66,25 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             string? originalLangCode = LanguageHelper.DetectLanguageCode(originalText);
             _logger.LogInformation("Original language code: {OriginalLangCode}", originalLangCode ?? "null");
 
+            if (originalLangCode == "zh" && _settingsService.AppSettings.TranslationSettings.IsChineseRomanizationEnabled)
+            {
+                switch (_settingsService.AppSettings.TranslationSettings.ChineseRomanization)
+                {
+                    case ChineseRomanization.Pinyin:
+                        targetLangCode = "pinyin";
+                        break;
+                    case ChineseRomanization.Jyutping:
+                        targetLangCode = "jyutping";
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else if (originalLangCode == "ja" && _settingsService.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled)
+            {
+                targetLangCode = "romaji";
+            }
+
             if (originalLangCode == targetLangCode)
             {
                 _logger.LogInformation("Original lyrics already in target language: {TargetLangCode}", targetLangCode);
@@ -74,7 +94,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             else
             {
                 // Try get translation from itself first
-                int found = _translateService.SearchTranslatedLyricsItself(_lyricsDataArr);
+                int found = _translateService.SearchTranslatedLyricsItself(_lyricsDataArr, targetLangCode);
                 if (found >= 0)
                 {
                     _logger.LogInformation("Found translation in lyrics data at index {FoundIndex}", found);
@@ -85,7 +105,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                     }
                     else
                     {
-                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], _liveStatesService.LiveStates.CurrentLyricsStyleSettings.LyricsTranslationSeparator, 50);
+                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator, 50);
                         _langIndex = 0;
                         TranslationSearchProvider = LyricsSearchProvider.ToTranslationSearchProvider();
                     }
@@ -108,7 +128,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                         }
                         else
                         {
-                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated, _liveStatesService.LiveStates.CurrentLyricsStyleSettings.LyricsTranslationSeparator);
+                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator);
                             _langIndex = 0;
                         }
                         TranslationSearchProvider = Enums.TranslationSearchProvider.LibreTranslate;
@@ -136,19 +156,21 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                     SongInfo.Title, SongInfo.Artist, SongInfo.Album, SongInfo.DurationMs);
 
                 var lyricsSearchResult = await Task.Run(async () => await _lyrcsSearchService.SearchSmartlyAsync(
-                    SongInfo.SourceAppUserModelId ?? "",
+                    SongInfo.PlayerId ?? "",
                     SongInfo.Title,
                     SongInfo.Artist,
                     SongInfo.Album ?? "",
                     SongInfo.DurationMs ?? 0,
+                    SongInfo.SongId,
                     token
                 ), token);
                 if (token.IsCancellationRequested) return;
                 LyricsSearchProvider = lyricsSearchResult?.Provider;
-                
+
                 _logger.LogInformation("Lyrics was found? {Found}, Provider: {LyricsSearchProvider}", lyricsSearchResult?.IsFound, LyricsSearchProvider?.ToString() ?? "null");
 
                 _lyricsDataArr = new LyricsParser().Parse(lyricsSearchResult?.Raw, (int?)SongInfo?.DurationMs);
+                ApplyChinesePreference();
                 FillTranslationFromCache(LyricsSearchProvider);
             }
             else
@@ -161,10 +183,23 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             // This ensures that original lyrics are always shown while waiting for translations
             _lyricsDataArr[0].SetDisplayedTextInOriginalText();
             LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
-
+            ApplyChinesePreference();
             UpdateTranslations();
         }
 
+        private void ApplyChinesePreference()
+        {
+            var traditionalChinesePreferred = _settingsService.AppSettings.TranslationSettings.IsTraditionalChineseEnabled;
+            var found = _lyricsDataArr.FindIndex(x => x.LanguageCode == "zh");
+            if (found >= 0)
+            {
+                foreach (var item in _lyricsDataArr[found].LyricsLines)
+                {
+                    item.OriginalText = traditionalChinesePreferred ? ChineseHelper.S2T(item.OriginalText) : ChineseHelper.T2S(item.OriginalText);
+                }
+            }
+        }
+
         private void FillTranslationFromCache(LyricsSearchProvider? provider)
         {
             string? translationRaw = null;
@@ -174,6 +209,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                     translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
                     break;
                 case Enums.LyricsSearchProvider.Kugou:
+                    translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.KugouTranslationCacheDirectory);
                     break;
                 case Enums.LyricsSearchProvider.Netease:
                     translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
@@ -214,12 +250,12 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             }
         }
 
-        private void UpdateLyrics()
+        public void UpdateLyrics()
         {
             _refreshLyricsRunner.RunAsync(RefreshLyricsAsync);
         }
 
-        private void UpdateTranslations()
+        public void UpdateTranslations()
         {
             _refreshTranslationRunner.RunAsync(RefreshTranslationAsync);
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs

@@ -7,7 +7,6 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 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;
@@ -20,19 +19,12 @@ using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using EvtSource;
 using Microsoft.Extensions.Logging;
-using Microsoft.Graphics.Canvas;
 using Microsoft.UI.Dispatching;
-using SixLabors.ImageSharp.PixelFormats;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
-using Windows.Graphics.Imaging;
 using Windows.Media.Control;
 using Windows.Storage.Streams;
 using WindowsMediaController;
@@ -40,10 +32,10 @@ using WindowsMediaController;
 namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 {
     public partial class MediaSessionsService : BaseViewModel, IMediaSessionsService,
-        IRecipient<PropertyChangedMessage<int>>,
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<string>>,
-        IRecipient<PropertyChangedMessage<LyricsWindowMode>>,
+        IRecipient<PropertyChangedMessage<LyricsWindowStatus>>,
+        IRecipient<PropertyChangedMessage<ChineseRomanization>>,
         IRecipient<PropertyChangedMessage<List<string>>>
     {
         private readonly IAlbumArtSearchService _albumArtSearchService;
@@ -56,6 +48,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
         private double _lxMusicPositionSeconds = 0;
         private double _lxMusicDurationSeconds = 0;
+        private byte[]? _lxMusicAlbumArtBytes = null;
 
         private bool _cachedIsPlaying = false;
         private TimeSpan _cachedPosition = TimeSpan.Zero;
@@ -291,21 +284,21 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 if (!_mediaManager.IsStarted) return;
                 if (mediaSession == null) return;
 
-                string id = mediaSession.Id;
+                string sessionId = mediaSession.Id;
 
                 var desiredSession = GetCurrentSession();
 
                 //RecordMediaSourceProviderInfo(mediaSession);
                 if (mediaSession != desiredSession) return;
 
-                if (!IsMediaSourceEnabled(id))
+                if (!IsMediaSourceEnabled(sessionId))
                 {
                     _cachedSongInfo = null;
 
                     _logger.LogInformation("Media properties changed: Title: {Title}, Artist: {Artist}, Album: {Album}",
                         mediaProperties.Title, mediaProperties.Artist, mediaProperties.AlbumTitle);
 
-                    if (id == Constants.PlayerID.LXMusic)
+                    if (sessionId == Constants.PlayerID.LXMusic)
                     {
                         StopSSE();
                     }
@@ -320,21 +313,35 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                         currentMediaSourceProviderInfo?.PositionOffset = 0;
                     }
 
+                    string fixedArtist = mediaProperties.Artist;
+                    string fixedAlbum = mediaProperties.AlbumTitle;
+                    string? songId = null;
+
+                    if (sessionId == Constants.PlayerID.AppleMusic || sessionId == Constants.PlayerID.AppleMusicAlternative)
+                    {
+                        fixedArtist = mediaProperties.Artist.Split(" — ").FirstOrDefault() ?? mediaProperties.Artist;
+                        fixedAlbum = mediaProperties.Artist.Split(" — ").LastOrDefault() ?? mediaProperties.AlbumTitle;
+                    }
+                    else if (PlayerIdMatcher.IsNeteaseFamily(sessionId))
+                    {
+                        songId = mediaProperties.Genres.FirstOrDefault()?.Replace("NCM-", "");
+                    }
+
                     _cachedSongInfo = new SongInfo
                     {
                         Title = mediaProperties.Title,
-                        Artist = mediaProperties.Artist,
-                        Album = mediaProperties.AlbumTitle,
+                        Artist = fixedArtist,
+                        Album = fixedAlbum,
                         DurationMs = mediaSession.ControlSession.GetTimelineProperties().EndTime.TotalMilliseconds,
-                        SourceAppUserModelId = id,
+                        PlayerId = sessionId,
+                        SongId = songId
                     };
-
                     _cachedSongInfo.Duration = (int)(_cachedSongInfo.DurationMs / 1000f);
 
                     _logger.LogInformation("Media properties changed: Title: {Title}, Artist: {Artist}, Album: {Album}",
                         mediaProperties.Title, mediaProperties.Artist, mediaProperties.AlbumTitle);
 
-                    if (id == Constants.PlayerID.LXMusic)
+                    if (sessionId == Constants.PlayerID.LXMusic)
                     {
                         StartSSE();
                     }
@@ -343,7 +350,11 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                         StopSSE();
                     }
 
-                    if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
+                    if (sessionId == Constants.PlayerID.LXMusic && _lxMusicAlbumArtBytes != null)
+                    {
+                        _SMTCAlbumArtBytes = _lxMusicAlbumArtBytes;
+                    }
+                    else if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
                     {
                         _SMTCAlbumArtBytes = await ImageHelper.ToByteArrayAsync(streamReference);
                     }
@@ -416,7 +427,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 var found = _settingsService.AppSettings.MediaSourceProvidersInfo.FirstOrDefault(x => x.Provider == id);
                 if (found == null)
                 {
-                    _settingsService.AppSettings.MediaSourceProvidersInfo.Add(new MediaSourceProviderInfo(id));
+                    _settingsService.AppSettings.MediaSourceProvidersInfo.Add(new MediaSourceProviderInfo(id, _settingsService.AppSettings.GeneralSettings.ListenOnNewPlaybackSource));
                 }
             });
         }
@@ -447,6 +458,11 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
         private void StartSSE()
         {
+            if (_sse != null)
+            {
+                return;
+            }
+
             try
             {
                 _sse = new EventSourceReader(new Uri($"{_settingsService.AppSettings.GeneralSettings.LXMusicServer}{Constants.LXMusic.QuerySuffix}")).Start();
@@ -486,9 +502,9 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
         private void Sse_MessageReceived(object sender, EventSourceMessageEventArgs e)
         {
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, async () =>
             {
-                if (_cachedSongInfo?.SourceAppUserModelId == Constants.PlayerID.LXMusic)
+                if (_cachedSongInfo?.PlayerId == Constants.PlayerID.LXMusic)
                 {
                     var data = JsonSerializer.Deserialize(e.Message, Serialization.SourceGenerationContext.Default.JsonElement);
                     if (data.ValueKind == JsonValueKind.Number)
@@ -507,6 +523,20 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                             TimelineChanged?.Invoke(this, new TimelineChangedEventArgs(TimeSpan.FromSeconds(_lxMusicPositionSeconds), TimeSpan.FromSeconds(_lxMusicDurationSeconds)));
                         }
                     }
+                    else if (data.ValueKind == JsonValueKind.String)
+                    {
+                        if (e.Event == "picUrl")
+                        {
+                            string? picUrl = data.GetString();
+                            if (picUrl != null)
+                            {
+                                _logger.LogInformation("LX Music Album Art URL: {url}", picUrl);
+                                _lxMusicAlbumArtBytes = await ImageHelper.GetImageBytesFromUrlAsync(picUrl);
+                                _SMTCAlbumArtBytes = _lxMusicAlbumArtBytes;
+                                UpdateAlbumArt();
+                            }
+                        }
+                    }
                 }
             });
         }
@@ -579,6 +609,18 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 {
                     UpdateTranslations();
                 }
+                else if (message.PropertyName == nameof(TranslationSettings.IsChineseRomanizationEnabled))
+                {
+                    UpdateTranslations();
+                }
+                else if (message.PropertyName == nameof(TranslationSettings.IsJapaneseRomanizationEnabled))
+                {
+                    UpdateTranslations();
+                }
+                else if (message.PropertyName == nameof(TranslationSettings.IsTraditionalChineseEnabled))
+                {
+                    UpdateLyrics();
+                }
             }
         }
 
@@ -601,18 +643,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             }
         }
 
-        public void Receive(PropertyChangedMessage<int> message)
-        {
-            if (message.Sender is TranslationSettings)
-            {
-                if (message.PropertyName == nameof(TranslationSettings.SelectedTargetLanguageIndex))
-                {
-                    _logger.LogInformation("Target language index changed: {Index}", _settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageIndex);
-                    UpdateTranslations();
-                }
-            }
-        }
-
         public void Receive(PropertyChangedMessage<string> message)
         {
             if (message.Sender is LyricsStyleSettings)
@@ -622,13 +652,33 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                     UpdateTranslations();
                 }
             }
+            else if (message.Sender is TranslationSettings)
+            {
+                if (message.PropertyName == nameof(TranslationSettings.SelectedTargetLanguageCode))
+                {
+                    _logger.LogInformation("Target language code changed: {code}", _settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageCode);
+                    UpdateTranslations();
+                }
+            }
+
         }
 
-        public void Receive(PropertyChangedMessage<LyricsWindowMode> message)
+        public void Receive(PropertyChangedMessage<LyricsWindowStatus> message)
         {
             if (message.Sender is LiveStates)
             {
-                if (message.PropertyName == nameof(LiveStates.CurrentLyricsWindowMode))
+                if (message.PropertyName == nameof(LiveStates.LyricsWindowStatus))
+                {
+                    UpdateTranslations();
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<ChineseRomanization> message)
+        {
+            if (message.Sender is TranslationSettings)
+            {
+                if (message.PropertyName == nameof(TranslationSettings.ChineseRomanization))
                 {
                     UpdateTranslations();
                 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/SettingsService/SettingsService.cs

@@ -29,23 +29,6 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
 
             AppSettings.PropertyChanged += AppSettings_PropertyChanged;
 
-            AppSettings.StandardModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DesktopModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DockModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.PictureInPictureModeSettings.PropertyChanged += AppSettings_PropertyChanged;
-
-            AppSettings.StandardLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DesktopLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DockLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.PictureInPictureLyricsStyleSettings.PropertyChanged += AppSettings_PropertyChanged;
-
-            AppSettings.StandardLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DesktopLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.DockLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.PictureInPictureLyricsEffectSettings.PropertyChanged += AppSettings_PropertyChanged;
-
-            AppSettings.LyricsBackgroundSettings.PropertyChanged += AppSettings_PropertyChanged;
-            AppSettings.AlbumArtLayoutSettings.PropertyChanged += AppSettings_PropertyChanged;
             AppSettings.TranslationSettings.PropertyChanged += AppSettings_PropertyChanged;
             AppSettings.GeneralSettings.PropertyChanged += AppSettings_PropertyChanged;
             AppSettings.MusicGallerySettings.PropertyChanged += AppSettings_PropertyChanged;
@@ -60,6 +43,9 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
             AppSettings.MappedSongSearchQueries.CollectionChanged += AppSettings_CollectionChanged;
             AppSettings.MappedSongSearchQueries.ItemPropertyChanged += AppSettings_ItemPropertyChanged;
 
+            AppSettings.WindowBoundsRecords.CollectionChanged += AppSettings_CollectionChanged;
+            AppSettings.WindowBoundsRecords.ItemPropertyChanged += AppSettings_ItemPropertyChanged;
+
             AppSettings.Version = MetadataHelper.AppVersion;
 
             EnsureMediaSourceProvidersInfo();
@@ -119,10 +105,6 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
         {
             switch (e.PropertyName)
             {
-                case nameof(GeneralSettings.IsDragEverywhereEnabled):
-                    LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-                    lyricsWindow?.UpdateTitleBarArea();
-                    break;
                 case nameof(GeneralSettings.Language):
                     switch (AppSettings.GeneralSettings.Language)
                     {

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

@@ -12,6 +12,6 @@ namespace BetterLyrics.WinUI3.Services.TranslateService
     {
         Task<string> TranslateTextAsync(string text, string targetLangCode, CancellationToken token);
 
-        int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr);
+        int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr, string targetLangCode);
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/TranslateService/TranslateService.cs

@@ -58,9 +58,8 @@ namespace BetterLyrics.WinUI3.Services.TranslateService
             return result?.TranslatedText ?? string.Empty;
         }
 
-        public int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr)
+        public int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr, string targetLangCode)
         {
-            string targetLangCode = LanguageHelper.SupportedTargetLanguages[_settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageIndex].Code;
             if (lyricsDataArr.Count > 1)
             {
                 for (int i = 1; i < lyricsDataArr.Count; i++)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw

@@ -123,26 +123,11 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>Music player</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>Desktop mode</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>Dock mode</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>Picture-in-picture mode</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>Standard</value>
-  </data>
-  <data name="BaseWindowAOTFlyoutItem.Text" xml:space="preserve">
-    <value>Always on top</value>
-  </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>Press Esc to exit full screen mode</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>Full screen</value>
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
+    <value>General</value>
   </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>Do not show this message again</value>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>
+  <data name="DemoWindowControlDefault.Text" xml:space="preserve">
+    <value>Default</value>
+  </data>
   <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
     <value>Dependencies</value>
   </data>
+  <data name="DesktopMode" xml:space="preserve">
+    <value>Desktop mode (transparent)</value>
+  </data>
+  <data name="DockedMode" xml:space="preserve">
+    <value>Docked mode</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>Export successful</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Unable to connect to LX Music server, please go to Settings - Advanced options to check if the link is entered correctly</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>Fullscreen mode</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>Lock</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>Lock</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>Desktop mode</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>Dock mode</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>Lock</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>More</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>Music gallery</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>Settings</value>
@@ -223,7 +214,7 @@
     <value>Manually search lyrics</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>Lyrics style and effect quick settings</value>
+    <value>Lyrics Window Management Shortcut Settings</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>Play source shortcut settings</value>
@@ -285,6 +276,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>Title</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>Lyrics search - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>Local .ESLRC files</value>
   </data>
@@ -300,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>Immersive mode</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>Album art only</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>Current lyrics window config</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Switch to desktop lyrics mode</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>Lyrics window mode</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>Set as default</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>Album art area only</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>Hover back again to show the toggle button</value>
@@ -439,6 +439,21 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Music gallery - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>Narrow mode</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>Picture-in-picture mode</value>
+  </data>
+  <data name="SetingsPageDonation.Text" xml:space="preserve">
+    <value>Donation</value>
+  </data>
+  <data name="SetingsPageFeedback.Text" xml:space="preserve">
+    <value>Feedback</value>
+  </data>
+  <data name="SetingsPageThanks.Text" xml:space="preserve">
+    <value>If you like this project, please consider supporting it by donating. Your support will help keep the project alive and encourage further development.</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>About</value>
   </data>
@@ -448,18 +463,33 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>Acrylic Thin</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>At the same time, set the pure color layer opacity and the album art layer opacity in the lyrics background to 0 to get the correct effect</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>Adapt to environmental color</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>Add a folder</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>Add</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>Advanced options</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>Album art</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>Album art layer</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>Configure album cover source</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>Album art size</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>Album art source</value>
   </data>
@@ -469,12 +499,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>How much the shadows are spreading</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>Album art area style</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>Amount</value>
   </data>
+  <data name="SettingsPageAOT.Header" xml:space="preserve">
+    <value>Bring the lyrics window to the top</value>
+  </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>App appearance and behavior</value>
   </data>
@@ -482,38 +515,17 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
     <value>App appearance</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>App behavior</value>
+    <value>General behavior</value>
   </data>
-  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
-    <value>Desktop mode</value>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>Apply</value>
   </data>
-  <data name="SettingsPageAppDock.Text" xml:space="preserve">
-    <value>Dock mode</value>
-  </data>
-  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
-    <value>Picture-in-picture mode</value>
-  </data>
-  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
-    <value>Standard</value>
-  </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>Auto-lock when activating desktop mode</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>Automatic resizing</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>Automatic startup</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>Activate desktop mode</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>Activate dock mode</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>Activate standard mode</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>Start Picture-in-Picture Mode</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>When starting the app</value>
   </data>
@@ -523,41 +535,83 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>Album Background Acrylic Effect Strength</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>Lyrics background</value>
   </data>
+  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
+    <value>Blur amount</value>
+  </data>
+  <data name="SettingsPageBorderless.Header" xml:space="preserve">
+    <value>Borderless window</value>
+  </data>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>Borderless lyrics window shortcut</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>Including log files, network lyrics cache</value>
   </data>
   <data name="SettingsPageCache.Header" xml:space="preserve">
     <value>Cache</value>
   </data>
+  <data name="SettingsPageChinese.Header" xml:space="preserve">
+    <value>Chinese pronunciation</value>
+  </data>
+  <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
+    <value>Convert Chinese to Traditional Chinese</value>
+  </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>Click-through</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>Click-through shortcut keys</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>Compact</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>Naming the recorded window states can help you distinguish them better</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>Configuration name</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>Create from the current lyrics window status</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>Create from templates</value>
+  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>Current lyrics window status</value>
+  </data>
   <data name="SettingsPageDark.Content" xml:space="preserve">
     <value>Dark</value>
   </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>Show debug overlay</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>Desktop Acrylic</value>
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
+    <value>Delete</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>Advanced options</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>Desktop mode (transparent)</value>
   </data>
-  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
+    <value>This project is provided as is without warranty of any kind. All lyrics, fonts, icons, and other third-party resources are the property of their respective copyright holders. The author of this project does not claim ownership of such resources.  This project is non-commercial and should not be used to infringe any rights. Users are responsible for ensuring their own use complies with applicable laws and licenses.</value>
+  </data>
+  <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>Lyrics album layout mode</value>
+    <value>Layout mode</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>Docked mode</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>Target monitor</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>Dock mode placement</value>
+    <value>Work area placement</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>Bottom</value>
@@ -568,6 +622,12 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>Window height</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>Draggable area</value>
+  </data>
+  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
+    <value>Automatic adjustment</value>
+  </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>Easing animation type</value>
   </data>
@@ -610,6 +670,21 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>Environmental color sampe mode</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>Above the window</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>Below the window</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>Window edges</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>Inside the window</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>Exit the program when you close the lyrics window</value>
   </data>
@@ -622,44 +697,38 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>Fan lyrics</value>
   </data>
-  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+  <data name="SettingsPageFAQ.Content" xml:space="preserve">
     <value>Frequently asked questions</value>
   </data>
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>Fixed time step rendering</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>Fluid layer</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>Follow system</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>Keep the lyrics window on top by polling</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>Force on top</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>Rendering frame rate</value>
   </data>
-  <data name="SettingsPageGitHub.ActionIconToolTip" xml:space="preserve">
-    <value>Open in new window</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>Fullscreen mode</value>
   </data>
-  <data name="SettingsPageGitHub.Description" xml:space="preserve">
-    <value>See source code on GitHub</value>
-  </data>
-  <data name="SettingsPageGitHub.Header" xml:space="preserve">
-    <value>This is an open source app</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>Extend the title bar to the entire page so that the window can be dragged in any non-interactive area</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>Global drag</value>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>Height</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>Automatically hide the window when no songs are playing in dock mode or desktop mode</value>
+    <value>Automatically hide/show lyric window when music is not playing</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
-    <value>Auto-hide window</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>Force this app to appear on top of full-screen apps when docked or desktop mode is enabled</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>Always stay on top of fullscreen applications</value>
+    <value>Automatically hide/show windows</value>
   </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>Import settings</value>
@@ -670,9 +739,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
+  <data name="SettingsPageJapanese.Header" xml:space="preserve">
+    <value>Japanese annotation</value>
+  </data>
   <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
     <value>Join now</value>
   </data>
+  <data name="SettingsPageJyutping.Content" xml:space="preserve">
+    <value>Cantonese pinyin</value>
+  </data>
   <data name="SettingsPageKO.Content" xml:space="preserve">
     <value>한국어</value>
   </data>
@@ -706,14 +781,23 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>Username</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>Layout orientation</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>Horizontal</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>Vertical</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>Server address</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>Light</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>Unlock and lock shortcut keys</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>Enable monitoring for new playback sources</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>Log record</value>
@@ -721,7 +805,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>Lyrics style and effect</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -730,15 +814,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>Lyrics background</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>Album background layer ambiguity</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>Album background layer opacity</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>Album Background Layer Motion Rate</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>Font color (Non-current playback area)</value>
   </data>
@@ -838,9 +913,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>Normal</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>Solid background layer opacity</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>Current char</value>
   </data>
@@ -892,6 +964,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>Top and bottom edge opacity</value>
   </data>
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
+    <value>Lyrics window manager</value>
+  </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>Lyrics window manager</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>Lyrics window status switcher shortcut</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>Media library</value>
   </data>
@@ -916,13 +997,19 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>Listen to file changes in real time</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>Narrow mode</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>Next track shortcut keys</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>None</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>Opacity</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>Open in file explorer</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -937,6 +1024,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>The path cannot be found on your computer</value>
   </data>
+  <data name="SettingsPagePinyin.Content" xml:space="preserve">
+    <value>Pinyin of Mandarin</value>
+  </data>
   <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
     <value>Playback sources</value>
   </data>
@@ -955,9 +1045,21 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>Shortcut keys for the previous track</value>
   </data>
-  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>Pure color layer</value>
+  </data>
+  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ feedback &amp; chat group</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>Realtime status</value>
+  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>Record</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>Recorded window status</value>
+  </data>
   <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
     <value>Original files and folders in this path will not be deleted when removing it from this app</value>
   </data>
@@ -970,6 +1072,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageRestart.Content" xml:space="preserve">
     <value>Restart app to apply change</value>
   </data>
+  <data name="SettingsPageRomaji.Header" xml:space="preserve">
+    <value>Japanese annotation</value>
+  </data>
   <data name="SettingsPageSC.Content" xml:space="preserve">
     <value>简体中文</value>
   </data>
@@ -1003,6 +1108,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>Server test successful</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>Settings</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>Settings manager</value>
   </data>
@@ -1012,6 +1120,21 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>This hotkey has been successfully registered</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>Show artists</value>
+  </data>
+  <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
+    <value>Lyrics window display and hide shortcut keys</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>e.g. Alt + Tab, Taskbar</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>Show in system environment</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>Show title</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>Current value: </value>
   </data>
@@ -1030,6 +1153,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>Right</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>Spectrum layer</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>Motion rate</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>Standard mode</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>Default</value>
   </data>
@@ -1039,7 +1171,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageTC.Content" xml:space="preserve">
     <value>繁體中文</value>
   </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
+  <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
@@ -1048,6 +1180,15 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>Settings - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>Top</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>The whole window</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>Title bar size</value>
   </data>
@@ -1069,6 +1210,24 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>Version</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>Width</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>Window bounds</value>
+  </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>As a separate work area docked to the upper/lower edge of the screen</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>As work area</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>Work area height</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>Standard mode</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>Exit</value>
   </data>
@@ -1090,9 +1249,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>Unlock the window</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>Translate server is not set, please configure it in settings first</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw

@@ -123,26 +123,11 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>音楽プレーヤー</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>デスクトップモード</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>ドックモード</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>ピクチャーインピクチャーモード</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>標準モード</value>
-  </data>
-  <data name="BaseWindowAOTFlyoutItem.Text" xml:space="preserve">
-    <value>常にトップ</value>
-  </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>ESCを押して、フルスクリーンモードを終了します</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>全画面表示</value>
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
+    <value>一般的な</value>
   </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>このメッセージを二度と見せないでください</value>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>キャンセル</value>
   </data>
+  <data name="DemoWindowControlDefault.Text" xml:space="preserve">
+    <value>デフォルト</value>
+  </data>
   <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
     <value>依存関係</value>
   </data>
+  <data name="DesktopMode" xml:space="preserve">
+    <value>デスクトップモード（透明） </value>
+  </data>
+  <data name="DockedMode" xml:space="preserve">
+    <value>ドック式</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>エクスポートが成功しました</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music Serverに接続できない場合は、設定に移動してください。リンクが正しく入力されているかどうかを確認するための高度なオプションに移動してください</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>フルスクリーンモード</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>ロック</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>ロック</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>デスクトップモード</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>ドックモード</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>ロック</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>もっと</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>ミュージックギャラリー</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>設定</value>
@@ -223,7 +214,7 @@
     <value>手動で歌詞を検索します</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>歌詞スタイルと効果クイック設定</value>
+    <value>歌詞ウィンドウ管理ショートカット設定</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>再生ソースクイック設定</value>
@@ -285,6 +276,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>タイトル</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>歌詞検索 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>ローカル.ESLRCファイル</value>
   </data>
@@ -300,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>没入モード</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>アルバムアートのみ</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>現在の歌詞ウィンドウ設定</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>デスクトップ歌詞モードに切り替えます</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>歌詞ウィンドウモード</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>既定のブラウザーに設定する</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>アルバムアートエリアのみ</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>再びホバリングして、トグルボタンを表示します</value>
@@ -439,6 +439,21 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音楽ギャラリー - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>狭い</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>ピクチャーインピクチャーモード</value>
+  </data>
+  <data name="SetingsPageDonation.Text" xml:space="preserve">
+    <value>寄付</value>
+  </data>
+  <data name="SetingsPageFeedback.Text" xml:space="preserve">
+    <value>フィードバック</value>
+  </data>
+  <data name="SetingsPageThanks.Text" xml:space="preserve">
+    <value>このプロジェクトが気に入っている場合は、寄付してサポートすることを検討してください。あなたのサポートは、プロジェクトを生かし続け、さらなる開発を促進するのに役立ちます。</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>について</value>
   </data>
@@ -448,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>アクリル薄い</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>同時に、歌詞の背景のピュアカラーレイヤーの不透明度とアルバムアートレイヤーの不透明度を0に設定して、正しい効果を得ます</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>環境の色に適応しましょう</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>フォルダーを追加します</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>追加</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>高度なオプション</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>アルバムアート</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>アルバムアートレイヤー</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>アルバムカバーソースを構成します</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>アルバムアートサイズ</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>アルバムアートソース</value>
   </data>
@@ -469,12 +499,15 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>影がどれだけ広がっているか</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>アルバムエリアスタイル</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>量</value>
   </data>
+  <data name="SettingsPageAOT.Header" xml:space="preserve">
+    <value>歌詞ウィンドウを一番上に表示します</value>
+  </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>アプリの外観と動作</value>
   </data>
@@ -482,38 +515,17 @@
     <value>アプリの外観</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>アプリの動作</value>
+    <value>一般的な行動</value>
   </data>
-  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
-    <value>デスクトップモード</value>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>適用する</value>
   </data>
-  <data name="SettingsPageAppDock.Text" xml:space="preserve">
-    <value>ドックモード</value>
-  </data>
-  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
-    <value>ピクチャーインピクチャーモード</value>
-  </data>
-  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
-    <value>標準モード</value>
-  </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>デスクトップモードをアクティブにするときの自動ロック</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>自動サイズ変更</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自動起動</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>デスクトップモードを開始します</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>ドックモードをアクティブにします</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>標準モードをアクティブにします</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>ピクチャーインピクチャーモードを開始します</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>アプリを起動するとき</value>
   </data>
@@ -523,41 +535,83 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>アルバムの背景アクリル効果の強さ</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>歌詞の背景</value>
   </data>
+  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
+    <value>ぼやけの量</value>
+  </data>
+  <data name="SettingsPageBorderless.Header" xml:space="preserve">
+    <value>ボーダーレスウィンドウ</value>
+  </data>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>ボーダーレス歌詞ウィンドウショートカット</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>ログファイル、ネットワーク歌詞キャッシュを含む</value>
   </data>
   <data name="SettingsPageCache.Header" xml:space="preserve">
     <value>キャッシュ</value>
   </data>
+  <data name="SettingsPageChinese.Header" xml:space="preserve">
+    <value>中国の発音</value>
+  </data>
+  <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
+    <value>中国人を伝統的な中国人に変換します</value>
+  </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>クリックスルー</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>クリックスルーショートカットキー</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>コンパクト</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>記録されたウィンドウの状態に名前を付けると、それらをよりよく区別するのに役立ちます</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>設定名</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>現在の歌詞ウィンドウのステータスから作成</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>テンプレートから作成</value>
+  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>現在の歌詞ウィンドウステータス</value>
+  </data>
   <data name="SettingsPageDark.Content" xml:space="preserve">
     <value>暗い</value>
   </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>デバッグオーバーレイを表示します</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>デスクトップアクリル</value>
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
+    <value>消去</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>高度なオプション</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>デスクトップモード（透明） </value>
   </data>
-  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
+    <value>このプロジェクトは、いかなる種類の保証もなく現状のまま提供されています。すべての歌詞、フォント、アイコン、およびその他のサードパーティのリソースは、それぞれの著作権所有者の財産です。このプロジェクトの作成者は、そのようなリソースの所有権を主張していません。このプロジェクトは非営利的であり、いかなる権利も侵害するために使用すべきではありません。ユーザーは、自らの使用が適用される法律およびライセンスに準拠していることを確認する責任があります。</value>
+  </data>
+  <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>歌詞アルバムレイアウトモード</value>
+    <value>レイアウトモード</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>ドック式</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>ターゲットモニター</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>ドックモード配置</value>
+    <value>作業エリアの配置</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>底</value>
@@ -568,6 +622,12 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>窓の高さ</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>ドラッグ可能</value>
+  </data>
+  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
+    <value>自動調整</value>
+  </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>アニメーションタイプを緩和します</value>
   </data>
@@ -610,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>環境カラーサンプモード</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>窓の上</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>窓の下</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>ウィンドウエッジ</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>窓の中だ</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>歌詞ウィンドウを閉じてプログラムを終了してください</value>
   </data>
@@ -622,44 +697,38 @@
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>ファンの歌詞</value>
   </data>
-  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+  <data name="SettingsPageFAQ.Content" xml:space="preserve">
     <value>よくある質問</value>
   </data>
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>固定時間ステップレンダリング</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>流体層</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>システムをフォローします</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>ポーリングで歌詞ウィンドウを一番上に保ちましょう</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>強制的に上に</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>レンダリングフレームレート</value>
   </data>
-  <data name="SettingsPageGitHub.ActionIconToolTip" xml:space="preserve">
-    <value>新しいウィンドウで開きます</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>フルスクリーンモード</value>
   </data>
-  <data name="SettingsPageGitHub.Description" xml:space="preserve">
-    <value>GitHubのソースコードを参照してください</value>
-  </data>
-  <data name="SettingsPageGitHub.Header" xml:space="preserve">
-    <value>これはオープンソースアプリです</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>タイトルバーをページ全体に拡張して、ウィンドウを非対話領域でドラッグできるようにします</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>グローバルドラッグ</value>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>高さ</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>ドックモードやデスクトップモードで再生されている曲がないときにウィンドウを自動的に非表示にする</value>
+    <value>音楽が再生されていないときに、自動的に歌詞ウィンドウを非表示/表示します</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
-    <value>自動ハイドウィンドウ</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>このアプリは、ドッキングまたはデスクトップモードが有効になっているときにフルスクリーンアプリの上に表示されます</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>常にフルスクリーンアプリケーションを常に把握してください</value>
+    <value>Windowsを自動的に非表示/表示します</value>
   </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>設定をインポートします</value>
@@ -670,9 +739,15 @@
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
+  <data name="SettingsPageJapanese.Header" xml:space="preserve">
+    <value>日本の注釈</value>
+  </data>
   <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
     <value>今すぐ参加してください</value>
   </data>
+  <data name="SettingsPageJyutping.Content" xml:space="preserve">
+    <value>広東語のピンイン</value>
+  </data>
   <data name="SettingsPageKO.Content" xml:space="preserve">
     <value>한국어</value>
   </data>
@@ -706,14 +781,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>ユーザー名</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>レイアウトの向き</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>水平方向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>垂直方向</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>サーバーアドレス</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>ライト</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>ショートカットキーのロックを解除およびロックします</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>新しい再生ソースの監視を有効にします</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>ログレコード</value>
@@ -721,7 +805,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>歌詞のスタイルと効果</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -730,15 +814,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>歌詞の背景</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>アルバムの背景レイヤーの曖昧さ</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>アルバムの背景レイヤーの不透明度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>アルバムの背景レイヤーのモーションレート</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>フォントカラー（非電流再生エリア）</value>
   </data>
@@ -838,9 +913,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>普通</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>無地の背景レイヤーの不透明度</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>現在の文字</value>
   </data>
@@ -892,6 +964,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上端と下端の不透明度</value>
   </data>
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
+    <value>歌詞ウィンドウマネージャー</value>
+  </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>歌詞ウィンドウマネージャー</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>歌詞ウィンドウステータススイッチャーショートカット</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>メディアライブラリ</value>
   </data>
@@ -916,13 +997,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>ファイルの変更をリアルタイムで聞いてください</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>狭い</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>次のトラックショートカットキー</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>なし</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>不透明度</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>ファイルエクスプローラーで開きます</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -937,6 +1024,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>パスはコンピューターでは見つかりません</value>
   </data>
+  <data name="SettingsPagePinyin.Content" xml:space="preserve">
+    <value>マンダリンのピンイン</value>
+  </data>
   <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
     <value>再生ソース</value>
   </data>
@@ -955,9 +1045,21 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>前のトラックのショートカットキー</value>
   </data>
-  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>ピュアカラーレイヤー</value>
+  </data>
+  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQフィードバック＆チャットグループ</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>リアルタイムステータス</value>
+  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>記録</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>記録されたウィンドウステータス</value>
+  </data>
   <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
     <value>このパスの元のファイルとフォルダーは、このアプリから削除するときに削除されません</value>
   </data>
@@ -970,6 +1072,9 @@
   <data name="SettingsPageRestart.Content" xml:space="preserve">
     <value>変更を適用するためのアプリを再起動します</value>
   </data>
+  <data name="SettingsPageRomaji.Header" xml:space="preserve">
+    <value>日本の注釈</value>
+  </data>
   <data name="SettingsPageSC.Content" xml:space="preserve">
     <value>简体中文</value>
   </data>
@@ -1003,6 +1108,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>サーバーテストが成功しました</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>設定</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>設定マネージャー</value>
   </data>
@@ -1012,6 +1120,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>このホットキーは正常に登録されています</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>アーティスト</value>
+  </data>
+  <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
+    <value>歌詞ウィンドウディスプレイとショートカットキーを非表示にします</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>例：Alt + Tab、タスクバー</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>システム環境に表示します</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>タイトルを表示</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>現在の値： </value>
   </data>
@@ -1030,6 +1153,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>右</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>スペクトラムレイヤー</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>モーション</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>標準モード</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>デフォルト</value>
   </data>
@@ -1039,7 +1171,7 @@
   <data name="SettingsPageTC.Content" xml:space="preserve">
     <value>繁體中文</value>
   </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
+  <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
@@ -1048,6 +1180,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>設定 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>なし</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>トップ</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>窓全体</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>タイトルバーサイズ</value>
   </data>
@@ -1069,6 +1210,24 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>バージョン</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>幅</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>ウィンドウ境界</value>
+  </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>画面の上下端にドッキングされた別の作業エリアとして</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>kawasan kerja</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>作業エリアの高さ</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>標準モード</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>プログラムを終了します</value>
   </data>
@@ -1090,9 +1249,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>設定を開く</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>ウィンドウのロックを解除します</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>翻訳サーバーは設定されていません。最初に設定で構成してください</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw

@@ -123,26 +123,11 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>음악 플레이어</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>데스크탑 모드</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>도크 모드</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>사진 인당 모드</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>표준 모드</value>
-  </data>
-  <data name="BaseWindowAOTFlyoutItem.Text" xml:space="preserve">
-    <value>항상 위에</value>
-  </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>ESC를 눌러 전체 화면 모드를 종료하십시오</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>전체 화면</value>
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
+    <value>일반적인</value>
   </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>이 메시지를 다시 표시하지 마십시오</value>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>취소</value>
   </data>
+  <data name="DemoWindowControlDefault.Text" xml:space="preserve">
+    <value>기본</value>
+  </data>
   <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
     <value>의존성</value>
   </data>
+  <data name="DesktopMode" xml:space="preserve">
+    <value>데스크톱 모드 (투명)</value>
+  </data>
+  <data name="DockedMode" xml:space="preserve">
+    <value>도킹 모드</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>수출 성공</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music Server에 연결할 수 없습니다. 설정으로 이동하십시오 - 고급 옵션이 링크가 올바르게 입력되었는지 확인하십시오.</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>전체화면 모드</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>잠금</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>잠금</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>데스크탑 모드</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>도크 모드</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>잠금</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>더</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>음악 갤러리</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>설정</value>
@@ -223,7 +214,7 @@
     <value>가사를 수동으로 검색합니다</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>가사 스타일과 효과 빠른 설정</value>
+    <value>가사 창 관리 바로 가기 설정</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>재생 소스 빠른 설정</value>
@@ -285,6 +276,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>제목</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>가사 검색 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>로컬 .ESLRC 파일</value>
   </data>
@@ -300,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>몰입 형 모드</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>앨범 아트 만</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>현재 가사 창 구성</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>데스크탑 가사 모드로 전환하십시오</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>가사 창 모드</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>기본 값으로 설정</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>앨범 아트 영역만</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>토글 버튼을 표시하려면 다시 다시 가져옵니다</value>
@@ -439,6 +439,21 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>음악 갤러리 - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>협폭 조명</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>사진 인당 모드</value>
+  </data>
+  <data name="SetingsPageDonation.Text" xml:space="preserve">
+    <value>기부</value>
+  </data>
+  <data name="SetingsPageFeedback.Text" xml:space="preserve">
+    <value>피드백</value>
+  </data>
+  <data name="SetingsPageThanks.Text" xml:space="preserve">
+    <value>이 프로젝트가 마음에 들면 기부하여 지원을 고려하십시오. 귀하의 지원은 프로젝트를 계속 유지하고 추가 개발을 장려하는 데 도움이 될 것입니다.</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>에 대한</value>
   </data>
@@ -448,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>아크릴 얇은</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>동시에 가사 배경의 순수 컬러 레이어 불투명도와 앨범 아트 레이어 불투명도를 0으로 설정하면 정확한 효과를 얻을 수 있습니다</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>환경 색상에 적응하세요</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>폴더를 추가하십시오</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>추가하다</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>고급 옵션</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>앨범 아트</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>앨범 아트 레이어</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>앨범 표지 소스를 구성합니다</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>앨범아트</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>앨범 아트 소스</value>
   </data>
@@ -469,12 +499,15 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>그림자가 얼마나 퍼져나가는지</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>앨범 영역 스타일</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>금액</value>
   </data>
+  <data name="SettingsPageAOT.Header" xml:space="preserve">
+    <value>가사 창을 맨 위로 가져옵니다</value>
+  </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>앱 외관과 행동</value>
   </data>
@@ -482,38 +515,17 @@
     <value>앱 모양</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>앱 동작</value>
+    <value>일반적인 행동</value>
   </data>
-  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
-    <value>데스크탑 모드</value>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>적용하다</value>
   </data>
-  <data name="SettingsPageAppDock.Text" xml:space="preserve">
-    <value>도크 모드</value>
-  </data>
-  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
-    <value>사진 인당 모드</value>
-  </data>
-  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
-    <value>표준 모드</value>
-  </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>데스크탑 모드를 활성화 할 때 자동 잠금</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>자동 크기 조정</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>자동 시작</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>데스크탑 모드를 시작하십시오</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>도크 모드를 활성화하십시오</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>표준 모드를 ​​활성화합니다</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>Picture-in-Picture 모드를 시작하십시오</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>앱을 시작할 때</value>
   </data>
@@ -523,41 +535,83 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>앨범 배경 아크릴 효과 강도</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>가사 배경</value>
   </data>
+  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
+    <value>흐림 금액</value>
+  </data>
+  <data name="SettingsPageBorderless.Header" xml:space="preserve">
+    <value>창문</value>
+  </data>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>테두리 없는 가사 창 단축키</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>로그 파일, 네트워크 가사 캐시 포함</value>
   </data>
   <data name="SettingsPageCache.Header" xml:space="preserve">
     <value>은닉처</value>
   </data>
+  <data name="SettingsPageChinese.Header" xml:space="preserve">
+    <value>화음</value>
+  </data>
+  <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
+    <value>중국어를 전통적인 중국어로 전환합니다</value>
+  </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>클릭률</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>바로 가기 키를 클릭하세요</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>콤팩트</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>녹화된 창 상태에 이름을 지정하면 더 잘 구별할 수 있습니다</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>환경 설정</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>현재 가사 창 상태에서 만들기</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>템플릿에서 만들기</value>
+  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>현재 가사 창 상태</value>
+  </data>
   <data name="SettingsPageDark.Content" xml:space="preserve">
     <value>어두운</value>
   </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>디버그 오버레이를 표시하십시오</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>데스크탑 아크릴</value>
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
+    <value>삭제</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>고급 옵션</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>데스크톱 모드 (투명)</value>
   </data>
-  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
+    <value>이 프로젝트는 어떠한 종류의 보증도 없이 그대로 제공됩니다. 모든 가사, 글꼴, 아이콘 및 기타 제3자 리소스는 해당 저작권 소유자의 재산입니다. 이 프로젝트의 저자는 그러한 자원의 소유권을 주장하지 않습니다. 이 프로젝트는 비상업적이기 때문에 어떠한 권리도 침해해서는 안 됩니다. 사용자는 자신의 사용이 관련 법률 및 라이센스를 준수하는지 확인할 책임이 있습니다.</value>
+  </data>
+  <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>가사 앨범 레이아웃 모드</value>
+    <value>레이아웃 모드</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>도킹 모드</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>대상 모니터</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>도크 모드 배치</value>
+    <value>작업 영역 배치</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>맨 아래</value>
@@ -568,6 +622,12 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>창 높이</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>드래그 가능</value>
+  </data>
+  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
+    <value>자동 조정</value>
+  </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>애니메이션 유형 완화</value>
   </data>
@@ -610,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>환경 컬러 삼페 모드</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>창문 너머</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>창문 아래</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>창 가장자리</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>창문 안쪽</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>가사 창을 닫으면 프로그램을 종료하세요</value>
   </data>
@@ -622,44 +697,38 @@
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>팬 가사</value>
   </data>
-  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+  <data name="SettingsPageFAQ.Content" xml:space="preserve">
     <value>자주 묻는 질문</value>
   </data>
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>고정 시간 단계 렌더링</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>유체 층</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>시스템을 따르십시오</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>투표를 통해 가사 창을 맨 위에 두세요</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>꼭대기에 강제로</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>렌더링 프레임 속도</value>
   </data>
-  <data name="SettingsPageGitHub.ActionIconToolTip" xml:space="preserve">
-    <value>새 창에서 열립니다</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>전체화면 모드</value>
   </data>
-  <data name="SettingsPageGitHub.Description" xml:space="preserve">
-    <value>GitHub의 소스 코드를 참조하십시오</value>
-  </data>
-  <data name="SettingsPageGitHub.Header" xml:space="preserve">
-    <value>이것은 오픈 소스 앱입니다</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>비 중과 영역에서 창을 드래그 할 수 있도록 제목 표시 줄을 전체 페이지로 확장하십시오.</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>글로벌 드래그</value>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>신장</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>도크 모드 또는 데스크탑 모드에서 재생되지 않을 때는 창을 자동으로 숨기고 있습니다</value>
+    <value>음악이 재생되지 않을 때 자동으로 가사 창 숨기기/표시</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
-    <value>자동 가죽 창</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>도킹 또는 데스크탑 모드가 활성화 될 때이 앱이 전체 화면 앱 위에 나타나도록 강요</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>항상 전체 화면 응용 프로그램 위에 머물러 있습니다</value>
+    <value>Windows를 자동으로 숨기고 표시합니다</value>
   </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>가져 오기 설정</value>
@@ -670,9 +739,15 @@
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
+  <data name="SettingsPageJapanese.Header" xml:space="preserve">
+    <value>일본 주석</value>
+  </data>
   <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
     <value>지금 가입하십시오</value>
   </data>
+  <data name="SettingsPageJyutping.Content" xml:space="preserve">
+    <value>광동어 Pinyin</value>
+  </data>
   <data name="SettingsPageKO.Content" xml:space="preserve">
     <value>한국어</value>
   </data>
@@ -706,14 +781,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>사용자 이름</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>레이아웃 방향</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>수평</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>세로</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>서버 주소</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>빛</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>바로 가기 키를 잠금 해제하고 잠그십시오</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>새로운 재생 소스에 대한 모니터링을 활성화하십시오</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>로그 레코드</value>
@@ -721,7 +805,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 음악 서버</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>가사 스타일과 효과</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -730,15 +814,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>가사 배경</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>앨범 배경 레이어 모호성</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>앨범 배경 레이어 불투명도</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>앨범 배경 레이어 모션 속도</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>글꼴 색상 (비 전류 재생 영역)</value>
   </data>
@@ -838,9 +913,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>정상</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>단단한 배경 레이어 불투명도</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>현재 숯</value>
   </data>
@@ -892,6 +964,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>상단 및 하단 가장자리 불투명도</value>
   </data>
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
+    <value>가사 창 관리자</value>
+  </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>가사 창 관리자</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>가사 창 상태 전환기 바로 가기</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>미디어 라이브러리</value>
   </data>
@@ -916,13 +997,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>실시간으로 파일 변경을 듣습니다</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>협폭 조명</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>다음 트랙 바로 가기 키</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>없음</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>투명도</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>파일 탐색기에서 열립니다</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -937,6 +1024,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>경로는 컴퓨터에서 찾을 수 없습니다</value>
   </data>
+  <data name="SettingsPagePinyin.Content" xml:space="preserve">
+    <value>만다린의 피니 인</value>
+  </data>
   <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
     <value>재생 소스</value>
   </data>
@@ -955,9 +1045,21 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>이전 트랙의 바로 가기 키</value>
   </data>
-  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>순수한 컬러 레이어</value>
+  </data>
+  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ 피드백 및 채팅 그룹</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>실시간 상태</value>
+  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>기록</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>기록 된 창 상태</value>
+  </data>
   <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
     <value>이 경로의 원본 파일과 폴더는이 앱에서 제거 할 때 삭제되지 않습니다.</value>
   </data>
@@ -970,6 +1072,9 @@
   <data name="SettingsPageRestart.Content" xml:space="preserve">
     <value>변경 사항을 적용하려면 앱을 다시 시작하십시오</value>
   </data>
+  <data name="SettingsPageRomaji.Header" xml:space="preserve">
+    <value>일본 주석</value>
+  </data>
   <data name="SettingsPageSC.Content" xml:space="preserve">
     <value>简体中文</value>
   </data>
@@ -1003,6 +1108,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>서버 테스트 성공</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>설정</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>설정 관리자</value>
   </data>
@@ -1012,6 +1120,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>이 핫키는 성공적으로 등록되었습니다</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>예술가</value>
+  </data>
+  <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
+    <value>가사 창 디스플레이 및 바로 가기 키 숨기기</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>예: Alt + Tab, 작업 표시줄</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>시스템 환경에서 보여주세요</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>제목 표시</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>현재 가치 : </value>
   </data>
@@ -1030,6 +1153,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>오른쪽</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>스펙트럼 레이어</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>모션</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>표준 모드</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>기본</value>
   </data>
@@ -1039,7 +1171,7 @@
   <data name="SettingsPageTC.Content" xml:space="preserve">
     <value>繁體中文</value>
   </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
+  <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
@@ -1048,6 +1180,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>설정 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>없음</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>맨 위</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>창문 전체</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>제목 바 크기</value>
   </data>
@@ -1069,6 +1210,24 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>버전</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>너비</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>창 범위</value>
+  </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>화면의 상단/하단 가장자리에 고정된 별도의 작업 영역으로</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>작업 구역</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>작업 영역 높이</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>표준 모드</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>프로그램을 종료하십시오</value>
   </data>
@@ -1090,9 +1249,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>열기 설정</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>창을 잠금 해제하십시오</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>번역 서버가 설정되지 않았습니다. 먼저 설정으로 구성하십시오.</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw

@@ -123,26 +123,11 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>音乐播放器</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>画中画模式</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>标准模式</value>
-  </data>
-  <data name="BaseWindowAOTFlyoutItem.Text" xml:space="preserve">
-    <value>将应用置于顶层</value>
-  </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>按 Esc 退出全屏模式</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>全屏</value>
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
+    <value>通用</value>
   </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>不再显示此消息</value>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
+  <data name="DemoWindowControlDefault.Text" xml:space="preserve">
+    <value>默认</value>
+  </data>
   <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
     <value>依赖</value>
   </data>
+  <data name="DesktopMode" xml:space="preserve">
+    <value>桌面模式（透明）</value>
+  </data>
+  <data name="DockedMode" xml:space="preserve">
+    <value>停靠模式</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>导出成功</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>无法连接到 LX 音乐服务器，请转到设置 - 高级选项以检查是否正确输入链接</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>全屏模式</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>锁定</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>锁定</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>锁定</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>更多</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>音乐库</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>设置</value>
@@ -223,7 +214,7 @@
     <value>手动检索歌词</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>歌词样式与效果快捷设置</value>
+    <value>歌词窗口管理快捷设置</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>播放源快捷设置</value>
@@ -285,6 +276,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>标题</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>歌词搜索 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>本地 .ESLRC 文件</value>
   </data>
@@ -300,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>沉浸模式</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>仅显示专辑封面</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>当前歌词窗口配置</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>切换到桌面歌词模式</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>歌词窗口模式</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>设为默认</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>仅显示专辑区域</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>再次悬停以显示切换按钮</value>
@@ -439,6 +439,21 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音乐库 - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>窄屏模式</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>画中画模式</value>
+  </data>
+  <data name="SetingsPageDonation.Text" xml:space="preserve">
+    <value>捐贈</value>
+  </data>
+  <data name="SetingsPageFeedback.Text" xml:space="preserve">
+    <value>反馈</value>
+  </data>
+  <data name="SetingsPageThanks.Text" xml:space="preserve">
+    <value>如果您喜欢这个项目，请考虑通过捐赠来支持它。您的支持将有助于保持项目的生命并鼓励进一步的发展。</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>关于</value>
   </data>
@@ -448,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>亚克力（薄层）</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>同时，将歌词背景中的纯色图层不透明度和专辑美术图层不透明度设置为 0 ，以获得正确的效果</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>适应环境色彩</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>添加文件夹</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>添加</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>高级选项</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>专辑</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>专辑艺术图层</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>配置专辑封面源</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>专辑封面</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>专辑封面源</value>
   </data>
@@ -469,12 +499,15 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>阴影扩散程度</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>专辑区域样式</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>量</value>
   </data>
+  <data name="SettingsPageAOT.Header" xml:space="preserve">
+    <value>将歌词窗口置于顶层</value>
+  </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>应用外观与行为</value>
   </data>
@@ -482,38 +515,17 @@
     <value>应用外观</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>应用行为</value>
+    <value>一般行为</value>
   </data>
-  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
-    <value>桌面模式</value>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>应用</value>
   </data>
-  <data name="SettingsPageAppDock.Text" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
-  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
-    <value>画中画模式</value>
-  </data>
-  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
-    <value>标准模式</value>
-  </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>启动桌面模式时随即锁定窗口</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>自动调整尺寸</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自动启动</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>启动桌面模式</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>启动停靠模式</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>启动标准模式</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>启动画中画模式</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>启动应用时</value>
   </data>
@@ -523,41 +535,83 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>专辑背景亚克力效果强度</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>歌词背景</value>
   </data>
+  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
+    <value>模糊度</value>
+  </data>
+  <data name="SettingsPageBorderless.Header" xml:space="preserve">
+    <value>无边框窗口</value>
+  </data>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>无边框歌词窗口快捷方式</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>包括日志文件，网络歌词缓存</value>
   </data>
   <data name="SettingsPageCache.Header" xml:space="preserve">
     <value>缓存</value>
   </data>
+  <data name="SettingsPageChinese.Header" xml:space="preserve">
+    <value>中文注音</value>
+  </data>
+  <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
+    <value>中文转换为繁体</value>
+  </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>点击穿透</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>点击穿透快捷键</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>紧凑</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>命名记录的窗口状态可以帮助您更好地区分它们</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>配置名称</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>从当前歌词窗口状态创建</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>从模板创建</value>
+  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>当前歌词窗口状态</value>
+  </data>
   <data name="SettingsPageDark.Content" xml:space="preserve">
     <value>深色</value>
   </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>显示调试覆盖层</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>亚克力（桌面）</value>
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
+    <value>删除</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>高级选项</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>桌面模式（透明）</value>
   </data>
-  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
+    <value>本项目按原样提供，不提供任何形式的保证。所有歌词、字体、图标和其他第三方资源均为其各自版权所有者的财产。本项目的作者不主张此类资源的所有权。本项目为非商业性项目，不得用于侵犯任何权利。用户有责任确保自己的使用符合适用的法律和许可。</value>
+  </data>
+  <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>歌词专辑布局模式</value>
+    <value>布局模式</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>停靠模式</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>目标显示器</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>停靠模式位置</value>
+    <value>工作区域位置</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>底部</value>
@@ -568,6 +622,12 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>窗口高度</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>可拖拽区域</value>
+  </data>
+  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
+    <value>自动调整</value>
+  </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>缓动动画类型</value>
   </data>
@@ -610,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>环境色彩采样模式</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>窗口上方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>窗口下方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>窗口边缘</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>窗口内部</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>关闭歌词窗口时退出程序</value>
   </data>
@@ -622,44 +697,38 @@
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>扇形歌词</value>
   </data>
-  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+  <data name="SettingsPageFAQ.Content" xml:space="preserve">
     <value>常见问题与解答</value>
   </data>
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>固定时间步长渲染</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>流体层</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>跟随系统</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>通过轮询方式使歌词窗口保持置于顶层状态</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>强制置于顶层</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>渲染帧率</value>
   </data>
-  <data name="SettingsPageGitHub.ActionIconToolTip" xml:space="preserve">
-    <value>在新窗口中打开</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>全屏模式</value>
   </data>
-  <data name="SettingsPageGitHub.Description" xml:space="preserve">
-    <value>在 GitHub 上查看源代码</value>
-  </data>
-  <data name="SettingsPageGitHub.Header" xml:space="preserve">
-    <value>此应用已开源</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>将标题栏扩展至整个页面使得在任意非交互区域均可拖拽窗口</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>全局拖拽</value>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>高度</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>停靠模式或桌面模式下，无歌曲正在播放时，自动隐藏窗口</value>
+    <value>音乐未播放/播放时自动隐藏/显示歌词窗口</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
-    <value>自动隐藏窗口</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>当启用停靠模式或桌面模式时强制将本应用显示在全屏应用的上方</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>始终显示在全屏应用上方</value>
+    <value>自动隐藏/显示窗口</value>
   </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>导入设置</value>
@@ -670,9 +739,15 @@
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
+  <data name="SettingsPageJapanese.Header" xml:space="preserve">
+    <value>日语注音</value>
+  </data>
   <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
     <value>立即加入</value>
   </data>
+  <data name="SettingsPageJyutping.Content" xml:space="preserve">
+    <value>广东话拼音</value>
+  </data>
   <data name="SettingsPageKO.Content" xml:space="preserve">
     <value>한국어</value>
   </data>
@@ -706,14 +781,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>用户名</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>布局方向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>横向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>垂直</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>服务器地址</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>浅色</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>解锁和锁定快捷键</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>启用对新播放源的监听</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>日志记录</value>
@@ -721,7 +805,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 音乐服务器</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>歌词样式与动效</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -730,15 +814,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>歌词背景</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>专辑背景层模糊度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>专辑背景层不透明度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>专辑背景层运动速率</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>字体颜色（非当前播放区域）</value>
   </data>
@@ -838,9 +913,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>常规</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>纯色背景层不透明度</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>当前字符</value>
   </data>
@@ -892,6 +964,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上下边缘不透明度</value>
   </data>
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
+    <value>歌词窗口管理</value>
+  </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>歌词窗口管理</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>歌词窗口状态切换器快捷方式</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>媒体库</value>
   </data>
@@ -916,13 +997,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>实时监听文件变化</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>窄屏模式</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>下一首曲目快捷键</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>无</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>不透明度</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在文件资源管理器中打开</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -937,6 +1024,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>无法在您的计算机中找到该路径</value>
   </data>
+  <data name="SettingsPagePinyin.Content" xml:space="preserve">
+    <value>普通话拼音</value>
+  </data>
   <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
     <value>播放源</value>
   </data>
@@ -955,9 +1045,21 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>上一首曲目快捷键</value>
   </data>
-  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>纯色层</value>
+  </data>
+  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ 反馈交流群</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>实时状态</value>
+  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>记录</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>记录的窗口状态</value>
+  </data>
   <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
     <value>路径中的原始文件和文件夹不会被删除</value>
   </data>
@@ -970,6 +1072,9 @@
   <data name="SettingsPageRestart.Content" xml:space="preserve">
     <value>重启应用以应用更改</value>
   </data>
+  <data name="SettingsPageRomaji.Header" xml:space="preserve">
+    <value>日语注音</value>
+  </data>
   <data name="SettingsPageSC.Content" xml:space="preserve">
     <value>简体中文</value>
   </data>
@@ -1003,6 +1108,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>服务器测试成功</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>设置</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>设置管理器</value>
   </data>
@@ -1012,6 +1120,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>该热键已成功注册</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>显示艺术家</value>
+  </data>
+  <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
+    <value>歌词窗口显示和隐藏快捷键</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>例如：Alt + Tab，任务栏</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>在系统环境中显示</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>显示标题</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>当前值： </value>
   </data>
@@ -1030,6 +1153,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>靠右</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>频谱层</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>运动速率</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>标准模式</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>默认</value>
   </data>
@@ -1039,7 +1171,7 @@
   <data name="SettingsPageTC.Content" xml:space="preserve">
     <value>繁體中文</value>
   </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
+  <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
@@ -1048,6 +1180,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>设置 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>无</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>顶部</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>整个窗口</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>标题栏大小</value>
   </data>
@@ -1069,6 +1210,24 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本号</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>宽度</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>窗口边界</value>
+  </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>作为一个独立的工作区域停靠在屏幕的上/下边缘</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>工作区</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>工作区高度</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>标准模式</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>退出程序</value>
   </data>
@@ -1090,9 +1249,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>打开设置</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>解锁窗口</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>未设置Translate服务器，请先在设置中进行配置</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw

@@ -123,26 +123,11 @@
   <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
     <value>音樂播放器</value>
   </data>
-  <data name="AllLyricsSettingsControlDesktop.Content" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="AllLyricsSettingsControlDock.Content" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="AllLyricsSettingsControlPictureInPicture.Content" xml:space="preserve">
     <value>畫中畫模式</value>
   </data>
-  <data name="AllLyricsSettingsControlStandard.Content" xml:space="preserve">
-    <value>標準模式</value>
-  </data>
-  <data name="BaseWindowAOTFlyoutItem.Text" xml:space="preserve">
-    <value>將應用置於頂層</value>
-  </data>
-  <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>按 Esc 退出全螢幕模式</value>
-  </data>
-  <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>全螢幕</value>
+  <data name="AppSettingsControlGeneral.Text" xml:space="preserve">
+    <value>一般</value>
   </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
     <value>不再顯示此訊息</value>
@@ -153,32 +138,38 @@
   <data name="Cancel" xml:space="preserve">
     <value>取消</value>
   </data>
+  <data name="DemoWindowControlDefault.Text" xml:space="preserve">
+    <value>預設</value>
+  </data>
   <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
     <value>依賴</value>
   </data>
+  <data name="DesktopMode" xml:space="preserve">
+    <value>桌面模式（透明）</value>
+  </data>
+  <data name="DockedMode" xml:space="preserve">
+    <value>停靠模式</value>
+  </data>
   <data name="ExportSettingsSuccess" xml:space="preserve">
     <value>導出成功</value>
   </data>
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>無法連接到 LX 音樂服務器，請轉到設置 - 高級選項以檢查是否正確輸入鏈接</value>
   </data>
+  <data name="FullscreenMode" xml:space="preserve">
+    <value>全螢幕模式</value>
+  </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>鎖定</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
     <value>鎖定</value>
   </data>
-  <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>桌面模式</value>
-  </data>
-  <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
   <data name="HostWindowLockToolTip.Text" xml:space="preserve">
     <value>鎖定</value>
   </data>
-  <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>更多</value>
+  <data name="HostWindowMusicGalleryButtonToolTip.Content" xml:space="preserve">
+    <value>音樂庫</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
     <value>設定</value>
@@ -223,7 +214,7 @@
     <value>手動檢索歌詞</value>
   </data>
   <data name="LyricsPageLyricsSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>歌詞樣式與效果快捷設置</value>
+    <value>歌詞視窗管理快捷設定</value>
   </data>
   <data name="LyricsPagePlaybackSourceButtonToolTip.Content" xml:space="preserve">
     <value>播放源快捷設置</value>
@@ -285,6 +276,9 @@
   <data name="LyricsSearchControlTitle.Header" xml:space="preserve">
     <value>標題</value>
   </data>
+  <data name="LyricsSearchPageTitle" xml:space="preserve">
+    <value>歌詞搜尋 - BetterLyrics</value>
+  </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
     <value>本地 .ESLRC 文件</value>
   </data>
@@ -300,11 +294,17 @@
   <data name="LyricsWindowImmersiveButtonToolTip.Content" xml:space="preserve">
     <value>沉浸模式</value>
   </data>
-  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>僅顯示專輯封面</value>
+  <data name="LyricsWindowSettingsControlCurrentLyricsWindowConfig.Text" xml:space="preserve">
+    <value>目前歌詞視窗設定</value>
   </data>
-  <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>切換到桌面歌詞模式</value>
+  <data name="LyricsWindowSettingsControlLyricsWindowMode.Header" xml:space="preserve">
+    <value>歌詞視窗模式</value>
+  </data>
+  <data name="LyricsWindowSettingsControlSetDefault.Text" xml:space="preserve">
+    <value>設為預設</value>
+  </data>
+  <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
+    <value>僅限相簿藝術區域</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
     <value>再次懸停以顯示切換按鈕</value>
@@ -439,6 +439,21 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>音樂庫 - BetterLyrics</value>
   </data>
+  <data name="NarrowMode" xml:space="preserve">
+    <value>窄螢幕模式</value>
+  </data>
+  <data name="PictureInPictureMode" xml:space="preserve">
+    <value>畫中畫模式</value>
+  </data>
+  <data name="SetingsPageDonation.Text" xml:space="preserve">
+    <value>捐贈</value>
+  </data>
+  <data name="SetingsPageFeedback.Text" xml:space="preserve">
+    <value>回饋</value>
+  </data>
+  <data name="SetingsPageThanks.Text" xml:space="preserve">
+    <value>如果您喜歡這個項目，請考慮通過捐贈來支持它。您的支持將有助於保持項目的生命並鼓勵進一步的發展。</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>關於</value>
   </data>
@@ -448,18 +463,33 @@
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
     <value>亞克力（薄層）</value>
   </data>
+  <data name="SettingsPageAdaptEnvColor.Description" xml:space="preserve">
+    <value>同時，將歌詞背景中的純色圖層不透明度和專輯藝術圖層不透明度設置為 0 ，以獲得正確的效果</value>
+  </data>
+  <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
+    <value>適應環境色彩</value>
+  </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
     <value>新增資料夾</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>添加</value>
   </data>
+  <data name="SettingsPageAdvanced.Text" xml:space="preserve">
+    <value>高級選項</value>
+  </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
     <value>專輯</value>
   </data>
+  <data name="SettingsPageAlbumArtLayer.Header" xml:space="preserve">
+    <value>相簿藝術圖層</value>
+  </data>
   <data name="SettingsPageAlbumArtSearchProvidersConfig.Text" xml:space="preserve">
     <value>配置專輯封面源</value>
   </data>
+  <data name="SettingsPageAlbumArtSize.Header" xml:space="preserve">
+    <value>專輯封面</value>
+  </data>
   <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
     <value>專輯封面來源</value>
   </data>
@@ -469,12 +499,15 @@
   <data name="SettingsPageAlbumShadowAmount.Header" xml:space="preserve">
     <value>陰影擴散程度</value>
   </data>
-  <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
+  <data name="SettingsPageAlbumStyle.Text" xml:space="preserve">
     <value>專輯區域樣式</value>
   </data>
   <data name="SettingsPageAmount.Header" xml:space="preserve">
     <value>量</value>
   </data>
+  <data name="SettingsPageAOT.Header" xml:space="preserve">
+    <value>將歌詞視窗置於頂層</value>
+  </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
     <value>應用外觀與行為</value>
   </data>
@@ -482,38 +515,17 @@
     <value>應用外觀</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>應用行為</value>
+    <value>一般行爲</value>
   </data>
-  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
-    <value>桌面模式</value>
+  <data name="SettingsPageApply.Content" xml:space="preserve">
+    <value>應用</value>
   </data>
-  <data name="SettingsPageAppDock.Text" xml:space="preserve">
-    <value>停靠模式</value>
-  </data>
-  <data name="SettingsPageAppPictureInPicture.Text" xml:space="preserve">
-    <value>畫中畫模式</value>
-  </data>
-  <data name="SettingsPageAppStandard.Text" xml:space="preserve">
-    <value>標準模式</value>
-  </data>
-  <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>啟動桌面模式時隨即鎖定窗口</value>
+  <data name="SettingsPageAutoSize.Header" xml:space="preserve">
+    <value>自動調整大小</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
     <value>自動啟動</value>
   </data>
-  <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>啟動桌面模式</value>
-  </data>
-  <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>啟動停靠模式</value>
-  </data>
-  <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>啟動標準模式</value>
-  </data>
-  <data name="SettingsPageAutoStartPIPLyrics.Content" xml:space="preserve">
-    <value>啟動畫中畫模式</value>
-  </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
     <value>啟動應用程式時</value>
   </data>
@@ -523,41 +535,83 @@
   <data name="SettingsPageBackgroundAcrylicEffectAmount.Header" xml:space="preserve">
     <value>專輯背景壓克力效果強度</value>
   </data>
-  <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
+  <data name="SettingsPageBackgroundOverlay.Text" xml:space="preserve">
     <value>歌詞背景</value>
   </data>
+  <data name="SettingsPageBlurAmount.Header" xml:space="preserve">
+    <value>模糊度</value>
+  </data>
+  <data name="SettingsPageBorderless.Header" xml:space="preserve">
+    <value>無邊框窗口</value>
+  </data>
+  <data name="SettingsPageBorderlessHotKey.Header" xml:space="preserve">
+    <value>無邊框歌詞視窗捷徑</value>
+  </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
     <value>包括日誌文件，網絡歌詞緩存</value>
   </data>
   <data name="SettingsPageCache.Header" xml:space="preserve">
     <value>快取</value>
   </data>
+  <data name="SettingsPageChinese.Header" xml:space="preserve">
+    <value>中文注音</value>
+  </data>
+  <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
+    <value>中文轉換為繁體</value>
+  </data>
+  <data name="SettingsPageClickThrough.Header" xml:space="preserve">
+    <value>點擊穿透</value>
+  </data>
+  <data name="SettingsPageClickThroughHotKey.Header" xml:space="preserve">
+    <value>點選穿透快捷鍵</value>
+  </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
     <value>緊湊</value>
   </data>
+  <data name="SettingsPageConfigName.Description" xml:space="preserve">
+    <value>命名錄製的視窗狀態可以幫助您更好地區分它們</value>
+  </data>
+  <data name="SettingsPageConfigName.Header" xml:space="preserve">
+    <value>配置名稱</value>
+  </data>
+  <data name="SettingsPageCreateFromCurrent.Content" xml:space="preserve">
+    <value>從目前的歌詞視窗狀態建立</value>
+  </data>
+  <data name="SettingsPageCreateFromTemplates.Content" xml:space="preserve">
+    <value>從範本建立</value>
+  </data>
+  <data name="SettingsPageCurrentLyricsWindowStatus.Text" xml:space="preserve">
+    <value>當前歌詞窗口狀態</value>
+  </data>
   <data name="SettingsPageDark.Content" xml:space="preserve">
     <value>深色</value>
   </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>顯示調試覆蓋層</value>
   </data>
-  <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>亞克力（桌面）</value>
+  <data name="SettingsPageDelete.Text" xml:space="preserve">
+    <value>刪除</value>
   </data>
-  <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>高級選項</value>
+  <data name="SettingsPageDesktopMode.Text" xml:space="preserve">
+    <value>桌面模式（透明）</value>
   </data>
-  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+  <data name="SettingsPageDisclaimer.Message" xml:space="preserve">
+    <value>本項目按原樣提供，不提供任何形式的保證。所有歌詞、字型、圖示和其他第三方資源均屬其各自的版權擁有者所有。此專案的作者並未聲明此類資源的所有權。此專案為非商業專案，不應用於侵犯任何權利。用戶有責任確保自己的使用符合適用的法律和許可證。</value>
+  </data>
+  <data name="SettingsPageDiscord.Content" xml:space="preserve">
     <value>Discord</value>
   </data>
   <data name="SettingsPageDisplayTypeSwitcher.Header" xml:space="preserve">
-    <value>歌詞專輯佈局模式</value>
+    <value>布局模式</value>
+  </data>
+  <data name="SettingsPageDockedMode.Text" xml:space="preserve">
+    <value>停靠模式</value>
   </data>
   <data name="SettingsPageDockMonitor.Header" xml:space="preserve">
     <value>目標顯示器</value>
   </data>
   <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
-    <value>停靠模式位置</value>
+    <value>工作區域位置</value>
   </data>
   <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
     <value>底部</value>
@@ -568,6 +622,12 @@
   <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
     <value>窗口高度</value>
   </data>
+  <data name="SettingsPageDragArea.Header" xml:space="preserve">
+    <value>拖動</value>
+  </data>
+  <data name="SettingsPageDynamicLyricsFontSize.Header" xml:space="preserve">
+    <value>自動調整</value>
+  </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>緩動動畫類型</value>
   </data>
@@ -610,6 +670,21 @@
   <data name="SettingsPageEN.Content" xml:space="preserve">
     <value>English</value>
   </data>
+  <data name="SettingsPageEnvColorSample.Header" xml:space="preserve">
+    <value>環境色彩採樣模式</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleAbove.Content" xml:space="preserve">
+    <value>視窗上方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleBelow.Content" xml:space="preserve">
+    <value>視窗下方</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleEdge.Content" xml:space="preserve">
+    <value>視窗邊緣</value>
+  </data>
+  <data name="SettingsPageEnvColorSampleInner.Content" xml:space="preserve">
+    <value>視窗內部</value>
+  </data>
   <data name="SettingsPageExitOnLyricsWindowClosed.Header" xml:space="preserve">
     <value>關閉歌詞視窗時退出程式</value>
   </data>
@@ -622,44 +697,38 @@
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>扇形歌詞</value>
   </data>
-  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+  <data name="SettingsPageFAQ.Content" xml:space="preserve">
     <value>常見問題與解答</value>
   </data>
   <data name="SettingsPageFixedTimeStep.Header" xml:space="preserve">
     <value>固定時間步長渲染</value>
   </data>
+  <data name="SettingsPageFluidLayer.Header" xml:space="preserve">
+    <value>流體層</value>
+  </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>跟隨系統</value>
   </data>
+  <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
+    <value>透過輪詢方式使歌詞視窗保持置於頂層狀態</value>
+  </data>
+  <data name="SettingsPageForceAlwaysOnTop.Header" xml:space="preserve">
+    <value>強制置於頂層</value>
+  </data>
   <data name="SettingsPageFPS.Header" xml:space="preserve">
     <value>渲染幀率</value>
   </data>
-  <data name="SettingsPageGitHub.ActionIconToolTip" xml:space="preserve">
-    <value>在新視窗中開啟</value>
+  <data name="SettingsPageFullscreenMode.Text" xml:space="preserve">
+    <value>全螢幕模式</value>
   </data>
-  <data name="SettingsPageGitHub.Description" xml:space="preserve">
-    <value>在 GitHub 上查看原始碼</value>
-  </data>
-  <data name="SettingsPageGitHub.Header" xml:space="preserve">
-    <value>此應用程式已開源</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
-    <value>將標題列擴展至整個頁面使得在任意非互動區域均可拖曳窗口</value>
-  </data>
-  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
-    <value>全域拖曳</value>
+  <data name="SettingsPageHeight.Header" xml:space="preserve">
+    <value>高度</value>
   </data>
   <data name="SettingsPageHideWindow.Description" xml:space="preserve">
-    <value>停靠模式或桌面模式下，無歌曲正在播放時，自動隱藏窗口</value>
+    <value>音樂未播放/播放時自動隱藏/顯示歌詞視窗</value>
   </data>
   <data name="SettingsPageHideWindow.Header" xml:space="preserve">
-    <value>自動隱藏窗口</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>啟用停靠模式或桌面模式時強制將本應用程式顯示在全螢幕應用程式的上方</value>
-  </data>
-  <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>始終顯示在全螢幕應用程式上方</value>
+    <value>自動隱藏/顯示窗口</value>
   </data>
   <data name="SettingsPageImportSettingsButton.Content" xml:space="preserve">
     <value>導入設置</value>
@@ -670,9 +739,15 @@
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
+  <data name="SettingsPageJapanese.Header" xml:space="preserve">
+    <value>日語注音</value>
+  </data>
   <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
     <value>立即加入</value>
   </data>
+  <data name="SettingsPageJyutping.Content" xml:space="preserve">
+    <value>廣東話拼音</value>
+  </data>
   <data name="SettingsPageKO.Content" xml:space="preserve">
     <value>한국어</value>
   </data>
@@ -706,14 +781,23 @@
   <data name="SettingsPageLastFMUsername.Header" xml:space="preserve">
     <value>使用者名稱</value>
   </data>
+  <data name="SettingsPageLayoutOrientation.Header" xml:space="preserve">
+    <value>版面配置方向</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationHorizontal.Content" xml:space="preserve">
+    <value>水平</value>
+  </data>
+  <data name="SettingsPageLayoutOrientationVertical.Content" xml:space="preserve">
+    <value>縱向</value>
+  </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
     <value>服務器地址</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
     <value>淺色</value>
   </data>
-  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
-    <value>解鎖和鎖定快捷鍵</value>
+  <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
+    <value>啟用對新播放來源的監聽</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>日誌記錄</value>
@@ -721,7 +805,7 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 音樂服務器</value>
   </data>
-  <data name="SettingsPageLyrics.Content" xml:space="preserve">
+  <data name="SettingsPageLyrics.Text" xml:space="preserve">
     <value>歌詞樣式與動效</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
@@ -730,15 +814,6 @@
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
     <value>歌詞背景</value>
   </data>
-  <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>專輯背景層模糊度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>專輯背景層不透明度</value>
-  </data>
-  <data name="SettingsPageLyricsBackgroundSpeed.Header" xml:space="preserve">
-    <value>專輯背景層運動速率</value>
-  </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
     <value>字體顏色（非當前播放區域）</value>
   </data>
@@ -838,9 +913,6 @@
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
     <value>常規</value>
   </data>
-  <data name="SettingsPageLyricsPureColorBgOpacity.Header" xml:space="preserve">
-    <value>純色背景層不透明度</value>
-  </data>
   <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>目前字元</value>
   </data>
@@ -892,6 +964,15 @@
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
     <value>上下邊緣不透明度</value>
   </data>
+  <data name="SettingsPageLyricsWindowManager.Text" xml:space="preserve">
+    <value>歌詞視窗管理</value>
+  </data>
+  <data name="SettingsPageLyricsWindowMgr.Content" xml:space="preserve">
+    <value>歌詞視窗管理</value>
+  </data>
+  <data name="SettingsPageLyricsWindowSwitchHotKey.Header" xml:space="preserve">
+    <value>歌詞視窗狀態切換器捷徑</value>
+  </data>
   <data name="SettingsPageMediaLib.Content" xml:space="preserve">
     <value>媒體庫</value>
   </data>
@@ -916,13 +997,19 @@
   <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
     <value>實時監聽文件變化</value>
   </data>
+  <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
+    <value>窄螢幕模式</value>
+  </data>
   <data name="SettingsPageNextSongHotKey.Header" xml:space="preserve">
     <value>下一首曲目快捷鍵</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
     <value>無</value>
   </data>
-  <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
+  <data name="SettingsPageOpacity.Header" xml:space="preserve">
+    <value>專輯背景層不透明度</value>
+  </data>
+  <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在檔案總管中開啟</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
@@ -937,6 +1024,9 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>無法在您的電腦中找到該路徑</value>
   </data>
+  <data name="SettingsPagePinyin.Content" xml:space="preserve">
+    <value>普通話拼音</value>
+  </data>
   <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
     <value>播放源</value>
   </data>
@@ -955,9 +1045,21 @@
   <data name="SettingsPagePreviousSongHotKey.Header" xml:space="preserve">
     <value>上一首曲目快捷鍵</value>
   </data>
-  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+  <data name="SettingsPagePureLayer.Header" xml:space="preserve">
+    <value>純淨的色彩層</value>
+  </data>
+  <data name="SettingsPageQQGroup.Content" xml:space="preserve">
     <value>QQ 回饋交流群</value>
   </data>
+  <data name="SettingsPageRealtimeStatus.Text" xml:space="preserve">
+    <value>即時狀態</value>
+  </data>
+  <data name="SettingsPageRecord.Content" xml:space="preserve">
+    <value>記錄</value>
+  </data>
+  <data name="SettingsPageRecordedWindowStatus.Text" xml:space="preserve">
+    <value>記錄的窗口狀態</value>
+  </data>
   <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
     <value>路徑中的原始檔案和資料夾不會被刪除</value>
   </data>
@@ -970,6 +1072,9 @@
   <data name="SettingsPageRestart.Content" xml:space="preserve">
     <value>重啟應用程式以應用更改</value>
   </data>
+  <data name="SettingsPageRomaji.Header" xml:space="preserve">
+    <value>日語注音</value>
+  </data>
   <data name="SettingsPageSC.Content" xml:space="preserve">
     <value>简体中文</value>
   </data>
@@ -1003,6 +1108,9 @@
   <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>服務器測試成功</value>
   </data>
+  <data name="SettingsPageSettings.Header" xml:space="preserve">
+    <value>設定</value>
+  </data>
   <data name="SettingsPageSettingsManager.Header" xml:space="preserve">
     <value>設置管理器</value>
   </data>
@@ -1012,6 +1120,21 @@
   <data name="SettingsPageShortcutRegSuccessInfo" xml:space="preserve">
     <value>該熱鍵已成功註冊</value>
   </data>
+  <data name="SettingsPageShowArtists.Header" xml:space="preserve">
+    <value>界面設計</value>
+  </data>
+  <data name="SettingsPageShowHideHotKey.Header" xml:space="preserve">
+    <value>歌詞窗口顯示和隱藏快捷鍵</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Description" xml:space="preserve">
+    <value>例如：Alt + Tab，任務列</value>
+  </data>
+  <data name="SettingsPageShowInSwitchers.Header" xml:space="preserve">
+    <value>在系統環境中顯示</value>
+  </data>
+  <data name="SettingsPageShowTitle.Header" xml:space="preserve">
+    <value>顯示標題</value>
+  </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>目前值： </value>
   </data>
@@ -1030,6 +1153,15 @@
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
     <value>靠右</value>
   </data>
+  <data name="SettingsPageSpectrumLayer.Header" xml:space="preserve">
+    <value>光譜層</value>
+  </data>
+  <data name="SettingsPageSpeed.Header" xml:space="preserve">
+    <value>動作速率</value>
+  </data>
+  <data name="SettingsPageStandardMode.Text" xml:space="preserve">
+    <value>標準模式</value>
+  </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
     <value>預設</value>
   </data>
@@ -1039,7 +1171,7 @@
   <data name="SettingsPageTC.Content" xml:space="preserve">
     <value>繁體中文</value>
   </data>
-  <data name="SettingsPageTelegram.Header" xml:space="preserve">
+  <data name="SettingsPageTelegram.Content" xml:space="preserve">
     <value>Telegram</value>
   </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
@@ -1048,6 +1180,15 @@
   <data name="SettingsPageTitle" xml:space="preserve">
     <value>設定 - BetterLyrics</value>
   </data>
+  <data name="SettingsPageTitleBarAreaNone.Content" xml:space="preserve">
+    <value>無</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaTop.Content" xml:space="preserve">
+    <value>頂部</value>
+  </data>
+  <data name="SettingsPageTitleBarAreaWhole.Content" xml:space="preserve">
+    <value>整個視窗</value>
+  </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
     <value>標題列大小</value>
   </data>
@@ -1069,6 +1210,24 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本號</value>
   </data>
+  <data name="SettingsPageWidth.Header" xml:space="preserve">
+    <value>寬度</value>
+  </data>
+  <data name="SettingsPageWindowBounds.Header" xml:space="preserve">
+    <value>窗戶邊界</value>
+  </data>
+  <data name="SettingsPageWorkArea.Description" xml:space="preserve">
+    <value>作為一個獨立的工作區域停靠在螢幕的上/下邊緣</value>
+  </data>
+  <data name="SettingsPageWorkArea.Header" xml:space="preserve">
+    <value>工作區區域</value>
+  </data>
+  <data name="SettingsPageWorkAreaHeight.Header" xml:space="preserve">
+    <value>工作區域高度</value>
+  </data>
+  <data name="StandardMode" xml:space="preserve">
+    <value>標準模式</value>
+  </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
     <value>退出程序</value>
   </data>
@@ -1090,9 +1249,6 @@
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>打開設置</value>
   </data>
-  <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>解鎖窗口</value>
-  </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
     <value>未設定翻譯伺服器，請先在設定中進行配置</value>
   </data>