chores: update readme

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -5,6 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converter="using:BetterLyrics.WinUI3.Converter"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:globalization="using:Windows.Globalization"
     xmlns:local="using:BetterLyrics.WinUI3"
     xmlns:media="using:CommunityToolkit.WinUI.Media">
     <Application.Resources>
@@ -59,6 +60,9 @@
             <converter:BoolNegationToVisibilityConverter x:Key="BoolNegationToVisibilityConverter" />
             <converter:BoolToOpacityConverter x:Key="BoolToOpacityConverter" />
             <converter:RectToMarginConverter x:Key="RectToMarginConverter" />
+            <converter:LanguageCodeToDisplayedNameConverter x:Key="LanguageCodeToDisplayedNameConverter" />
+            <converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
+            <converter:DisplayLanguageCodeToIndexConverter x:Key="DisplayLanguageCodeToIndexConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
@@ -335,6 +339,7 @@
 
             <!--  Fonts  -->
             <FontFamily x:Key="IconFontFamily">ms-appx:///Assets/Segoe Fluent Icons.ttf#Segoe Fluent Icons</FontFamily>
+
         </ResourceDictionary>
     </Application.Resources>
 

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

@@ -20,15 +20,15 @@
 		<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\AppSettingsControl.xaml" />
 		<None Remove="Controls\DemoWindowGrid.xaml" />
 		<None Remove="Controls\ExtendedSlider.xaml" />
+		<None Remove="Controls\FontFamilyAutoSuggestBox.xaml" />
 		<None Remove="Controls\LyricsSearchControl.xaml" />
-		<None Remove="Controls\LyricsSettingsControl.xaml" />
+		<None Remove="Controls\LyricsStyleSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSettingsControl.xaml" />
 		<None Remove="Controls\LyricsWindowSwitchControl.xaml" />
 		<None Remove="Controls\MediaSettingsControl.xaml" />
@@ -49,6 +49,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="3v.EvtSource" Version="2.0.0" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
@@ -63,7 +64,9 @@
 		<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-kana" Version="1.0.2" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.4.2" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.2" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
@@ -77,7 +80,6 @@
 		<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" />
@@ -85,7 +87,6 @@
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.10" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
 		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
-		<PackageReference Include="Vanara.PInvoke.CoreAudio" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.2.1" />
 		<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.2.1" />
@@ -110,6 +111,7 @@
 	<!--Disable Trimming for Specific Packages-->
 	<ItemGroup>
 		<TrimmerRootAssembly Include="TagLibSharp" />
+		<TrimmerRootAssembly Include="NAudio.Wasapi" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Content Update="Assets\AIMP.png">
@@ -124,7 +126,7 @@
 	  <Content Update="Assets\Edge.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
-	  <Content Update="Assets\effect.bin">
+	  <Content Update="Assets\FluidEffect.bin">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	  <Content Update="Assets\Empty.png">
@@ -200,6 +202,16 @@
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\FontFamilyAutoSuggestBox.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\LyricsStyleSettingsControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Views\LyricsWindowSwitchWindow.xaml">
 	    <Generator>MSBuild:Compile</Generator>
@@ -241,7 +253,7 @@
 	  </Page>
 	</ItemGroup>
 	<ItemGroup>
-	  <Page Update="Controls\LyricsSettingsControl.xaml">
+	  <Page Update="Controls\LyricsEffectSettingsControl.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </Page>
 	</ItemGroup>

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

@@ -9,6 +9,8 @@ namespace BetterLyrics.WinUI3.Constants
     public static class Link
     {
         public const string GitHubUrl = "https://github.com/jayfunc/BetterLyrics";
+        public const string WikiUrl = "https://github.com/jayfunc/BetterLyrics/wiki";
+        public const string AppleMusicCfgUrl = $"{WikiUrl}/Lyrics-provider-configuration#apple-music";
         public const string FAQUrl = $"{GitHubUrl}/blob/dev/FAQ/index.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";

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

@@ -5,8 +5,11 @@
     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:globalization="using:Windows.Globalization"
+    xmlns:helper="using:BetterLyrics.WinUI3.Helper"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:BetterLyrics.WinUI3.Models"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
@@ -24,13 +27,14 @@
                         HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                  Glyph=}"
                         IsExpanded="True">
-                        <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.Language, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                            <ComboBoxItem x:Uid="SettingsPageSystemLanguage" />
-                            <ComboBoxItem x:Uid="SettingsPageEN" />
-                            <ComboBoxItem x:Uid="SettingsPageSC" />
-                            <ComboBoxItem x:Uid="SettingsPageTC" />
-                            <ComboBoxItem x:Uid="SettingsPageJA" />
-                            <ComboBoxItem x:Uid="SettingsPageKO" />
+                        <ComboBox ItemsSource="{x:Bind helper:LanguageHelper.SupportedDisplayLanguages}" SelectedIndex="{x:Bind ViewModel.AppSettings.GeneralSettings.LanguageCode, Mode=TwoWay, Converter={StaticResource DisplayLanguageCodeToIndexConverter}}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="models:ExtendedLanguage">
+                                    <StackPanel Orientation="Horizontal" Spacing="6">
+                                        <TextBlock Text="{x:Bind Name}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
                         </ComboBox>
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard>

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

@@ -21,23 +21,7 @@
             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>
+            CornerRadius="4" />
         <!--  Is default  -->
         <Grid
             Margin="4"
@@ -82,10 +66,18 @@
             Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
             CornerRadius="4"
             Opacity="0.7">
-            <TextBlock
-                FontSize="12"
-                Text="{x:Bind LyricsWindowStatus.MonitorDeviceName, Mode=OneWay}"
-                TextWrapping="Wrap" />
+            <StackPanel Orientation="Horizontal">
+                <TextBlock
+                    Margin="0,0,3,0"
+                    FontSize="12"
+                    Text="{x:Bind LyricsWindowStatus.MonitorDeviceName, Mode=OneWay}"
+                    TextWrapping="Wrap" />
+                <TextBlock FontSize="12" Text="[" />
+                <TextBlock FontSize="12" Text="{x:Bind LyricsWindowStatus.MonitorBounds.Width, Mode=OneWay}" />
+                <TextBlock FontSize="12" Text="×" />
+                <TextBlock FontSize="12" Text="{x:Bind LyricsWindowStatus.MonitorBounds.Height, Mode=OneWay}" />
+                <TextBlock FontSize="12" Text="]" />
+            </StackPanel>
         </Grid>
         <!--  Config name  -->
         <Grid

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

@@ -13,10 +13,12 @@
     <StackPanel>
 
         <Slider
+            IsEnabled="{x:Bind IsSliderEnabled, Mode=OneWay}"
             Maximum="{x:Bind Maximum, Mode=OneWay}"
             Minimum="{x:Bind Minimum, Mode=OneWay}"
             SnapsTo="Ticks"
             StepFrequency="{x:Bind Frequency, Mode=OneWay}"
+            Tapped="Slider_Tapped"
             TickFrequency="{x:Bind Frequency, Mode=OneWay}"
             TickPlacement="None"
             Value="{x:Bind Value, Mode=TwoWay}" />

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

@@ -1,3 +1,4 @@
+using BetterLyrics.WinUI3.Events;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -21,6 +22,8 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class ExtendedSlider : UserControl
     {
+        public event EventHandler<ExtendedSliderValueChangedByUserEventArgs>? ValueChangedByUser;
+
         public ExtendedSlider()
         {
             InitializeComponent();
@@ -61,7 +64,7 @@ namespace BetterLyrics.WinUI3.Controls
         }
 
         public static readonly DependencyProperty FrequencyProperty =
-            DependencyProperty.Register(nameof(Frequency), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
+            DependencyProperty.Register(nameof(Frequency), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(1));
         public static readonly DependencyProperty MinimumProperty =
             DependencyProperty.Register(nameof(Minimum), typeof(double), typeof(ExtendedSlider), new PropertyMetadata(default));
         public static readonly DependencyProperty MaximumProperty =
@@ -76,6 +79,8 @@ namespace BetterLyrics.WinUI3.Controls
             DependencyProperty.Register(nameof(ResetButtonVisibility), typeof(Visibility), typeof(ExtendedSlider), new PropertyMetadata(Visibility.Visible));
         public static readonly DependencyProperty UnitProperty =
             DependencyProperty.Register(nameof(Unit), typeof(string), typeof(ExtendedSlider), new PropertyMetadata(""));
+        public static readonly DependencyProperty IsSliderEnabledProperty =
+            DependencyProperty.Register(nameof(IsSliderEnabled), typeof(bool), typeof(ExtendedSlider), new PropertyMetadata(true));
 
         public double Frequency
         {
@@ -121,20 +126,33 @@ namespace BetterLyrics.WinUI3.Controls
             get => (string)GetValue(UnitProperty);
             set => SetValue(UnitProperty, value);
         }
+        public bool IsSliderEnabled
+        {
+            get => (bool)GetValue(IsSliderEnabledProperty);
+            set => SetValue(IsSliderEnabledProperty, value);
+        }
 
         private void ResetButton_Click(object sender, RoutedEventArgs e)
         {
             Value = Default;
+            ValueChangedByUser?.Invoke(this, new ExtendedSliderValueChangedByUserEventArgs(Value));
         }
 
         private void SubtractButton_Click(object sender, RoutedEventArgs e)
         {
             Subtract();
+            ValueChangedByUser?.Invoke(this, new ExtendedSliderValueChangedByUserEventArgs(Value));
         }
 
         private void AddButton_Click(object sender, RoutedEventArgs e)
         {
             Add();
+            ValueChangedByUser?.Invoke(this, new ExtendedSliderValueChangedByUserEventArgs(Value));
+        }
+
+        private void Slider_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            ValueChangedByUser?.Invoke(this, new ExtendedSliderValueChangedByUserEventArgs(Value));
         }
     }
 }

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.FontFamilyAutoSuggestBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <StackPanel Orientation="Horizontal" Spacing="6">
+            <AutoSuggestBox
+                x:Name="AutoSuggestBox"
+                Width="150"
+                GotFocus="AutoSuggestBox_GotFocus"
+                LostFocus="AutoSuggestBox_LostFocus"
+                SuggestionChosen="AutoSuggestBox_SuggestionChosen"
+                Text="{x:Bind SelectedFontFamily, Mode=OneWay}"
+                TextChanged="AutoSuggestBox_TextChanged" />
+            <Button
+                Click="Button_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE72C;}"
+                Style="{StaticResource GhostButtonStyle}" />
+        </StackPanel>
+    </Grid>
+</UserControl>

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

@@ -0,0 +1,95 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.Settings;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class FontFamilyAutoSuggestBox : UserControl
+    {
+        private List<string> SystemFontNames { get; set; } = [.. FontHelper.SystemFontFamilies];
+
+        public FontFamilyAutoSuggestBox()
+        {
+            InitializeComponent();
+        }
+
+        public static readonly DependencyProperty SelectedFontFamilyProperty =
+            DependencyProperty.Register(nameof(SelectedFontFamily), typeof(string), typeof(FontFamilyAutoSuggestBox), new PropertyMetadata(default));
+
+        public string SelectedFontFamily
+        {
+            get => (string)GetValue(SelectedFontFamilyProperty);
+            set => SetValue(SelectedFontFamilyProperty, value);
+        }
+
+
+        private void AutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+        {
+            SelectedFontFamily = args.SelectedItem.ToString() ?? "";
+        }
+
+        private void UpdateAutoSuggestBoxItemsSource()
+        {
+            var suitableItems = new List<string>();
+            var splitText = AutoSuggestBox.Text.ToLower().Split(" ");
+            foreach (var fontFamily in SystemFontNames)
+            {
+                var found = splitText.All((key) =>
+                {
+                    return fontFamily.ToLower().Contains(key);
+                });
+                if (found)
+                {
+                    suitableItems.Add(fontFamily);
+                }
+            }
+            if (suitableItems.Count == 0)
+            {
+                suitableItems.Add("N/A");
+            }
+            AutoSuggestBox.ItemsSource = suitableItems.Order();
+        }
+
+        private void AutoSuggestBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+        {
+            // Since selecting an item will also change the text,
+            // only listen to changes caused by user entering text.
+            if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
+            {
+                UpdateAutoSuggestBoxItemsSource();
+            }
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            SystemFontNames = [.. FontHelper.SystemFontFamilies];
+        }
+
+        private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
+        {
+            UpdateAutoSuggestBoxItemsSource();
+        }
+
+        private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            AutoSuggestBox.Text = SelectedFontFamily;
+        }
+    }
+}

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

@@ -18,7 +18,7 @@
 
                     <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
-                    <controls:SettingsCard x:Uid="SettingsPageTheme" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE790;}">
+                    <controls:SettingsCard x:Uid="SettingsPageTheme">
                         <ComboBox x:Name="ThemeComboBox" SelectedIndex="{x:Bind LyricsBackgroundSettings.LyricsBackgroundTheme, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                             <ComboBoxItem x:Uid="SettingsPageFollowSystem" />
                             <ComboBoxItem x:Uid="SettingsPageLight" />
@@ -26,11 +26,7 @@
                         </ComboBox>
                     </controls:SettingsCard>
 
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPagePureLayer"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xEB42;}"
-                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=OneWay}">
+                    <controls:SettingsExpander x:Uid="SettingsPagePureLayer" IsExpanded="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=OneWay}">
                         <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsPureColorOverlayEnabled, Mode=TwoWay}" />
                         <controls:SettingsExpander.Items>
 
@@ -47,11 +43,7 @@
                         </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
 
-                    <controls:SettingsExpander
-                        x:Uid="SettingsPageAlbumArtLayer"
-                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                 Glyph=&#xE93C;}"
-                        IsExpanded="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
+                    <controls:SettingsExpander x:Uid="SettingsPageAlbumArtLayer" IsExpanded="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
                         <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=TwoWay}" />
                         <controls:SettingsExpander.Items>
 
@@ -96,11 +88,7 @@
                         </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}">
+                    <controls:SettingsExpander x:Uid="SettingsPageFluidLayer" IsExpanded="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=OneWay}">
                         <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsFluidOverlayEnabled, Mode=TwoWay}" />
                         <controls:SettingsExpander.Items>
 
@@ -124,14 +112,24 @@
                         </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 x:Uid="SettingsPageSnowFlakeLayer" IsExpanded="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageAmount">
+                                <uc:ExtendedSlider
+                                    Frequency="1"
+                                    Maximum="100"
+                                    Minimum="10"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsBackgroundSettings.SnowFlakeOverlayAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
 
+                    <controls:SettingsCard x:Uid="SettingsPageSpectrumLayer">
+                        <ToggleSwitch IsOn="{x:Bind LyricsBackgroundSettings.IsSpectrumOverlayEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
                 </StackPanel>
             </Grid>
         </ScrollViewer>

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

@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsEffectSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <!--  Effect  -->
+
+                    <TextBlock
+                        x:Uid="SettingsPageLyricsEffect"
+                        Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                        Text="Effect" />
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsVerticalEdgeOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
+                        <local:ExtendedSlider
+                            x:Uid="SettingsPageLyricsVerticalEdgeOpacitySlider"
+                            Default="0"
+                            Frequency="1"
+                            Maximum="100"
+                            Minimum="0"
+                            Unit="%"
+                            Value="{x:Bind LyricsEffectSettings.LyricsVerticalEdgeOpacity, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsBlurAmount" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE727;}">
+                        <local:ExtendedSlider
+                            x:Uid="SettingsPageLyricsBlurAmountExtendedSlider"
+                            Default="5"
+                            Frequency="1"
+                            Maximum="10"
+                            Minimum="0"
+                            Value="{x:Bind LyricsEffectSettings.LyricsBlurAmount, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsLineFade" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED3A;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsLineFadeEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <!--  高亮  -->
+                    <controls:SettingsExpander x:Uid="SettingsPageLyricsHighlight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E6;}">
+                        <controls:SettingsExpander.Items>
+
+                            <controls:SettingsCard x:Uid="SettingsPagePhoneticText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="5"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsEffectSettings.PhoneticLyricsHighlightAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageLyricsHighlightScope">
+                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.OriginalLyricsHighlightScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageOriginalText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="5"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsEffectSettings.OriginalLyricsHighlightAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageTranslatedText">
+                                <local:ExtendedSlider
+                                    Default="60"
+                                    Frequency="5"
+                                    Maximum="100"
+                                    Minimum="0"
+                                    Unit="%"
+                                    Value="{x:Bind LyricsEffectSettings.TranslatedLyricsHighlightAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <!--  阴影  -->
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageLyricsShadow"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xF5EF;}"
+                        IsExpanded="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsShadowScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsShadowEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="8"
+                                    Frequency="1"
+                                    Maximum="20"
+                                    Minimum="1"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsShadowAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <!--  辉光效果  -->
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageLyricsGlowEffect"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE9A9;}"
+                        IsExpanded="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
+                                <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="8"
+                                    Frequency="1"
+                                    Maximum="20"
+                                    Minimum="1"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsGlowEffectAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <!--  浮动动画  -->
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageLyricsFloatAnimation"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE8C5;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageAmount" IsEnabled="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="1"
+                                    Frequency="1"
+                                    Maximum="4"
+                                    Minimum="1"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsFloatAmount, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <!--  扇形歌词  -->
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPageFan"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xEBC5;}"
+                        IsExpanded="{x:Bind LyricsEffectSettings.IsFanLyricsEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsFanLyricsEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard IsEnabled="{x:Bind LyricsEffectSettings.IsFanLyricsEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="30"
+                                    Frequency="1"
+                                    Maximum="90"
+                                    Minimum="-90"
+                                    Unit="°"
+                                    Value="{x:Bind LyricsEffectSettings.FanLyricsAngle, Mode=TwoWay}" />
+
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <!--  3D 歌词  -->
+                    <controls:SettingsExpander
+                        x:Uid="SettingsPage3DLyrics"
+                        HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                 Glyph=&#xE914;}"
+                        IsExpanded="{x:Bind LyricsEffectSettings.Is3DLyricsEnabled, Mode=OneWay}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.Is3DLyricsEnabled, Mode=TwoWay}" />
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard Header="X" IsEnabled="{x:Bind LyricsEffectSettings.Is3DLyricsEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="0"
+                                    Frequency="1"
+                                    Maximum="90"
+                                    Minimum="-90"
+                                    Unit="°"
+                                    Value="{x:Bind LyricsEffectSettings.Lyrics3DXAngle, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard Header="Y" IsEnabled="{x:Bind LyricsEffectSettings.Is3DLyricsEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="0"
+                                    Frequency="1"
+                                    Maximum="90"
+                                    Minimum="-90"
+                                    Unit="°"
+                                    Value="{x:Bind LyricsEffectSettings.Lyrics3DYAngle, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard Header="Z" IsEnabled="{x:Bind LyricsEffectSettings.Is3DLyricsEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="0"
+                                    Frequency="1"
+                                    Maximum="90"
+                                    Minimum="-90"
+                                    Unit="°"
+                                    Value="{x:Bind LyricsEffectSettings.Lyrics3DZAngle, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPage3DLyricsDepth" IsEnabled="{x:Bind LyricsEffectSettings.Is3DLyricsEnabled, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Default="1000"
+                                    Frequency="10"
+                                    Maximum="1000"
+                                    Minimum="100"
+                                    Unit="°"
+                                    Value="{x:Bind LyricsEffectSettings.Lyrics3DDepth, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <!--  滚动动画  -->
+                    <controls:SettingsExpander x:Uid="SettingsPageScrollEasing" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xECE7;}">
+                        <ComboBox SelectedIndex="{x:Bind LyricsEffectSettings.LyricsScrollEasingType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeLinear" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeSmoothStep" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutSine" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuad" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutCubic" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuart" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuint" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutExpo" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutCirc" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutBack" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutElastic" />
+                            <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutBounce" />
+                        </ComboBox>
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageScrollTopDuration">
+                                <local:ExtendedSlider
+                                    Default="500"
+                                    Frequency="50"
+                                    Maximum="1000"
+                                    Minimum="50"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollTopDuration, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageScrollDuration">
+                                <local:ExtendedSlider
+                                    Default="500"
+                                    Frequency="50"
+                                    Maximum="1000"
+                                    Minimum="50"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollDuration, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageScrollBottomDuration">
+                                <local:ExtendedSlider
+                                    Default="500"
+                                    Frequency="50"
+                                    Maximum="1000"
+                                    Minimum="50"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollBottomDuration, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageScrollTopDelay">
+                                <local:ExtendedSlider
+                                    Default="0"
+                                    Frequency="50"
+                                    Maximum="2000"
+                                    Minimum="0"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollTopDelay, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageScrollBottomDelay">
+                                <local:ExtendedSlider
+                                    Default="0"
+                                    Frequency="50"
+                                    Maximum="2000"
+                                    Minimum="0"
+                                    Unit="ms"
+                                    Value="{x:Bind LyricsEffectSettings.LyricsScrollBottomDelay, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

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

@@ -21,27 +21,15 @@ using Windows.Foundation.Collections;
 
 namespace BetterLyrics.WinUI3.Controls
 {
-    public sealed partial class LyricsSettingsControl : UserControl
+    public sealed partial class LyricsEffectSettingsControl : UserControl
     {
-        public ObservableCollection<string> SystemFontNames { get; set; } = [.. FontHelper.SystemFontFamilies];
-
-        public LyricsSettingsControl()
+        public LyricsEffectSettingsControl()
         {
             InitializeComponent();
         }
 
-        public static readonly DependencyProperty LyricsStyleSettingsProperty =
-            DependencyProperty.Register(nameof(LyricsStyleSettings), typeof(LyricsStyleSettings), typeof(LyricsSettingsControl), new PropertyMetadata(default));
-
-        public LyricsStyleSettings LyricsStyleSettings
-        {
-            get => (LyricsStyleSettings)GetValue(LyricsStyleSettingsProperty);
-            set => SetValue(LyricsStyleSettingsProperty, value);
-        }
-
-
         public static readonly DependencyProperty LyricsEffectSettingsProperty =
-            DependencyProperty.Register(nameof(LyricsEffectSettings), typeof(LyricsEffectSettings), typeof(LyricsSettingsControl), new PropertyMetadata(default));
+            DependencyProperty.Register(nameof(LyricsEffectSettings), typeof(LyricsEffectSettings), typeof(LyricsEffectSettingsControl), new PropertyMetadata(default));
 
         public LyricsEffectSettings LyricsEffectSettings
         {

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

@@ -145,35 +145,46 @@
                     Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
             </Grid>
             <Grid Grid.Column="2">
-                <ListView ItemsSource="{x:Bind ViewModel.LyricsData.LyricsLines, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLyricsLine, Mode=TwoWay}">
+                <Pivot ItemsSource="{x:Bind ViewModel.LyricsDataArr, Mode=OneWay}">
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsDataArr, Mode=OneWay}"
                             ComparisonCondition="Equal"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
                         </interactivity:DataTriggerBehavior>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsDataArr, Mode=OneWay}"
                             ComparisonCondition="NotEqual"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
                         </interactivity:DataTriggerBehavior>
                     </interactivity:Interaction.Behaviors>
-                    <ListView.ItemTemplate>
+                    <Pivot.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{Binding StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
-                                <TextBlock
-                                    Margin="1,0"
-                                    Foreground="{ThemeResource SystemFillColorNeutralBrush}"
-                                    Text="-" />
-                                <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{Binding EndMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
-                                <TextBlock Margin="6,0" Text="{Binding OriginalText}" />
-                            </StackPanel>
+                            <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{Binding LanguageCode, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
                         </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+                    </Pivot.HeaderTemplate>
+                    <Pivot.ItemTemplate>
+                        <DataTemplate>
+                            <ListView ItemsSource="{Binding LyricsLines, Mode=OneWay}" SelectionChanged="ListView_SelectionChanged">
+                                <ListView.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{Binding StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
+                                            <TextBlock
+                                                Margin="1,0"
+                                                Foreground="{ThemeResource SystemFillColorNeutralBrush}"
+                                                Text="-" />
+                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{Binding EndMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
+                                            <TextBlock Margin="6,0" Text="{Binding OriginalText}" />
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </DataTemplate>
+                    </Pivot.ItemTemplate>
+                </Pivot>
                 <StackPanel
                     Padding="0,36"
                     HorizontalAlignment="Center"
@@ -182,13 +193,13 @@
                     <Image MaxWidth="100" Source="/Assets/Page.png" />
                     <interactivity:Interaction.Behaviors>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsDataArr, Mode=OneWay}"
                             ComparisonCondition="NotEqual"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
                         </interactivity:DataTriggerBehavior>
                         <interactivity:DataTriggerBehavior
-                            Binding="{x:Bind ViewModel.LyricsData, Mode=OneWay}"
+                            Binding="{x:Bind ViewModel.LyricsDataArr, Mode=OneWay}"
                             ComparisonCondition="Equal"
                             Value="{x:Null}">
                             <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />

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

@@ -31,5 +31,10 @@ namespace BetterLyrics.WinUI3.Controls
             InitializeComponent();
             DataContext = Ioc.Default.GetRequiredService<LyricsSearchControlViewModel>();
         }
+
+        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ViewModel.SelectedLyricsLine = e.OriginalSource as LyricsLine;
+        }
     }
 }

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

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

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

@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.LyricsStyleSettingsControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer Style="{StaticResource SettingsScrollViewerStyle}">
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <!--  Lyrics style  -->
+
+                    <TextBlock x:Uid="SettingsPageLyricsStyle" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsAlignment" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
+                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsAlignmentType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageLyricsLeft" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsCenter" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsRight" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsExpander x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageCJK">
+                                <local:FontFamilyAutoSuggestBox SelectedFontFamily="{x:Bind LyricsStyleSettings.LyricsCJKFontFamily, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageWesternChar">
+                                <local:FontFamilyAutoSuggestBox SelectedFontFamily="{x:Bind LyricsStyleSettings.LyricsWesternFontFamily, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontWeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8DD;}">
+                        <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsFontWeight, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                            <ComboBoxItem x:Uid="SettingsPageLyricsThin" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsExtraLight" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsLight" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsSemiLight" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsNormal" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsMedium" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsSemiBold" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsBold" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsExtraBold" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsBlack" />
+                            <ComboBoxItem x:Uid="SettingsPageLyricsExtraBlack" />
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsBgFontOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEB42;}">
+                        <local:ExtendedSlider
+                            Default="30"
+                            Frequency="1"
+                            Maximum="100"
+                            Minimum="0"
+                            Unit="%"
+                            Value="{x:Bind LyricsStyleSettings.LyricsBgFontOpacity, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsFontStrokeWidth" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC12;}">
+                        <local:ExtendedSlider
+                            Default="0"
+                            Frequency="1"
+                            Maximum="5"
+                            Minimum="0"
+                            Value="{x:Bind LyricsStyleSettings.LyricsFontStrokeWidth, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <!--  字体颜色  -->
+                    <controls:SettingsExpander x:Uid="SettingsPageFontColor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D3;}">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageStrokeFontColor">
+                                <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsStrokeFontColorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveColored" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveGrayed" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorCustom" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard HorizontalContentAlignment="Left">
+                                <interactivity:Interaction.Behaviors>
+                                    <interactivity:DataTriggerBehavior
+                                        Binding="{x:Bind LyricsStyleSettings.LyricsStrokeFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                                        ComparisonCondition="Equal"
+                                        Value="2">
+                                        <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                    </interactivity:DataTriggerBehavior>
+                                    <interactivity:DataTriggerBehavior
+                                        Binding="{x:Bind LyricsStyleSettings.LyricsStrokeFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                                        ComparisonCondition="NotEqual"
+                                        Value="2">
+                                        <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                    </interactivity:DataTriggerBehavior>
+                                </interactivity:Interaction.Behaviors>
+                                <ColorPicker
+                                    ColorSpectrumShape="Box"
+                                    IsAlphaEnabled="True"
+                                    IsAlphaSliderVisible="True"
+                                    IsAlphaTextInputVisible="True"
+                                    IsColorChannelTextInputVisible="True"
+                                    IsColorSliderVisible="True"
+                                    IsHexInputVisible="True"
+                                    IsMoreButtonVisible="True"
+                                    Color="{x:Bind LyricsStyleSettings.LyricsCustomStrokeFontColor, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageLyricsBgFontColor">
+                                <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsBgFontColorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveColored" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveGrayed" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorCustom" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard>
+                                <interactivity:Interaction.Behaviors>
+                                    <interactivity:DataTriggerBehavior
+                                        Binding="{x:Bind LyricsStyleSettings.LyricsBgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                                        ComparisonCondition="Equal"
+                                        Value="2">
+                                        <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                    </interactivity:DataTriggerBehavior>
+                                    <interactivity:DataTriggerBehavior
+                                        Binding="{x:Bind LyricsStyleSettings.LyricsBgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                                        ComparisonCondition="NotEqual"
+                                        Value="2">
+                                        <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                    </interactivity:DataTriggerBehavior>
+                                </interactivity:Interaction.Behaviors>
+                                <ColorPicker
+                                    ColorSpectrumShape="Box"
+                                    IsAlphaEnabled="True"
+                                    IsAlphaSliderVisible="True"
+                                    IsAlphaTextInputVisible="True"
+                                    IsColorChannelTextInputVisible="True"
+                                    IsColorSliderVisible="True"
+                                    IsHexInputVisible="True"
+                                    IsMoreButtonVisible="True"
+                                    Color="{x:Bind LyricsStyleSettings.LyricsCustomBgFontColor, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard x:Uid="SettingsPageLyricsFgFontColor">
+                                <ComboBox SelectedIndex="{x:Bind LyricsStyleSettings.LyricsFgFontColorType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveColored" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorAdaptiveGrayed" />
+                                    <ComboBoxItem x:Uid="SettingsPageLyricsFontColorCustom" />
+                                </ComboBox>
+                            </controls:SettingsCard>
+
+                            <controls:SettingsCard>
+                                <interactivity:Interaction.Behaviors>
+                                    <interactivity:DataTriggerBehavior
+                                        Binding="{x:Bind LyricsStyleSettings.LyricsFgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                                        ComparisonCondition="Equal"
+                                        Value="2">
+                                        <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                    </interactivity:DataTriggerBehavior>
+                                    <interactivity:DataTriggerBehavior
+                                        Binding="{x:Bind LyricsStyleSettings.LyricsFgFontColorType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                                        ComparisonCondition="NotEqual"
+                                        Value="2">
+                                        <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                    </interactivity:DataTriggerBehavior>
+                                </interactivity:Interaction.Behaviors>
+                                <ColorPicker
+                                    ColorSpectrumShape="Box"
+                                    IsAlphaEnabled="True"
+                                    IsAlphaSliderVisible="True"
+                                    IsAlphaTextInputVisible="True"
+                                    IsColorChannelTextInputVisible="True"
+                                    IsColorSliderVisible="True"
+                                    IsHexInputVisible="True"
+                                    IsMoreButtonVisible="True"
+                                    Color="{x:Bind LyricsStyleSettings.LyricsCustomFgFontColor, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsExpander x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="SettingsPageAutoAdjust">
+                                <ToggleSwitch IsOn="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPagePhoneticText" IsEnabled="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Frequency="2"
+                                    Maximum="96"
+                                    Minimum="12"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsStyleSettings.PhoneticLyricsFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageOriginalText" IsEnabled="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Frequency="2"
+                                    Maximum="96"
+                                    Minimum="12"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsStyleSettings.OriginalLyricsFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="SettingsPageTranslatedText" IsEnabled="{x:Bind LyricsStyleSettings.IsDynamicLyricsFontSize, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}">
+                                <local:ExtendedSlider
+                                    Frequency="2"
+                                    Maximum="96"
+                                    Minimum="12"
+                                    ResetButtonVisibility="Collapsed"
+                                    Value="{x:Bind LyricsStyleSettings.TranslatedLyricsFontSize, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsLineSpacingFactor" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF579;}">
+                        <local:ExtendedSlider
+                            x:Uid="SettingsPageLyricsLineSpacingFactorSlider"
+                            Default="0.5"
+                            Frequency="0.1"
+                            Maximum="2"
+                            Minimum="0"
+                            Unit="x"
+                            Value="{x:Bind LyricsStyleSettings.LyricsLineSpacingFactor, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard x:Uid="SettingsPageLyricsTranslationSeparator" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF464;}">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <TextBox AcceptsReturn="True" Text="{x:Bind LyricsStyleSettings.LyricsTranslationSeparator, Mode=TwoWay}" />
+                            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

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

@@ -0,0 +1,40 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.Settings;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class LyricsStyleSettingsControl : UserControl
+    {
+        public LyricsStyleSettingsControl()
+        {
+            InitializeComponent();
+        }
+
+        public static readonly DependencyProperty LyricsStyleSettingsProperty =
+            DependencyProperty.Register(nameof(LyricsStyleSettings), typeof(LyricsStyleSettings), typeof(LyricsStyleSettingsControl), new PropertyMetadata(default));
+
+        public LyricsStyleSettings LyricsStyleSettings
+        {
+            get => (LyricsStyleSettings)GetValue(LyricsStyleSettingsProperty);
+            set => SetValue(LyricsStyleSettingsProperty, value);
+        }
+    }
+}

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

@@ -92,7 +92,73 @@
         </Grid>
         <Grid Grid.Column="1">
 
-            <controls:SwitchPresenter Margin="0,100,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
+            <Grid Padding="36,0" Style="{StaticResource SettingsGridStyle}">
+                <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                    <TextBlock x:Uid="LyricsWindowSettingsControlCurrentLyricsWindowConfig" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <Pivot SelectionChanged="Pivot_SelectionChanged">
+
+                        <PivotItem Tag="General">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="AppSettingsControlGeneral"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
+                        <PivotItem Tag="AlbumArtStyle">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageAlbumStyle"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
+                        <PivotItem Tag="LyricsStyle">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageLyricsStyle"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
+                        <PivotItem Tag="LyricsEffect">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageLyricsEffect"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
+                        <PivotItem Tag="LyricsBackground">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageBackgroundOverlay"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
+                        <PivotItem Tag="Advanced">
+                            <PivotItem.Header>
+                                <TextBlock
+                                    x:Uid="SettingsPageAdvanced"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </PivotItem.Header>
+                        </PivotItem>
+
+                    </Pivot>
+
+                </StackPanel>
+            </Grid>
+
+            <controls:SwitchPresenter Margin="0,110,0,0" Value="{x:Bind ViewModel.ListViewSelectedItemTag, Mode=OneWay}">
                 <controls:SwitchPresenter.ContentTransitions>
                     <TransitionCollection>
                         <PopupThemeTransition />
@@ -137,97 +203,6 @@
                                     </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"
-                                            IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
-                                            <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},
@@ -251,6 +226,86 @@
                                                 <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
                                             </ComboBox>
                                         </controls:SettingsCard>
+
+                                        <controls:SettingsCard x:Uid="SettingsPageDockMonitor" IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsWorkArea, Mode=OneWay}">
+                                            <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.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"
+                                            IsEnabled="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.IsAdaptToEnvironment, Mode=OneWay}">
+                                            <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:SettingsExpander
+                                    x:Uid="SettingsPageWindowBounds"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xF16B;}"
+                                    IsExpanded="True">
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard Header="X">
+                                            <NumberBox
+                                                SmallChange="10"
+                                                SpinButtonPlacementMode="Inline"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowX, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard Header="Y">
+                                            <NumberBox
+                                                SmallChange="10"
+                                                SpinButtonPlacementMode="Inline"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowY, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard x:Uid="SettingsPageWidth">
+                                            <NumberBox
+                                                SmallChange="10"
+                                                SpinButtonPlacementMode="Inline"
+                                                Value="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.WindowWidth, Mode=TwoWay}" />
+                                        </controls:SettingsCard>
+                                        <controls:SettingsCard x:Uid="SettingsPageHeight">
+                                            <NumberBox
+                                                SmallChange="10"
+                                                SpinButtonPlacementMode="Inline"
+                                                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>
 
@@ -268,9 +323,14 @@
                     <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}" />
+                <!--  Lyrics style  -->
+                <controls:Case Value="LyricsStyle">
+                    <uc:LyricsStyleSettingsControl LyricsStyleSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings, Mode=OneWay}" />
+                </controls:Case>
+
+                <!--  Lyrics  effect  -->
+                <controls:Case Value="LyricsEffect">
+                    <uc:LyricsEffectSettingsControl LyricsEffectSettings="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsEffectSettings, Mode=OneWay}" />
                 </controls:Case>
 
                 <!--  Lyrics background  -->
@@ -311,81 +371,6 @@
 
             </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

@@ -1,6 +1,7 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
@@ -31,13 +32,13 @@ namespace BetterLyrics.WinUI3.Controls
     {
         public LyricsWindowSettingsControlViewModel ViewModel => (LyricsWindowSettingsControlViewModel)DataContext;
 
-        private ISettingsService _settingsService;
+        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
 
         public LyricsWindowSettingsControl()
         {
             InitializeComponent();
             DataContext = Ioc.Default.GetRequiredService<LyricsWindowSettingsControlViewModel>();
-            _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
         }
 
         private void DeleteMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
@@ -52,11 +53,6 @@ namespace BetterLyrics.WinUI3.Controls
             }
         }
 
-        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)
@@ -80,5 +76,16 @@ namespace BetterLyrics.WinUI3.Controls
                 }
             }
         }
+
+        private void Pivot_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is Pivot pivot)
+            {
+                if (pivot.SelectedItem is PivotItem pivotItem)
+                {
+                    ViewModel?.ListViewSelectedItemTag = pivotItem.Tag;
+                }
+            }
+        }
     }
 }

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

@@ -3,8 +3,11 @@
     x:Class="BetterLyrics.WinUI3.Controls.PlaybackSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:constants="using:BetterLyrics.WinUI3.Constants"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:globalization="using:Windows.Globalization"
+    xmlns:helper="using:BetterLyrics.WinUI3.Helper"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -132,7 +135,7 @@
                 CanReorderItems="True"
                 DragItemsCompleted="MediaSourceProvidersListView_DragItemsCompleted"
                 ItemsSource="{x:Bind ViewModel.AppSettings.MediaSourceProvidersInfo, Mode=OneWay}"
-                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                 ScrollViewer.HorizontalScrollMode="Enabled"
                 ScrollViewer.VerticalScrollBarVisibility="Disabled"
                 ScrollViewer.VerticalScrollMode="Disabled"
@@ -207,72 +210,32 @@
                         <!--  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}}" />
+                            <HyperlinkButton
+                                Content="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}"
+                                IsEnabled="False"
+                                NavigateUri="{x:Bind ViewModel.OriginalLyricsRef, Mode=OneWay}" />
                         </controls:SettingsCard>
                         <controls:SettingsCard x:Uid="LyricsPageTranslationProviderPrefix">
-                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                            <HyperlinkButton
+                                Content="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}"
+                                IsEnabled="False"
+                                NavigateUri="{x:Bind ViewModel.TranslatedLyricsRef, Mode=OneWay}" />
                         </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">
+                        <controls:SettingsExpander x:Uid="LyricsPageTranslationEnabled" 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 ItemsSource="{x:Bind helper:LanguageHelper.SupportedTranslationTargetLanguages}" SelectedIndex="{x:Bind ViewModel.SelectedTargetLanguageIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate x:DataType="models:ExtendedLanguage">
+                                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                                    <TextBlock Text="{x:Bind Name}" />
+                                                </StackPanel>
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
                                     </ComboBox>
                                 </controls:SettingsCard>
                                 <controls:SettingsCard x:Uid="SettingsPageTranslationConfig" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
@@ -299,20 +262,15 @@
                                             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">
+                        <TextBlock x:Uid="SettingsPagePhonetic" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <controls:SettingsExpander x:Uid="SettingsPageChinese" IsExpanded="{x:Bind ViewModel.AppSettings.TranslationSettings.IsChineseRomanizationEnabled, Mode=OneWay}">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsChineseRomanizationEnabled, Mode=TwoWay}" />
                             <controls:SettingsExpander.Items>
-                                <controls:SettingsCard>
+                                <controls:SettingsCard IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsChineseRomanizationEnabled, Mode=OneWay}">
                                     <ComboBox SelectedIndex="{x:Bind ViewModel.AppSettings.TranslationSettings.ChineseRomanization, Converter={StaticResource EnumToIntConverter}, Mode=TwoWay}">
                                         <ComboBoxItem x:Uid="SettingsPagePinyin" />
                                         <ComboBoxItem x:Uid="SettingsPageJyutping" />
@@ -320,11 +278,12 @@
                                 </controls:SettingsCard>
                             </controls:SettingsExpander.Items>
                         </controls:SettingsExpander>
-                        <controls:SettingsCard x:Uid="SettingsPageJapanese" IsEnabled="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTranslationEnabled, Mode=OneWay}">
+                        <controls:SettingsCard x:Uid="SettingsPageJapanese">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled, Mode=TwoWay}" />
                         </controls:SettingsCard>
 
                         <!--  中文简体繁体偏好  -->
+                        <TextBlock x:Uid="SettingsPageChineseLyrics" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
                         <controls:SettingsCard x:Uid="SettingsPageChinesePreference">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.TranslationSettings.IsTraditionalChineseEnabled, Mode=TwoWay}" />
                         </controls:SettingsCard>
@@ -363,7 +322,7 @@
 
                         <!--  LX music server  -->
                         <TextBlock x:Uid="SettingsPageLXMusicServer" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-                        <controls:SettingsCard>
+                        <controls:SettingsCard x:Uid="SettingsPageServerAddress">
                             <StackPanel Orientation="Horizontal" Spacing="6">
                                 <TextBox
                                     IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
@@ -377,17 +336,19 @@
                         </controls:SettingsCard>
 
                         <!--  Apple Music token  -->
-                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="media-user-token (for Apple Muisc)" />
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Apple Muisc media-user-token" />
                         <controls:SettingsCard
                             Background="{ThemeResource SystemFillColorCautionBackgroundBrush}"
+                            Description="Use at your own risk"
                             Foreground="{ThemeResource SystemFillColorCautionBrush}"
-                            Header="Use at your own risk">
+                            Header="WARNING">
                             <StackPanel Orientation="Horizontal" Spacing="6">
                                 <TextBox
                                     MaxWidth="250"
                                     PlaceholderText="media-user-token"
                                     Text="{x:Bind ViewModel.AppleMusicMediaUserToken, Mode=TwoWay}"
                                     TextWrapping="Wrap" />
+                                <HyperlinkButton Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE897;}" NavigateUri="{x:Bind constants:Link.AppleMusicCfgUrl}" />
                                 <Button
                                     Command="{x:Bind ViewModel.SaveAppleMusicMediaUserTokenCommand}"
                                     Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},

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

@@ -0,0 +1,44 @@
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class ByteArrayToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is byte[] byteArray && byteArray.Length > 0)
+            {
+                try
+                {
+                    using (var ms = new MemoryStream(byteArray))
+                    {
+                        var stream = ms.AsRandomAccessStream();
+                        var bitmapImage = new BitmapImage();
+
+                        bitmapImage.SetSource(stream);
+
+                        return bitmapImage;
+                    }
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Globalization;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class DisplayLanguageCodeToIndexConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string langCode)
+            {
+                return LanguageHelper.SupportedDisplayLanguages.FindIndex(x => x.LanguageCode == langCode);
+            }
+            return 0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            if (value is int index)
+            {
+                return LanguageHelper.SupportedDisplayLanguages.ElementAt(index).LanguageCode;
+            }
+            return "";
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Globalization;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class LanguageCodeToDisplayedNameConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string langCode)
+            {
+                if (PhoneticHelper.IsPhoneticCode(langCode))
+                {
+                    return PhoneticHelper.GetDisplayName(langCode);
+                }
+                else
+                {
+                    return new Language(langCode).DisplayName ?? langCode;
+                }
+            }
+            return value?.ToString() ?? "";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Events/ExtendedSliderValueChangedByUserEventArgs.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Events
+{
+    public class ExtendedSliderValueChangedByUserEventArgs : EventArgs
+    {
+        public double Value { get; set; }
+
+        public ExtendedSliderValueChangedByUserEventArgs(double value)
+        {
+            Value = value;
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ using BetterLyrics.WinUI3.Models;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Brushes;
 using Microsoft.Graphics.Canvas.Effects;
+using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
@@ -72,19 +73,38 @@ namespace BetterLyrics.WinUI3.Helper
         {
             CanvasCommandList list = new(control);
             using var ds = list.CreateDrawingSession();
+
+            // 描边
             if (strokeWidth > 0)
             {
-                if (lyricsLine.TextGeometry == null)
+                if (lyricsLine.PhoneticCanvasGeometry != null)
                 {
-                    return list;
+                    ds.DrawGeometry(lyricsLine.PhoneticCanvasGeometry, lyricsLine.PhoneticPosition, strokeColor, strokeWidth);
+                }
+                if (lyricsLine.OriginalCanvasGeometry != null)
+                {
+                    ds.DrawGeometry(lyricsLine.OriginalCanvasGeometry, lyricsLine.OriginalPosition, strokeColor, strokeWidth);
+                }
+                if (lyricsLine.TranslatedCanvasGeometry != null)
+                {
+                    ds.DrawGeometry(lyricsLine.TranslatedCanvasGeometry, lyricsLine.TranslatedPosition, strokeColor, strokeWidth);
                 }
-                ds.DrawGeometry(lyricsLine.TextGeometry, lyricsLine.Position, strokeColor, strokeWidth); // 描边
             }
-            if (lyricsLine.CanvasTextLayout == null)
+
+            // 绘制文本（填充）
+            if (lyricsLine.PhoneticCanvasTextLayout != null)
             {
-                return list;
+                ds.DrawTextLayout(lyricsLine.PhoneticCanvasTextLayout, lyricsLine.PhoneticPosition, fontColor);
             }
-            ds.DrawTextLayout(lyricsLine.CanvasTextLayout, lyricsLine.Position, fontColor); // 绘制文本（填充）
+            if (lyricsLine.OriginalCanvasTextLayout != null)
+            {
+                ds.DrawTextLayout(lyricsLine.OriginalCanvasTextLayout, lyricsLine.OriginalPosition, fontColor);
+            }
+            if (lyricsLine.TranslatedCanvasTextLayout != null)
+            {
+                ds.DrawTextLayout(lyricsLine.TranslatedCanvasTextLayout, lyricsLine.TranslatedPosition, fontColor);
+            }
+
             return list;
         }
 
@@ -113,12 +133,12 @@ namespace BetterLyrics.WinUI3.Helper
             var mask = new CanvasCommandList(control);
             using var ds = mask.CreateDrawingSession();
 
-            if (lyricsLine.CanvasTextLayout == null)
+            if (lyricsLine.OriginalCanvasTextLayout == null)
             {
                 return mask;
             }
 
-            var highlightRegion = lyricsLine.CanvasTextLayout.GetCharacterRegions(charStartIndex, charLength).FirstOrDefault();
+            var highlightRegion = lyricsLine.OriginalCanvasTextLayout.GetCharacterRegions(charStartIndex, charLength).FirstOrDefault();
 
             double highlightTotalWidth = (double)highlightRegion.LayoutBounds.Width;
             // Draw the highlight for the current character
@@ -129,20 +149,20 @@ namespace BetterLyrics.WinUI3.Helper
             // Rects
             var highlightRect = new Rect(
                 highlightRegion.LayoutBounds.X,
-                highlightRegion.LayoutBounds.Y + lyricsLine.Position.Y,
+                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                 highlightWidth,
                 highlightRegion.LayoutBounds.Height
             );
 
             var fadeInRect = new Rect(
                 highlightRect.Right - fadingWidth,
-                highlightRegion.LayoutBounds.Y + lyricsLine.Position.Y,
+                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                 fadingWidth,
                 highlightRegion.LayoutBounds.Height
             );
             var fadeOutRect = new Rect(
                 highlightRect.Right,
-                highlightRegion.LayoutBounds.Y + lyricsLine.Position.Y,
+                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                 fadingWidth,
                 highlightRegion.LayoutBounds.Height
             );
@@ -171,15 +191,15 @@ namespace BetterLyrics.WinUI3.Helper
         {
             var mask = new CanvasCommandList(control);
 
-            if (lyricsLine.CanvasTextLayout == null)
+            if (lyricsLine.OriginalCanvasTextLayout == null)
             {
                 return mask;
             }
 
             using var ds = mask.CreateDrawingSession();
 
-            var regions = lyricsLine.CanvasTextLayout.GetCharacterRegions(0, charStartIndex);
-            var highlightRegion = lyricsLine.CanvasTextLayout
+            var regions = lyricsLine.OriginalCanvasTextLayout.GetCharacterRegions(0, charStartIndex);
+            var highlightRegion = lyricsLine.OriginalCanvasTextLayout
                 .GetCharacterRegions(charStartIndex, charLength)
                 .FirstOrDefault();
             if (regions.Length > 0)
@@ -190,7 +210,7 @@ namespace BetterLyrics.WinUI3.Helper
                     var region = regions[j];
                     var rect = new Rect(
                         region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.Position.Y,
+                        region.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                         region.LayoutBounds.Width,
                         region.LayoutBounds.Height
                     );
@@ -207,14 +227,14 @@ namespace BetterLyrics.WinUI3.Helper
             // Rects
             var highlightRect = new Rect(
                 highlightRegion.LayoutBounds.X,
-                highlightRegion.LayoutBounds.Y + lyricsLine.Position.Y,
+                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                 highlightWidth,
                 highlightRegion.LayoutBounds.Height
             );
 
             var fadeInRect = new Rect(
                 highlightRect.Right - fadingWidth,
-                highlightRegion.LayoutBounds.Y + lyricsLine.Position.Y,
+                highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                 fadingWidth,
                 highlightRegion.LayoutBounds.Height
             );
@@ -225,7 +245,7 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 var fadeOutRect = new Rect(
                     highlightRect.Right,
-                    highlightRegion.LayoutBounds.Y + lyricsLine.Position.Y,
+                    highlightRegion.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                     fadingWidth,
                     highlightRegion.LayoutBounds.Height
                 );
@@ -246,12 +266,12 @@ namespace BetterLyrics.WinUI3.Helper
             var mask = new CanvasCommandList(control);
             using var ds = mask.CreateDrawingSession();
 
-            if (lyricsLine.CanvasTextLayout == null)
+            if (lyricsLine.OriginalCanvasTextLayout == null)
             {
                 return mask;
             }
 
-            var regions = lyricsLine.CanvasTextLayout.GetCharacterRegions(0, lyricsLine.OriginalText.Length);
+            var regions = lyricsLine.OriginalCanvasTextLayout.GetCharacterRegions(0, lyricsLine.OriginalText.Length);
             if (regions.Length > 0)
             {
                 for (int j = 0; j < regions.Length; j++)
@@ -259,7 +279,7 @@ namespace BetterLyrics.WinUI3.Helper
                     var region = regions[j];
                     var rect = new Rect(
                         region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.Position.Y,
+                        region.LayoutBounds.Y + lyricsLine.OriginalPosition.Y,
                         region.LayoutBounds.Width,
                         region.LayoutBounds.Height
                     );
@@ -270,17 +290,17 @@ namespace BetterLyrics.WinUI3.Helper
             return mask;
         }
 
-        public static CanvasCommandList CreateTranslationHighlightMask(ICanvasAnimatedControl control, LyricsLine lyricsLine)
+        public static CanvasCommandList CreatePhoneticHighlightMask(ICanvasAnimatedControl control, LyricsLine lyricsLine)
         {
             var mask = new CanvasCommandList(control);
             using var ds = mask.CreateDrawingSession();
 
-            if (lyricsLine.CanvasTextLayout == null)
+            if (lyricsLine.PhoneticCanvasTextLayout == null)
             {
                 return mask;
             }
 
-            var regions = lyricsLine.CanvasTextLayout.GetCharacterRegions(lyricsLine.OriginalText.Length, lyricsLine.DisplayedText.Length - lyricsLine.OriginalText.Length);
+            var regions = lyricsLine.PhoneticCanvasTextLayout.GetCharacterRegions(0, lyricsLine.PhoneticText.Length);
             if (regions.Length > 0)
             {
                 for (int j = 0; j < regions.Length; j++)
@@ -288,7 +308,36 @@ namespace BetterLyrics.WinUI3.Helper
                     var region = regions[j];
                     var rect = new Rect(
                         region.LayoutBounds.X,
-                        region.LayoutBounds.Y + lyricsLine.Position.Y,
+                        region.LayoutBounds.Y + lyricsLine.PhoneticPosition.Y,
+                        region.LayoutBounds.Width,
+                        region.LayoutBounds.Height
+                    );
+                    ds.FillRectangle(rect, Colors.White);
+                }
+            }
+
+            return mask;
+        }
+
+        public static CanvasCommandList CreateTranslatedHighlightMask(ICanvasAnimatedControl control, LyricsLine lyricsLine)
+        {
+            var mask = new CanvasCommandList(control);
+            using var ds = mask.CreateDrawingSession();
+
+            if (lyricsLine.TranslatedCanvasTextLayout == null)
+            {
+                return mask;
+            }
+
+            var regions = lyricsLine.TranslatedCanvasTextLayout.GetCharacterRegions(0, lyricsLine.TranslatedText.Length);
+            if (regions.Length > 0)
+            {
+                for (int j = 0; j < regions.Length; j++)
+                {
+                    var region = regions[j];
+                    var rect = new Rect(
+                        region.LayoutBounds.X,
+                        region.LayoutBounds.Y + lyricsLine.TranslatedPosition.Y,
                         region.LayoutBounds.Width,
                         region.LayoutBounds.Height
                     );

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

@@ -117,6 +117,11 @@ namespace BetterLyrics.WinUI3.Helper
             return new Vector3((float)color.R / 0xff, (float)color.G / 0xff, (float)color.B / 0xff);
         }
 
+        public static Color GetRandomColor()
+        {
+            return Color.FromArgb(255, (byte)Random.Shared.Next(0, 256), (byte)Random.Shared.Next(0, 256), (byte)Random.Shared.Next(0, 256));
+        }
+
         public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, string monitorDeviceName, WindowPixelSampleMode mode)
         {
             if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;

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

@@ -8,6 +8,7 @@ namespace BetterLyrics.WinUI3.Helper
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -42,6 +43,29 @@ namespace BetterLyrics.WinUI3.Helper
                 }
                 return files;
             }
+
+            public static void DeleteAllFiles(string folderPath)
+            {
+                if (!Directory.Exists(folderPath))
+                {
+                    return;
+                }
+
+                DirectoryInfo di = new DirectoryInfo(folderPath);
+
+                try
+                {
+                    foreach (FileInfo file in di.GetFiles())
+                    {
+                        try
+                        {
+                            file.Delete();
+                        }
+                        catch (Exception ex) { }
+                    }
+                }
+                catch (Exception) { }
+            }
         }
     }
 }

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

@@ -1,93 +1,105 @@
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
 using NTextCat;
+using NTextCat.Commons;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Windows.Globalization;
 
-namespace BetterLyrics.WinUI3.Services
+namespace BetterLyrics.WinUI3.Helper
 {
     public class LanguageHelper
     {
         private static readonly RankedLanguageIdentifierFactory _factory = new();
         private static readonly RankedLanguageIdentifier _identifier;
 
-        public static List<Models.LanguageInfo> SupportedTargetLanguages { get; set; } =
+        public static List<ExtendedLanguage> SupportedTranslationTargetLanguages { get; set; } =
         [
-            new Models.LanguageInfo("ar", "العربية"),
-            new Models.LanguageInfo("az", "Azərbaycan dili"),
+            new ExtendedLanguage("ar"),
+            new ExtendedLanguage("az"),
 
-            new Models.LanguageInfo("bg", "Български"),
-            new Models.LanguageInfo("bn", "বাংলা"),
+            new ExtendedLanguage("bg"),
+            new ExtendedLanguage("bn"),
 
-            new Models.LanguageInfo("ca", "Català"),
-            new Models.LanguageInfo("cs", "Čeština"),
+            new ExtendedLanguage("ca"),
+            new ExtendedLanguage("cs"),
 
-            new Models.LanguageInfo("da", "Dansk"),
-            new Models.LanguageInfo("de", "Deutsch"),
+            new ExtendedLanguage("da"),
+            new ExtendedLanguage("de"),
 
-            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 ExtendedLanguage("el"),
+            new ExtendedLanguage("en"),
+            new ExtendedLanguage("eo"),
+            new ExtendedLanguage("es"),
+            new ExtendedLanguage("et"),
+            new ExtendedLanguage("eu"),
 
-            new Models.LanguageInfo("fa", "فارسی"),
-            new Models.LanguageInfo("fi", "Suomi"),
-            new Models.LanguageInfo("fr", "Français"),
+            new ExtendedLanguage("fa"),
+            new ExtendedLanguage("fi"),
+            new ExtendedLanguage("fr"),
 
-            new Models.LanguageInfo("ga", "Gaeilge"),
-            new Models.LanguageInfo("gl", "Galego"),
+            new ExtendedLanguage("ga"),
+            new ExtendedLanguage("gl"),
 
-            new Models.LanguageInfo("he", "עברית"),
-            new Models.LanguageInfo("hi", "हिन्दी"),
-            new Models.LanguageInfo("hu", "Magyar"),
+            new ExtendedLanguage("he"),
+            new ExtendedLanguage("hi"),
+            new ExtendedLanguage("hu"),
 
-            new Models.LanguageInfo("id", "Bahasa Indonesia"),
-            new Models.LanguageInfo("it", "Italiano"),
+            new ExtendedLanguage("id"),
+            new ExtendedLanguage("it"),
 
-            new Models.LanguageInfo("ja", "日本語"),
+            new ExtendedLanguage("ja"),
 
-            new Models.LanguageInfo("ko", "한국어"),
-            new Models.LanguageInfo("ky", "Кыргызча"),
+            new ExtendedLanguage("ko"),
+            new ExtendedLanguage("ky"),
 
-            new Models.LanguageInfo("lt", "Lietuvių"),
-            new Models.LanguageInfo("lv", "Latviešu"),
+            new ExtendedLanguage("lt"),
+            new ExtendedLanguage("lv"),
 
-            new Models.LanguageInfo("ms", "Bahasa Melayu"),
+            new ExtendedLanguage("ms"),
 
-            new Models.LanguageInfo("nb", "Norsk bokmål"),
-            new Models.LanguageInfo("nl", "Nederlands"),
+            new ExtendedLanguage("nb"),
+            new ExtendedLanguage("nl"),
 
-            new Models.LanguageInfo("pt-BR", "Português (Brasil)"),
-            new Models.LanguageInfo("pl", "Polski"),
-            new Models.LanguageInfo("pt", "Português"),
+            new ExtendedLanguage("pt-BR"),
+            new ExtendedLanguage("pl"),
+            new ExtendedLanguage("pt"),
 
-            new Models.LanguageInfo("ro", "Română"),
-            new Models.LanguageInfo("ru", "Русский"),
+            new ExtendedLanguage("ro"),
+            new ExtendedLanguage("ru"),
 
-            new Models.LanguageInfo("sk", "Slovenčina"),
-            new Models.LanguageInfo("sl", "Slovenščina"),
-            new Models.LanguageInfo("sq", "Shqip"),
-            new Models.LanguageInfo("sr", "Српски"),
-            new Models.LanguageInfo("sv", "Svenska"),
+            new ExtendedLanguage("sk"),
+            new ExtendedLanguage("sl"),
+            new ExtendedLanguage("sq"),
+            new ExtendedLanguage("sr"),
+            new ExtendedLanguage("sv"),
 
-            new Models.LanguageInfo("th", "ไทย"),
-            new Models.LanguageInfo("tl", "Filipino"),
-            new Models.LanguageInfo("tr", "Türkçe"),
+            new ExtendedLanguage("th"),
+            new ExtendedLanguage("tl"),
+            new ExtendedLanguage("tr"),
 
-            new Models.LanguageInfo("uk", "Українська"),
-            new Models.LanguageInfo("ur", "اردو"),
+            new ExtendedLanguage("uk"),
+            new ExtendedLanguage("ur"),
 
-            new Models.LanguageInfo("vi", "Tiếng Việt"),
+            new ExtendedLanguage("vi"),
 
-            new Models.LanguageInfo("zh", "中文"),
+            new ExtendedLanguage("zh"),
+        ];
+
+        public static List<ExtendedLanguage> SupportedDisplayLanguages { get; set; } =
+        [
+            new ExtendedLanguage("", App.ResourceLoader!.GetString("SettingsPageSystemLanguage")),
+            new ExtendedLanguage("en-US", "English"),
+            new ExtendedLanguage("ja-JP"),
+            new ExtendedLanguage("ko-KR"),
+            new ExtendedLanguage("zh-CN", "简体中文"),
+            new ExtendedLanguage("zh-TW", "繁體中文"),
         ];
 
         static LanguageHelper()
         {
             _identifier = _factory.Load(PathHelper.LanguageProfilePath);
-            RomajiConverter.Core.Helpers.RomajiHelper.Init();
         }
 
         public static string? DetectLanguageCode(string? text)
@@ -115,16 +127,16 @@ namespace BetterLyrics.WinUI3.Services
             };
         }
 
-        public static string GetDefaultTargetLanguageCode()
+        public static string GetDefaultTargetTranslationLanguageCode()
         {
-            var found = SupportedTargetLanguages.Find(x => ApplicationLanguages.Languages.FirstOrDefault()?.Contains(x.Code) == true);
+            var found = SupportedTranslationTargetLanguages.Find(x => ApplicationLanguages.Languages.FirstOrDefault()?.Contains(x.LanguageCode) == true);
             if (found == null)
             {
                 return "en";
             }
             else
             {
-                return found.Code;
+                return found.LanguageCode;
             }
         }
 
@@ -135,17 +147,22 @@ namespace BetterLyrics.WinUI3.Services
             if (char.IsLetter(c) && c < 128)
                 return char.ToUpper(c).ToString();
 
-            if (Pinyin.Pinyin.Instance.IsHanzi(c.ToString()))
+            if (IsHanzi(c.ToString()))
             {
-                return Pinyin.Pinyin.Instance.HanziToPinyin(c.ToString(), Pinyin.ManTone.Style.NORMAL).ToStr().ToUpper().FirstOrDefault().ToString();
+                return PhoneticHelper.ToPinyin(c.ToString(), Pinyin.ManTone.Style.NORMAL).ToUpper().FirstOrDefault().ToString();
             }
 
             return "#";
         }
 
-        public static string ToRomaji(string text)
+        public static bool IsHanzi(char ch)
         {
-            return string.Join(" ", RomajiConverter.Core.Helpers.RomajiHelper.SentenceToRomaji(text).Select(x => x.Romaji));
+            return IsHanzi(ch.ToString());
+        }
+
+        public static bool IsHanzi(string text)
+        {
+            return Pinyin.Pinyin.Instance.IsHanzi(text);
         }
     }
 }

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

@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Xml.Linq;
 using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;
 
@@ -16,15 +17,17 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public partial class LyricsParser
     {
-        private List<LyricsData> _lyricsDataArr = [];
+        public List<LyricsData> LyricsDataArr { get; private set; } = [];
 
-        public List<LyricsData> Parse(string? raw, int? durationMs)
+        public LyricsData? LibreTranslationLyricsData => LyricsDataArr.LastOrDefault();
+
+        public void Parse(string title, string artist, string? raw, int? durationMs, LyricsSearchProvider? lyricsSearchProvider)
         {
+            LyricsDataArr = [];
             durationMs ??= (int)TimeSpan.FromMinutes(99).TotalMilliseconds;
-            _lyricsDataArr = [];
             if (raw == null)
             {
-                _lyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder(durationMs.Value));
+                LyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder(durationMs.Value));
             }
             else
             {
@@ -48,66 +51,110 @@ namespace BetterLyrics.WinUI3.Helper
                 }
             }
             FillRomanizationLyricsData();
-            _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
-            return _lyricsDataArr;
+            FillTranslationFromCache(title, artist, lyricsSearchProvider);
         }
 
-        private void FillRomanizationLyricsData()
+        private void FillTranslationFromCache(string title, string artist, LyricsSearchProvider? provider)
         {
-            var chinese = _lyricsDataArr.Where(x => x.LanguageCode == "zh").FirstOrDefault();
+            string? translationRaw = null;
+            switch (provider)
+            {
+                case LyricsSearchProvider.QQ:
+                    translationRaw = FileHelper.ReadLyricsCache(title, artist, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
+                    break;
+                case LyricsSearchProvider.Kugou:
+                    translationRaw = FileHelper.ReadLyricsCache(title, artist, LyricsFormat.Lrc, PathHelper.KugouTranslationCacheDirectory);
+                    break;
+                case LyricsSearchProvider.Netease:
+                    translationRaw = FileHelper.ReadLyricsCache(title, artist, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
+                    break;
+                case LyricsSearchProvider.LrcLib:
+                    break;
+                case LyricsSearchProvider.AmllTtmlDb:
+                    break;
+                case LyricsSearchProvider.LocalMusicFile:
+                    break;
+                case LyricsSearchProvider.LocalLrcFile:
+                    break;
+                case LyricsSearchProvider.LocalEslrcFile:
+                    break;
+                case LyricsSearchProvider.LocalTtmlFile:
+                    break;
+                default:
+                    break;
+            }
+
+            if (translationRaw != null)
+            {
+                switch (provider)
+                {
+                    case LyricsSearchProvider.QQ:
+                    case LyricsSearchProvider.Kugou:
+                    case LyricsSearchProvider.Netease:
+                        ParseLrc(translationRaw);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        private async Task FillRomanizationLyricsData()
+        {
+            var chinese = LyricsDataArr.Where(x => x.LanguageCode == "zh").FirstOrDefault();
             if (chinese != null)
             {
-                _lyricsDataArr.Add(new LyricsData
+                LyricsDataArr.Add(new LyricsData
                 {
-                    LanguageCode = "pinyin",
+                    LanguageCode = PhoneticHelper.PinyinCode,
                     LyricsLines = chinese.LyricsLines.Select(line => new LyricsLine
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = Pinyin.Pinyin.Instance.HanziToPinyin(line.OriginalText).ToStr(),
+                        OriginalText = PhoneticHelper.ToPinyin(line.OriginalText),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = Pinyin.Pinyin.Instance.HanziToPinyin(c.Text).ToStr(),
+                            Text = PhoneticHelper.ToPinyin(c.Text),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
                 });
-                _lyricsDataArr.Add(new LyricsData
+                LyricsDataArr.Add(new LyricsData
                 {
-                    LanguageCode = "jyutping",
+                    LanguageCode = PhoneticHelper.JyutpingCode,
                     LyricsLines = chinese.LyricsLines.Select(line => new LyricsLine
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = Pinyin.Jyutping.Instance.HanziToPinyin(line.OriginalText).ToStr(),
+                        OriginalText = PhoneticHelper.ToJyutping(line.OriginalText),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = Pinyin.Jyutping.Instance.HanziToPinyin(c.Text).ToStr(),
+                            Text = PhoneticHelper.ToJyutping(c.Text),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
                 });
             }
-            var japanese = _lyricsDataArr.Where(x => x.LanguageCode == "ja").FirstOrDefault();
+            var japanese = LyricsDataArr.Where(x => x.LanguageCode == "ja").FirstOrDefault();
             if (japanese != null)
             {
-                _lyricsDataArr.Add(new LyricsData
+                LyricsDataArr.Add(new LyricsData
                 {
-                    LanguageCode = "romaji",
+                    LanguageCode = PhoneticHelper.RomajiCode,
                     LyricsLines = japanese.LyricsLines.Select(line => new LyricsLine
                     {
                         StartMs = line.StartMs,
                         EndMs = line.EndMs,
-                        OriginalText = LanguageHelper.ToRomaji(line.OriginalText),
+                        OriginalText = PhoneticHelper.ToRomaji(line.OriginalText),
                         LyricsChars = line.LyricsChars.Select(c => new LyricsChar
                         {
                             StartMs = c.StartMs,
                             EndMs = c.EndMs,
-                            Text = LanguageHelper.ToRomaji(c.Text),
+                            Text = PhoneticHelper.ToRomaji(c.Text),
                             StartIndex = c.StartIndex
                         }).ToList()
                     }).ToList()
@@ -165,6 +212,7 @@ namespace BetterLyrics.WinUI3.Helper
                         int ms = int.Parse(m.Groups[4].Value.PadRight(3, '0'));
                         lineStartTime = min * 60_000 + sec * 1000 + ms;
                         content = bracketRegex!.Replace(line, "");
+                        if (content == "//") content = "";
                         lrcLines.Add((lineStartTime.Value, content, new List<(int, string)>()));
                     }
                 }
@@ -180,8 +228,9 @@ namespace BetterLyrics.WinUI3.Helper
             }
 
             // 初始化每种语言的歌词列表
-            _lyricsDataArr.Clear();
-            for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
+            //LyricsDataArr.Clear();
+            int langStartIndex = LyricsDataArr.Count;
+            for (int i = 0; i < languageCount; i++) LyricsDataArr.Add(new LyricsData());
 
             // 遍历每个时间分组
             if (grouped != null)
@@ -219,7 +268,7 @@ namespace BetterLyrics.WinUI3.Helper
                                     currentIndex += charText?.Length ?? 0;
                                 }
                             }
-                            _lyricsDataArr[langIdx].LyricsLines.Add(line);
+                            LyricsDataArr[langStartIndex + langIdx].LyricsLines.Add(line);
                         }
                         // 没有翻译行则不补原文，直接跳过
                     }
@@ -331,9 +380,9 @@ namespace BetterLyrics.WinUI3.Helper
                         });
                     }
                 }
-                _lyricsDataArr.Add(new LyricsData(originalLines));
+                LyricsDataArr.Add(new LyricsData(originalLines));
                 if (translationLines.Count > 0)
-                    _lyricsDataArr.Add(new LyricsData(translationLines));
+                    LyricsDataArr.Add(new LyricsData(translationLines));
             }
             catch
             {
@@ -448,7 +497,7 @@ namespace BetterLyrics.WinUI3.Helper
                 }
             }
 
-            _lyricsDataArr.Add(new LyricsData(lyricsLines));
+            LyricsDataArr.Add(new LyricsData(lyricsLines));
         }
 
         [GeneratedRegex(@"\[(\d*):(\d*)(\.|\:)(\d*)\]")]

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

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class PhoneticHelper
+    {
+        public const string PinyinCode = "zh-pinyin";
+        public const string JyutpingCode = "zh-jyutping";
+        public const string RomajiCode = "ja-romaji";
+
+        public static bool IsPhoneticCode(string code)
+        {
+            return code == PinyinCode || code == JyutpingCode || code == RomajiCode;
+        }
+
+        public static string GetDisplayName(string code)
+        {
+            switch (code)
+            {
+                case PinyinCode:
+                    return App.ResourceLoader!.GetString("Pinyin");
+                case JyutpingCode:
+                    return App.ResourceLoader!.GetString("Jyutping");
+                case RomajiCode:
+                    return App.ResourceLoader!.GetString("Romaji");
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(code));
+            }
+        }
+
+        public static string ToRomaji(string text)
+        {
+            return Kana.Kana.KanaToRomaji(text, Kana.Error.Ignore).ToStr();
+        }
+
+        public static string ToPinyin(string text, Pinyin.ManTone.Style style = Pinyin.ManTone.Style.TONE)
+        {
+            return Pinyin.Pinyin.Instance.HanziToPinyin(text, style).ToStr();
+        }
+
+        public static string ToJyutping(string text)
+        {
+            return Pinyin.Jyutping.Instance.HanziToPinyin(text).ToStr();
+        }
+    }
+}

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

@@ -1,37 +1,35 @@
-using BetterLyrics.WinUI3.Models.Settings;
-using NAudio.Dsp;
+using NAudio.Dsp;
 using NAudio.Wave;
 using System;
-using System.Diagnostics;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    public class SpectrumAnalyzer : IDisposable
+    public partial class SpectrumAnalyzer : IDisposable
     {
-        private WasapiLoopbackCapture _capture;
-        
+        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 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;
+        private float[]? _currentSpectrum;
+        public float[]? SmoothSpectrum { get; private set; }
+
+        public int BarCount { get; set; } = 16;
+        public int Sensitivity { get; set; } = 100;
         public float SmoothingFactor { get; set; } = 0.95f;
         public bool IsCapturing { get; private set; } = false;
 
@@ -51,12 +49,13 @@ namespace BetterLyrics.WinUI3.Helper
 
         public void StartCapture()
         {
-            _currentSpectrum = new float[BarCount];
-            SmoothSpectrum = new float[BarCount];
-
             try
             {
-                _capture = new WasapiLoopbackCapture();
+                _currentSpectrum = new float[BarCount];
+                SmoothSpectrum = new float[BarCount];
+
+                _capture = new();
+
                 _sampleRate = _capture.WaveFormat.SampleRate;
                 _spectrumLeftData = new float[(int)(24000.0f / _sampleRate * _fftLength) / 2];
                 _spectrumRightData = new float[(int)(24000.0f / _sampleRate * _fftLength) / 2];
@@ -67,9 +66,7 @@ namespace BetterLyrics.WinUI3.Helper
 
                 IsCapturing = true;
             }
-            catch (Exception)
-            {
-            }
+            catch (Exception) { }
         }
 
         public void StopCapture()
@@ -100,10 +97,15 @@ namespace BetterLyrics.WinUI3.Helper
                 _fftRightData[i].Y = 0;
             }
 
+            if (_spectrumData == null || _spectrumRightData == null || _currentSpectrum == null)
+            {
+                return;
+            }
+
             // 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++)
+            for (int i = 0; i < _spectrumLeftData?.Length; i++)
             {
                 float real = (float)_fftLeftData[i].X;
                 float imaginary = (float)_fftLeftData[i].Y;
@@ -132,6 +134,11 @@ namespace BetterLyrics.WinUI3.Helper
 
         public void UpdateSmoothSpectrum()
         {
+            if (SmoothSpectrum == null || _currentSpectrum == null)
+            {
+                return;
+            }
+
             for (int i = 0; i < BarCount; i++)
             {
                 SmoothSpectrum[i] = SmoothSpectrum[i] * SmoothingFactor +

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

@@ -1,74 +1,62 @@
 using Microsoft.UI.Dispatching;
+using NAudio.CoreAudioApi;
 using System;
-using Vanara.Extensions;
-using Vanara.PInvoke;
-using static Vanara.PInvoke.CoreAudio;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
     public static class SystemVolumeHelper
     {
-        private readonly static IMMDeviceEnumerator _deviceEnumerator = new();
-        private static IAudioEndpointVolume? _endpointVolume = null;
-        private static VolumeCallbackImpl? _callbackImpl;
-        private static int _masterVolume = 0;
+        private static MMDeviceEnumerator? _deviceEnumerator;
+        private static MMDevice? _defaultDevice;
         private static DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 
-        public static event Action<int>? VolumeChanged;
+        /// <summary>
+        /// 当系统音量或静音状态改变时触发。
+        /// </summary>
+        public static event EventHandler<int>? VolumeNotification;
 
         static SystemVolumeHelper()
         {
-            var device = _deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia);
-            if (device != null)
+            _deviceEnumerator = new MMDeviceEnumerator();
+            _defaultDevice = _deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+
+            if (_defaultDevice != null)
             {
-                device.Activate(typeof(IAudioEndpointVolume).GUID, 0, null, out var obj);
-                if (obj is IAudioEndpointVolume endpointVolume)
-                {
-                    _endpointVolume = endpointVolume;
-                    _callbackImpl = new VolumeCallbackImpl();
-                    _endpointVolume.RegisterControlChangeNotify(_callbackImpl);
-                }
+                _defaultDevice.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
             }
         }
 
-        /// <summary>
-        /// 获取当前系统主音量（0~100）。
-        /// </summary>
-        public static int GetMasterVolume()
+        private static void AudioEndpointVolume_OnVolumeNotification(AudioVolumeNotificationData data)
         {
-            if (_endpointVolume != null)
+            _dispatcherQueue?.TryEnqueue(() =>
             {
-                double level = _endpointVolume.GetMasterVolumeLevelScalar();
-                _masterVolume = (int)(level * 100);
+                VolumeNotification?.Invoke(null, (int)(data.MasterVolume * 100));
+            });
+        }
+
+        /// <summary>
+        /// 获取或设置系统主音量 (0 到 100)。
+        /// </summary>
+        public static int MasterVolume
+        {
+            get
+            {
+                if (_defaultDevice == null)
+                    return 0;
+
+                return (int)(_defaultDevice.AudioEndpointVolume.MasterVolumeLevelScalar * 100);
             }
-
-            return _masterVolume;
-        }
-
-        /// <summary>
-        /// 设置当前系统主音量（0~100）。
-        /// </summary>
-        public static void SetMasterVolume(int volume)
-        {
-            if (_masterVolume == volume) return;
-
-            _masterVolume = volume;
-            _endpointVolume?.SetMasterVolumeLevelScalar(_masterVolume / 100f, Guid.Empty);
-        }
-
-        // 内部回调实现
-        private class VolumeCallbackImpl : IAudioEndpointVolumeCallback
-        {
-            HRESULT IAudioEndpointVolumeCallback.OnNotify(nint pNotify)
+            set
             {
-                var data = pNotify.ToStructure<AUDIO_VOLUME_NOTIFICATION_DATA>();
-                _masterVolume = (int)(data.fMasterVolume * 100);
-                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                {
-                    VolumeChanged?.Invoke(_masterVolume);
-                });
-                return HRESULT.S_OK;
+                if (_defaultDevice == null)
+                    return;
+
+                _defaultDevice.AudioEndpointVolume.MasterVolumeLevelScalar = value / 100f;
             }
         }
     }
-}
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/VectorHelper.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class VectorHelper
+    {
+        public static Vector2 WithX(this Vector2 source, float x)
+        {
+            return new Vector2(x, source.Y);
+        }
+
+        public static Vector2 WithY(this Vector2 source, float y)
+        {
+            return new Vector2(source.X, y);
+        }
+    }
+}

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

@@ -114,16 +114,8 @@ namespace BetterLyrics.WinUI3.Helper
             else
             {
                 var castedWindow = (Window)window;
-                if (typeof(T) == typeof(LyricsWindow))
-                {
-                    var lyricsWindow = (LyricsWindow)window;
-                    lyricsWindow.Show();
-                }
-                else
-                {
-                    castedWindow.Restore();
-                    castedWindow.Activate();
-                }
+                castedWindow.Activate();
+                castedWindow.AppWindow.MoveInZOrderAtTop();
             }
         }
 
@@ -202,13 +194,15 @@ namespace BetterLyrics.WinUI3.Helper
             Window? window = GetWindowByWindowType<T>() as Window;
             if (window == null) return;
 
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
             if (enable)
             {
-                EnableWorkArea(window);
+                RegisterWorkArea(hwnd);
             }
             else
             {
-                DisableWorkArea(window);
+                UnregisterWorkArea(hwnd);
             }
         }
 
@@ -253,7 +247,8 @@ namespace BetterLyrics.WinUI3.Helper
             var window = GetWindowByWindowType<T>() as Window;
             if (window == null) return;
 
-            window.AppWindow.MoveAndResize(rect.ToRectInt32());
+            window.AppWindow.Move(new Windows.Graphics.PointInt32((int)rect.X, (int)rect.Y));
+            window.AppWindow.Resize(new Windows.Graphics.SizeInt32((int)rect.Width, (int)rect.Height));
         }
 
         public static void SetTitleBarArea<T>(TitleBarArea titleBarArea)
@@ -269,24 +264,6 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        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;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedLanguage.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Globalization;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class ExtendedLanguage
+    {
+        public string Name { get; private set; }
+        public string LanguageCode { get; private set; }
+
+        public ExtendedLanguage(string languageCode, string? name = null)
+        {
+            LanguageCode = languageCode;
+            Name = name ?? new Language(languageCode).NativeName;
+        }
+    }
+}

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

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

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

@@ -18,6 +18,8 @@ namespace BetterLyrics.WinUI3.Models
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsWindowStatus LyricsWindowStatus { get; set; }
 
+        public bool IsLyricsWindowStatusRefreshing { get; set; } = false;
+
         public LiveStates()
         {
             LyricsWindowStatus = new LyricsWindowStatus();

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

@@ -32,7 +32,23 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void SetDisplayedTextAlongWith(LyricsData translationData, string separator, int toleranceMs = 0)
+        public void ClearTranslatedText()
+        {
+            foreach (var line in LyricsLines)
+            {
+                line.TranslatedText = "";
+            }
+        }
+
+        public void ClearPhoneticText()
+        {
+            foreach (var line in LyricsLines)
+            {
+                line.PhoneticText = "";
+            }
+        }
+
+        public void SetTranslatedText(LyricsData translationData, string separator, int toleranceMs = 0)
         {
             foreach (var line in LyricsLines)
             {
@@ -42,17 +58,39 @@ namespace BetterLyrics.WinUI3.Models
 
                 if (transLine != null)
                 {
-                    line.DisplayedText = $"{line.OriginalText}{separator}{transLine.OriginalText}";
+                    // 此处 transLine.OriginalText 指翻译中的“原文”属性
+                    line.TranslatedText = transLine.OriginalText;
                 }
                 else
                 {
-                    // 没有匹配的翻译，翻译部分留空
-                    line.DisplayedText = $"{line.OriginalText}";
+                    // 没有匹配的翻译
+                    line.TranslatedText = "";
                 }
             }
         }
 
-        public void SetDisplayedTextAlongWith(string translation, string separator)
+        public void SetPhoneticText(LyricsData phoneticData, string separator, int toleranceMs = 0)
+        {
+            foreach (var line in LyricsLines)
+            {
+                // 在音译歌词中查找与当前行开始时间最接近且在容忍范围内的行
+                var transLine = phoneticData.LyricsLines
+                    .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
+
+                if (transLine != null)
+                {
+                    // 此处 transLine.OriginalText 指音译中的“原文”属性
+                    line.PhoneticText = transLine.OriginalText;
+                }
+                else
+                {
+                    // 没有匹配的音译
+                    line.PhoneticText = "";
+                }
+            }
+        }
+
+        public void SetTranslation(string translation, string separator)
         {
             List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
             int i = 0;
@@ -60,24 +98,16 @@ namespace BetterLyrics.WinUI3.Models
             {
                 if (i >= translationArr.Count)
                 {
-                    line.DisplayedText = line.OriginalText; // No translation available, keep original text
+                    line.TranslatedText = ""; // No translation available, keep empty
                 }
                 else
                 {
-                    line.DisplayedText = $"{line.OriginalText}{separator}{translationArr[i]}";
+                    line.TranslatedText = translationArr[i];
                 }
                 i++;
             }
         }
 
-        public void SetDisplayedTextInOriginalText()
-        {
-            foreach (var line in LyricsLines)
-            {
-                line.DisplayedText = line.OriginalText;
-            }
-        }
-
         public LyricsData CreateLyricsDataFrom(string translation)
         {
             var result = new LyricsData(LyricsLines.Select(line => new LyricsLine
@@ -120,8 +150,9 @@ namespace BetterLyrics.WinUI3.Models
                 {
                     StartMs = 0,
                     EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
+                    PhoneticText = "",
                     OriginalText = "● ● ●",
-                    DisplayedText = "● ● ●",
+                    TranslatedText = "",
                     LyricsChars = [],
                 },
             ]);

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

@@ -2,6 +2,7 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
 using Microsoft.Graphics.Canvas.Geometry;
@@ -53,10 +54,23 @@ namespace BetterLyrics.WinUI3.Models
             easingType: EasingType.EaseInOutQuad
         );
 
-        public CanvasTextLayout? CanvasTextLayout { get; private set; }
+        public CanvasTextLayout? OriginalCanvasTextLayout { get; private set; }
+        public CanvasTextLayout? TranslatedCanvasTextLayout { get; private set; }
+        public CanvasTextLayout? PhoneticCanvasTextLayout { get; private set; }
 
         public Vector2 CenterPosition { get; private set; }
-        public Vector2 Position { get; set; }
+        /// <summary>
+        /// 原文位置
+        /// </summary>
+        public Vector2 OriginalPosition { get; set; }
+        /// <summary>
+        /// 译文位置
+        /// </summary>
+        public Vector2 TranslatedPosition { get; set; }
+        /// <summary>
+        /// 注音位置
+        /// </summary>
+        public Vector2 PhoneticPosition { get; set; }
 
         public List<LyricsChar> LyricsChars { get; set; } = [];
 
@@ -64,54 +78,136 @@ namespace BetterLyrics.WinUI3.Models
         public int? EndMs { get; set; }
         public int StartMs { get; set; }
 
-        public string DisplayedText { get; set; } = "";
+        /// <summary>
+        /// 原文
+        /// </summary>
         public string OriginalText { get; set; } = "";
+        /// <summary>
+        /// 译文
+        /// </summary>
+        public string TranslatedText { get; set; } = "";
+        /// <summary>
+        /// 注音
+        /// </summary>
+        public string PhoneticText { get; set; } = "";
 
-        public CanvasGeometry? TextGeometry { get; private set; }
+        public CanvasGeometry? OriginalCanvasGeometry { get; private set; }
+        public CanvasGeometry? TranslatedCanvasGeometry { get; private set; }
+        public CanvasGeometry? PhoneticCanvasGeometry { get; private set; }
 
         public void UpdateCenterPosition(double maxWidth, TextAlignmentType type)
         {
-            if (CanvasTextLayout == null)
+            if (OriginalCanvasTextLayout == null)
             {
                 return;
             }
-            double centerY = Position.Y + (double)CanvasTextLayout.LayoutBounds.Height;
+
+            double centerY = OriginalPosition.Y + (OriginalCanvasTextLayout?.LayoutBounds.Height ?? 0) / 2;
+
             CenterPosition = type switch
             {
-                TextAlignmentType.Left => new Vector2(Position.X, (float)centerY),
-                TextAlignmentType.Center => new Vector2((float)(Position.X + maxWidth / 2.0), (float)centerY),
-                TextAlignmentType.Right => new Vector2((float)(Position.X + maxWidth), (float)centerY),
+                TextAlignmentType.Left => new Vector2(OriginalPosition.X, (float)centerY),
+                TextAlignmentType.Center => new Vector2((float)(OriginalPosition.X + maxWidth / 2.0), (float)centerY),
+                TextAlignmentType.Right => new Vector2((float)(OriginalPosition.X + maxWidth), (float)centerY),
                 _ => throw new System.ArgumentOutOfRangeException(nameof(type), type, null),
             };
         }
 
         public void DisposeTextLayout()
         {
-            CanvasTextLayout?.Dispose();
-            CanvasTextLayout = null;
+            PhoneticCanvasTextLayout?.Dispose();
+            PhoneticCanvasTextLayout = null;
+
+            OriginalCanvasTextLayout?.Dispose();
+            OriginalCanvasTextLayout = null;
+
+            TranslatedCanvasTextLayout?.Dispose();
+            TranslatedCanvasTextLayout = null;
         }
 
-        public void RecreateTextLayout(ICanvasAnimatedControl control, CanvasTextFormat textFormat, double maxWidth, double maxHeight, TextAlignmentType type)
+        public void RecreateTextLayout(
+            ICanvasAnimatedControl control,
+            bool createPhonetic, bool createTranslated,
+            int phoneticTextFontSize, int originalTextFontSize, int translatedTextFontSize,
+            LyricsFontWeight fontWeight,
+            string fontFamilyCJK, string fontFamilyWestern,
+            double maxWidth, double maxHeight, TextAlignmentType type)
         {
             DisposeTextLayout();
-            CanvasTextLayout = new CanvasTextLayout(control, DisplayedText, textFormat, (float)maxWidth, (float)maxHeight);
-            CanvasTextLayout.HorizontalAlignment = type.ToCanvasHorizontalAlignment();
+
+            if (createPhonetic && PhoneticText != "")
+            {
+                PhoneticCanvasTextLayout = new CanvasTextLayout(control, PhoneticText, new CanvasTextFormat
+                {
+                    HorizontalAlignment = CanvasHorizontalAlignment.Left,
+                    VerticalAlignment = CanvasVerticalAlignment.Top,
+                    FontSize = phoneticTextFontSize,
+                    FontWeight = fontWeight.ToFontWeight(),
+                    FontFamily = LanguageHelper.IsCJK(PhoneticText) ? fontFamilyCJK : fontFamilyWestern,
+                }, (float)maxWidth, (float)maxHeight)
+                {
+                    HorizontalAlignment = type.ToCanvasHorizontalAlignment(),
+                };
+            }
+
+            OriginalCanvasTextLayout = new CanvasTextLayout(control, OriginalText, new CanvasTextFormat
+            {
+                HorizontalAlignment = CanvasHorizontalAlignment.Left,
+                VerticalAlignment = CanvasVerticalAlignment.Top,
+                FontSize = originalTextFontSize,
+                FontWeight = fontWeight.ToFontWeight(),
+                FontFamily = LanguageHelper.IsCJK(OriginalText) ? fontFamilyCJK : fontFamilyWestern,
+            }, (float)maxWidth, (float)maxHeight)
+            {
+                HorizontalAlignment = type.ToCanvasHorizontalAlignment()
+            };
+
+            if (createTranslated && TranslatedText != "")
+            {
+                TranslatedCanvasTextLayout = new CanvasTextLayout(control, TranslatedText, new CanvasTextFormat
+                {
+                    HorizontalAlignment = CanvasHorizontalAlignment.Left,
+                    VerticalAlignment = CanvasVerticalAlignment.Top,
+                    FontSize = translatedTextFontSize,
+                    FontWeight = fontWeight.ToFontWeight(),
+                    FontFamily = LanguageHelper.IsCJK(TranslatedText) ? fontFamilyCJK : fontFamilyWestern,
+                }, (float)maxWidth, (float)maxHeight)
+                {
+                    HorizontalAlignment = type.ToCanvasHorizontalAlignment()
+                };
+            }
         }
 
         public void DisposeTextGeometry()
         {
-            TextGeometry?.Dispose();
-            TextGeometry = null;
+            PhoneticCanvasGeometry?.Dispose();
+            PhoneticCanvasGeometry = null;
+
+            OriginalCanvasGeometry?.Dispose();
+            OriginalCanvasGeometry = null;
+
+            TranslatedCanvasGeometry?.Dispose();
+            TranslatedCanvasGeometry = null;
         }
 
         public void RecreateTextGeometry()
         {
             DisposeTextGeometry();
-            if (CanvasTextLayout == null)
+
+            if (PhoneticCanvasTextLayout != null)
             {
-                return;
+                PhoneticCanvasGeometry = CanvasGeometry.CreateText(PhoneticCanvasTextLayout);
+            }
+
+            if (OriginalCanvasTextLayout != null)
+            {
+                OriginalCanvasGeometry = CanvasGeometry.CreateText(OriginalCanvasTextLayout);
+            }
+
+            if (TranslatedCanvasTextLayout != null)
+            {
+                TranslatedCanvasGeometry = CanvasGeometry.CreateText(TranslatedCanvasTextLayout);
             }
-            TextGeometry = CanvasGeometry.CreateText(CanvasTextLayout);
         }
     }
 }

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

@@ -47,26 +47,6 @@ namespace BetterLyrics.WinUI3.Models
             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;
@@ -111,12 +91,6 @@ namespace BetterLyrics.WinUI3.Models
             this.OnPropertyChanged(nameof(AlbumArtLayoutSettings));
         }
 
-        partial void OnWindowBoundsChanged(Rect value)
-        {
-            UpdateMonitorNameAndBounds();
-            UpdateDemoWindowAndMonitorBounds();
-        }
-
         partial void OnAutoShowOrHideWindowChanged(bool value)
         {
             WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
@@ -137,6 +111,17 @@ namespace BetterLyrics.WinUI3.Models
             );
         }
 
+        public void UpdateMonitorBounds()
+        {
+            var mointor = MonitorHelper.GetMonitorInfoExFromDeviceName(MonitorDeviceName);
+            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(
@@ -181,6 +166,10 @@ namespace BetterLyrics.WinUI3.Models
                 EnvironmentSampleMode = this.EnvironmentSampleMode,
                 AutoShowOrHideWindow = this.AutoShowOrHideWindow,
                 TitleBarArea = this.TitleBarArea,
+                WindowX = this.WindowX,
+                WindowY = this.WindowY,
+                WindowWidth = this.WindowWidth,
+                WindowHeight = this.WindowHeight,
             };
         }
     }
@@ -203,7 +192,7 @@ namespace BetterLyrics.WinUI3.Models
                 EnvironmentSampleMode = WindowPixelSampleMode.WindowEdge,
                 LyricsStyleSettings = new()
                 {
-                    LyricsFontSize = 20,
+                    OriginalLyricsFontSize = 20,
                     LyricsAlignmentType = TextAlignmentType.Center,
                 },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
@@ -230,7 +219,7 @@ namespace BetterLyrics.WinUI3.Models
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
                     LyricsAlignmentType = TextAlignmentType.Center,
-                    LyricsFontSize = 18,
+                    OriginalLyricsFontSize = 18,
                 },
                 LyricsBackgroundSettings = new LyricsBackgroundSettings
                 {
@@ -253,7 +242,7 @@ namespace BetterLyrics.WinUI3.Models
                 LyricsLayoutOrientation = Enums.LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
-                    LyricsFontSize = 72,
+                    OriginalLyricsFontSize = 72,
                     LyricsAlignmentType = Enums.TextAlignmentType.Center,
                 },
                 AlbumArtLayoutSettings = new AlbumArtLayoutSettings

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

@@ -1,16 +1,19 @@
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.Models.Settings
 {
     public partial class GeneralSettings : ObservableRecipient
     {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial Language Language { get; set; } = Language.FollowSystem;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LanguageCode { get; set; } = "";
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LXMusicServer { get; set; } = string.Empty;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial List<string> ShowOrHideLyricsWindowShortcut { get; set; } = new List<string> { "Ctrl", "Alt", "H" };
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool ExitOnLyricsWindowClosed { get; set; } = false;

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

@@ -29,6 +29,9 @@ namespace BetterLyrics.WinUI3.Models.Settings
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsSpectrumOverlayEnabled { get; set; } = false;
 
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsSnowFlakeOverlayEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int SnowFlakeOverlayAmount { get; set; } = 50;
+
 
         public LyricsBackgroundSettings() { }
 

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

@@ -22,11 +22,11 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LineRenderingType LyricsShadowScope { get; set; } = LineRenderingType.LineStartToCurrentChar;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsShadowAmount { get; set; } = 8;
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LineRenderingType LyricsHighlightScope { get; set; } = LineRenderingType.LineStartToCurrentChar;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsHighlightAmount { get; set; } = 100; // 100% 是上界
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial LineRenderingType OriginalLyricsHighlightScope { get; set; } = LineRenderingType.LineStartToCurrentChar;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PhoneticLyricsHighlightAmount { get; set; } = 60; // 100% 是上界
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsHighlightAmount { get; set; } = 100; // 100% 是上界
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsHighlightAmount { get; set; } = 60; // 100% 是上界
         
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsTranslationHighlightAmount { get; set; } = 60; // 100% 是上界
-
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFloatAnimationEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFloatAmount { get; set; } = 1;
 
@@ -38,7 +38,15 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsScrollBottomDelay { get; set; } = 0;
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsVerticalEdgeOpacity { get; set; } = 0; // 0% opacity
+
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsFanLyricsEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int FanLyricsAngle { get; set; } = 30;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool Is3DLyricsEnabled { get; set; } = false;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int Lyrics3DXAngle { get; set; } = 30;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int Lyrics3DYAngle { get; set; } = 0;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int Lyrics3DZAngle { get; set; } = 0;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int Lyrics3DDepth { get; set; } = 1000;
 
         public LyricsEffectSettings(int lyricsScrollTopDuration, int lyricsScrollDuration, int lyricsScrollBottomDuration, EasingType lyricsScrollEasingType)
         {
@@ -60,15 +68,17 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 IsLyricsShadowEnabled = this.IsLyricsShadowEnabled,
                 LyricsShadowScope = this.LyricsShadowScope,
                 LyricsShadowAmount = this.LyricsShadowAmount,
-                LyricsHighlightScope = this.LyricsHighlightScope,
-                LyricsHighlightAmount = this.LyricsHighlightAmount,
-                LyricsTranslationHighlightAmount = this.LyricsTranslationHighlightAmount,
+                OriginalLyricsHighlightScope = this.OriginalLyricsHighlightScope,
+                PhoneticLyricsHighlightAmount = this.PhoneticLyricsHighlightAmount,
+                OriginalLyricsHighlightAmount = this.OriginalLyricsHighlightAmount,
+                TranslatedLyricsHighlightAmount = this.TranslatedLyricsHighlightAmount,
                 IsLyricsFloatAnimationEnabled = this.IsLyricsFloatAnimationEnabled,
                 LyricsFloatAmount = this.LyricsFloatAmount,
                 LyricsScrollTopDelay = this.LyricsScrollTopDelay,
                 LyricsScrollBottomDelay = this.LyricsScrollBottomDelay,
                 LyricsVerticalEdgeOpacity = this.LyricsVerticalEdgeOpacity,
-                IsFanLyricsEnabled = this.IsFanLyricsEnabled
+                IsFanLyricsEnabled = this.IsFanLyricsEnabled,
+                FanLyricsAngle = this.FanLyricsAngle,
             };
         }
     }

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

@@ -14,7 +14,9 @@ namespace BetterLyrics.WinUI3.Models.Settings
     public partial class LyricsStyleSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsDynamicLyricsFontSize { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int LyricsFontSize { get; set; } = 24;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int PhoneticLyricsFontSize { get; set; } = 12;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int OriginalLyricsFontSize { get; set; } = 24;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial int TranslatedLyricsFontSize { get; set; } = 12;
         [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; } = 0;
@@ -27,23 +29,19 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsFontWeight LyricsFontWeight { get; set; } = LyricsFontWeight.Bold;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial double LyricsLineSpacingFactor { get; set; } = 0.5;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsTranslationSeparator { get; set; } = StringHelper.NewLine;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsCJKFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string LyricsWesternFontFamily { get; set; } = FontHelper.SystemFontFamilies.FirstOrDefault() ?? "";
 
         public LyricsStyleSettings() { }
 
-        public LyricsStyleSettings(int lyricsFontSize, TextAlignmentType lyricsAlignmentType, int lyricsFontStrokeWidth)
-        {
-            LyricsFontSize = lyricsFontSize;
-            LyricsAlignmentType = lyricsAlignmentType;
-            LyricsFontStrokeWidth = lyricsFontStrokeWidth;
-        }
-
         public object Clone()
         {
             return new LyricsStyleSettings
             {
                 IsDynamicLyricsFontSize = this.IsDynamicLyricsFontSize,
-                LyricsFontSize = this.LyricsFontSize,
+                PhoneticLyricsFontSize = this.PhoneticLyricsFontSize,
+                OriginalLyricsFontSize = this.OriginalLyricsFontSize,
+                TranslatedLyricsFontSize = this.TranslatedLyricsFontSize,
                 LyricsAlignmentType = this.LyricsAlignmentType,
                 LyricsBgFontOpacity = this.LyricsBgFontOpacity,
                 LyricsFontStrokeWidth = this.LyricsFontStrokeWidth,
@@ -56,7 +54,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
                 LyricsFontWeight = this.LyricsFontWeight,
                 LyricsLineSpacingFactor = this.LyricsLineSpacingFactor,
                 LyricsTranslationSeparator = this.LyricsTranslationSeparator,
-                LyricsFontFamily = this.LyricsFontFamily
+                LyricsCJKFontFamily = this.LyricsCJKFontFamily,
+                LyricsWesternFontFamily = this.LyricsWesternFontFamily,
             };
         }
     }

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

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services;
+using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
@@ -14,8 +14,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLibreTranslateEnabled { get; set; } = false;
         [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 string SelectedTargetLanguageCode { get; set; } = LanguageHelper.GetDefaultTargetLanguageCode();
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string SelectedTargetLanguageCode { get; set; } = LanguageHelper.GetDefaultTargetTranslationLanguageCode();
         [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;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongsTabInfo.cs

@@ -32,4 +32,4 @@ namespace BetterLyrics.WinUI3.Models
             FilterValue = filterValue;
         }
     }
-}
+}

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

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

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

@@ -35,10 +35,5 @@ 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/LiveStatesService.cs

@@ -4,7 +4,10 @@ using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.WinUI.Controls;
+using System;
 using System.Linq;
+using System.Threading.Tasks;
+using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.Services.LiveStatesService
 {
@@ -30,24 +33,29 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
             }
         }
 
-        private void LyricsWindowStatus_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        private async void LyricsWindowStatus_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
+            LiveStates.IsLyricsWindowStatusRefreshing = true;
+
             switch (e.PropertyName)
             {
                 case nameof(LyricsWindowStatus.IsWorkArea):
                     WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
                     if (LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
-                        UpdateWindowBoundsWhenWorkArea();
+                        await Task.Delay(300);
+                        WindowHelper.MoveAndResize<LyricsWindow>(GetWindowBoundsWhenWorkArea());
                     }
                     break;
                 case nameof(LyricsWindowStatus.DockHeight):
                 case nameof(LyricsWindowStatus.DockPlacement):
                 case nameof(LyricsWindowStatus.MonitorDeviceName):
-                    WindowHelper.UpdateWorkArea<LyricsWindow>();
+                    LiveStates.LyricsWindowStatus.UpdateMonitorBounds();
                     if (LiveStates.LyricsWindowStatus.IsWorkArea)
                     {
-                        UpdateWindowBoundsWhenWorkArea();
+                        WindowHelper.UpdateWorkArea<LyricsWindow>();
+                        await Task.Delay(300);
+                        WindowHelper.MoveAndResize<LyricsWindow>(GetWindowBoundsWhenWorkArea());
                     }
                     break;
                 case nameof(LyricsWindowStatus.IsShownInSwitchers):
@@ -62,8 +70,25 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                 case nameof(LyricsWindowStatus.IsBorderless):
                     WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
                     break;
+                case nameof(LyricsWindowStatus.WindowX):
+                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithX(LiveStates.LyricsWindowStatus.WindowX));
+                    break;
+                case nameof(LyricsWindowStatus.WindowY):
+                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithY(LiveStates.LyricsWindowStatus.WindowY));
+                    break;
+                case nameof(LyricsWindowStatus.WindowWidth):
+                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithWidth(LiveStates.LyricsWindowStatus.WindowWidth));
+                    break;
+                case nameof(LyricsWindowStatus.WindowHeight):
+                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds.WithHeight(LiveStates.LyricsWindowStatus.WindowHeight));
+                    break;
                 case nameof(LyricsWindowStatus.WindowBounds):
-                    WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+                    LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
+                    LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
+                    LiveStates.LyricsWindowStatus.WindowX = LiveStates.LyricsWindowStatus.WindowBounds.X;
+                    LiveStates.LyricsWindowStatus.WindowY = LiveStates.LyricsWindowStatus.WindowBounds.Y;
+                    LiveStates.LyricsWindowStatus.WindowWidth = LiveStates.LyricsWindowStatus.WindowBounds.Width;
+                    LiveStates.LyricsWindowStatus.WindowHeight = LiveStates.LyricsWindowStatus.WindowBounds.Height;
                     break;
                 case nameof(LyricsWindowStatus.TitleBarArea):
                     WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
@@ -71,6 +96,8 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
                 default:
                     break;
             }
+
+            LiveStates.IsLyricsWindowStatusRefreshing = true;
         }
 
         private void LiveStates_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -94,18 +121,14 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
             LiveStates.LyricsWindowStatus = defaultLyricsWindowStatus;
         }
 
-        public void RefreshLyricsWindowStatus()
+        public async void RefreshLyricsWindowStatus()
         {
+            LiveStates.IsLyricsWindowStatusRefreshing = true;
+
+            LiveStates.LyricsWindowStatus.UpdateMonitorBounds();
+
             WindowHelper.SetIsWorkArea<LyricsWindow>(LiveStates.LyricsWindowStatus.IsWorkArea);
-
-            if (LiveStates.LyricsWindowStatus.IsWorkArea)
-            {
-                UpdateWindowBoundsWhenWorkArea();
-            }
-
-            WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
-            LiveStates.LyricsWindowStatus.UpdateMonitorNameAndBounds();
-            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
+            await Task.Delay(300);
 
             WindowHelper.SetIsShowInSwitchers<LyricsWindow>(LiveStates.LyricsWindowStatus.IsShownInSwitchers);
             WindowHelper.SetIsAlwaysOnTop<LyricsWindow>(LiveStates.LyricsWindowStatus.IsAlwaysOnTop);
@@ -113,11 +136,22 @@ namespace BetterLyrics.WinUI3.Services.LiveStatesService
             WindowHelper.SetIsBorderless<LyricsWindow>(LiveStates.LyricsWindowStatus.IsBorderless);
             WindowHelper.SetLyricsWindowVisibilityByPlayingStatus();
             WindowHelper.SetTitleBarArea<LyricsWindow>(LiveStates.LyricsWindowStatus.TitleBarArea);
+
+            if (LiveStates.LyricsWindowStatus.IsWorkArea)
+            {
+                LiveStates.LyricsWindowStatus.WindowBounds = GetWindowBoundsWhenWorkArea();
+            }
+
+            WindowHelper.MoveAndResize<LyricsWindow>(LiveStates.LyricsWindowStatus.WindowBounds);
+
+            LiveStates.LyricsWindowStatus.UpdateDemoWindowAndMonitorBounds();
+
+            LiveStates.IsLyricsWindowStatusRefreshing = false;
         }
 
-        private void UpdateWindowBoundsWhenWorkArea()
+        private Rect GetWindowBoundsWhenWorkArea()
         {
-            LiveStates.LyricsWindowStatus.WindowBounds = new Windows.Foundation.Rect(
+            return new Rect(
                 LiveStates.LyricsWindowStatus.MonitorBounds.X,
                 LiveStates.LyricsWindowStatus.DockPlacement switch
                 {

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

@@ -7,6 +7,7 @@ using BetterLyrics.WinUI3.Helper.BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Lyricify.Lyrics.Helpers;
 using Lyricify.Lyrics.Providers.Web.Kugou;
 using Lyricify.Lyrics.Searchers;
 using Microsoft.Extensions.Logging;
@@ -436,11 +437,11 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             return lyricsSearchResult;
         }
 
-        private static async Task<LyricsSearchResult> SearchQQNeteaseKugouAsync(string title, string artist, string album, int durationMs, string? songId, Searchers searchers)
+        private static async Task<LyricsSearchResult> SearchQQNeteaseKugouAsync(string title, string artist, string album, int durationMs, string? songId, Searchers searcher)
         {
             var lyricsSearchResult = new LyricsSearchResult();
 
-            switch (searchers)
+            switch (searcher)
             {
                 case Searchers.QQMusic:
                     lyricsSearchResult.Provider = LyricsSearchProvider.QQ;
@@ -458,21 +459,20 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             }
 
             ISearchResult? result;
-            if (searchers == Searchers.Netease && songId != null)
+            if (searcher == 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,
-                    }
-                );
+                result = await SearchHelper.Search(new Lyricify.Lyrics.Models.TrackMultiArtistMetadata()
+                {
+                    DurationMs = durationMs,
+                    Album = album,
+                    AlbumArtists = [artist],
+                    Artists = [artist],
+                    Title = title,
+                }, searcher);
             }
 
             if (result is QQMusicSearchResult qqResult)
@@ -519,21 +519,36 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             {
                 var response = await Lyricify.Lyrics.Helpers.ProviderHelper.KugouApi.GetSearchLyrics(hash: kugouResult.Hash);
                 string? original = null;
-                if (response?.Candidates.FirstOrDefault() is SearchLyricsResponse.Candidate candidate)
+                var candidate = response?.Candidates.FirstOrDefault();
+                if (candidate != null)
                 {
                     original = await Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyricsAsync(candidate.Id, candidate.AccessKey);
-                    if (candidate.TransId != null)
+                    if (original != null)
                     {
-                        string? translated = await Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyricsAsync(candidate.TransId, candidate.AccessKey);
-                        if (!string.IsNullOrEmpty(translated))
+                        var parsedList = Lyricify.Lyrics.Parsers.KrcParser.ParseLyrics(original);
+                        if (parsedList != null)
                         {
-                            FileHelper.WriteLyricsCache(
-                                title,
-                                artist,
-                                translated,
-                                LyricsFormat.Lrc,
-                                PathHelper.KugouTranslationCacheDirectory
-                            );
+                            string translated = "";
+                            foreach (var item in parsedList)
+                            {
+                                if (item is Lyricify.Lyrics.Models.FullSyllableLineInfo fullSyllableLineInfo)
+                                {
+                                    var startTimeSpan = TimeSpan.FromMilliseconds(fullSyllableLineInfo.StartTime ?? 0);
+                                    string startTimeStr = startTimeSpan.ToString(@"mm\:ss\.ff");
+                                    string chTranslation = fullSyllableLineInfo.Translations.GetValueOrDefault("zh") ?? "";
+                                    translated += $"[{startTimeStr}]{chTranslation}\n";
+                                }
+                            }
+                            if (!string.IsNullOrEmpty(translated))
+                            {
+                                FileHelper.WriteLyricsCache(
+                                    title,
+                                    artist,
+                                    translated,
+                                    LyricsFormat.Lrc,
+                                    PathHelper.KugouTranslationCacheDirectory
+                                );
+                            }
                         }
                     }
                 }

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

@@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Lyricify.Lyrics.Helpers.General;
 using Microsoft.Extensions.Logging;
+using Microsoft.UI.Dispatching;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -36,27 +37,31 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private async Task RefreshTranslationAsync(CancellationToken token)
         {
             TranslationSearchProvider = null;
-            _lyricsDataArr.ElementAtOrDefault(0)?.SetDisplayedTextInOriginalText();
-            LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            _lyricsDataArr.ElementAtOrDefault(0)?.ClearTranslatedText();
+
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            });
+
             IsTranslating = true;
 
-            if (_settingsService.AppSettings.TranslationSettings.IsTranslationEnabled)
-            {
-                await SetDisplayedAlongWithTranslationsAsync(token);
-                if (token.IsCancellationRequested) return;
-            }
-            else
-            {
-                _logger.LogInformation("Translation is disabled, showing original lyrics only.");
-                _lyricsDataArr.ElementAtOrDefault(0)?.SetDisplayedTextInOriginalText();
-                _langIndex = 0;
-            }
+            await SetPhoneticTextAsync(token);
+            await SetTranslatedTextAsync(token);
+            if (token.IsCancellationRequested) return;
+
             IsTranslating = false;
-            LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            });
         }
 
-        private async Task SetDisplayedAlongWithTranslationsAsync(CancellationToken token)
+        private async Task SetTranslatedTextAsync(CancellationToken token)
         {
+            if (!_settingsService.AppSettings.TranslationSettings.IsTranslationEnabled) return;
+
             _logger.LogInformation("Showing translation for lyrics...");
             string targetLangCode = _settingsService.AppSettings.TranslationSettings.SelectedTargetLanguageCode;
             _logger.LogInformation("Target language code: {TargetLangCode}", targetLangCode);
@@ -66,30 +71,11 @@ 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);
 
-                _lyricsDataArr[0].SetDisplayedTextInOriginalText();
+                _lyricsDataArr[0].ClearTranslatedText();
             }
             else
             {
@@ -98,17 +84,9 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 if (found >= 0)
                 {
                     _logger.LogInformation("Found translation in lyrics data at index {FoundIndex}", found);
-                    if (_settingsService.AppSettings.TranslationSettings.ShowTranslationOnly)
-                    {
-                        _lyricsDataArr[found].SetDisplayedTextInOriginalText();
-                        _langIndex = found;
-                    }
-                    else
-                    {
-                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator, 50);
-                        _langIndex = 0;
-                        TranslationSearchProvider = LyricsSearchProvider.ToTranslationSearchProvider();
-                    }
+
+                    _lyricsDataArr[0].SetTranslatedText(_lyricsDataArr[found], _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator, 50);
+                    TranslationSearchProvider = LyricsSearchProvider.ToTranslationSearchProvider();
                 }
                 else if (_settingsService.AppSettings.TranslationSettings.IsLibreTranslateEnabled)
                 {
@@ -120,17 +98,8 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                         if (token.IsCancellationRequested) return;
                         if (translated == string.Empty) return;
 
-                        if (_settingsService.AppSettings.TranslationSettings.ShowTranslationOnly)
-                        {
-                            _lyricsDataArr[^1] = _lyricsDataArr[0].CreateLyricsDataFrom(translated);
-                            _lyricsDataArr[^1].SetDisplayedTextInOriginalText();
-                            _langIndex = _lyricsDataArr.Count - 1;
-                        }
-                        else
-                        {
-                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator);
-                            _langIndex = 0;
-                        }
+                        _lyricsDataArr[0].SetTranslation(translated, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator);
+
                         TranslationSearchProvider = Enums.TranslationSearchProvider.LibreTranslate;
                     }
                     catch (Exception)
@@ -141,6 +110,41 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             }
         }
 
+        private async Task SetPhoneticTextAsync(CancellationToken token)
+        {
+            _logger.LogInformation("Showing phonetic text for lyrics...");
+            string targetPhoneticCode = "";
+            _logger.LogInformation("Target phonetic code: {TargetPhonetic}", targetPhoneticCode);
+            string? originalText = _lyricsDataArr.FirstOrDefault()?.WrappedOriginalText;
+            if (originalText == null) return;
+
+            string? originalLangCode = LanguageHelper.DetectLanguageCode(originalText);
+            _logger.LogInformation("Original language code: {OriginalLangCode}", originalLangCode ?? "null");
+
+            if (originalLangCode == "zh" && _settingsService.AppSettings.TranslationSettings.IsChineseRomanizationEnabled)
+            {
+                targetPhoneticCode = _settingsService.AppSettings.TranslationSettings.ChineseRomanization.ToPhoneticCode();
+            }
+            else if (originalLangCode == "ja" && _settingsService.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled)
+            {
+                targetPhoneticCode = PhoneticHelper.RomajiCode;
+            }
+
+            if (targetPhoneticCode == "")
+            {
+                _lyricsDataArr[0].ClearPhoneticText();
+            }
+
+            // Try get phonetic text from itself
+            int found = _translateService.SearchTranslatedLyricsItself(_lyricsDataArr, targetPhoneticCode);
+            if (found >= 0)
+            {
+                _logger.LogInformation("Found translation in lyrics data at index {FoundIndex}", found);
+                _lyricsDataArr[0].SetPhoneticText(_lyricsDataArr[found], _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsTranslationSeparator, 50);
+            }
+
+        }
+
         private async Task RefreshLyricsAsync(CancellationToken token)
         {
             _logger.LogInformation("Refreshing lyrics...");
@@ -148,7 +152,10 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             LyricsSearchProvider = null;
             _lyricsDataArr = [LyricsData.GetLoadingPlaceholder()];
 
-            LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            });
 
             if (SongInfo != null)
             {
@@ -169,9 +176,10 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
                 _logger.LogInformation("Lyrics was found? {Found}, Provider: {LyricsSearchProvider}", lyricsSearchResult?.IsFound, LyricsSearchProvider?.ToString() ?? "null");
 
-                _lyricsDataArr = new LyricsParser().Parse(lyricsSearchResult?.Raw, (int?)SongInfo?.DurationMs);
+                var lyricsParser = new LyricsParser();
+                lyricsParser.Parse(SongInfo.Title, SongInfo.Artist, lyricsSearchResult?.Raw, (int?)SongInfo?.DurationMs, LyricsSearchProvider);
+                _lyricsDataArr = lyricsParser.LyricsDataArr;
                 ApplyChinesePreference();
-                FillTranslationFromCache(LyricsSearchProvider);
             }
             else
             {
@@ -180,10 +188,14 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
 
             _logger.LogInformation("Parsed lyrics: {MultiLangLyricsCount} languages", _lyricsDataArr.Count);
 
-            // This ensures that original lyrics are always shown while waiting for translations
-            _lyricsDataArr[0].SetDisplayedTextInOriginalText();
-            LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            // Show original first while loading phonetic and translated
             ApplyChinesePreference();
+
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                LyricsChanged?.Invoke(this, new LyricsChangedEventArgs(CurrentLyricsData));
+            });
+
             UpdateTranslations();
         }
 
@@ -195,61 +207,11 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             {
                 foreach (var item in _lyricsDataArr[found].LyricsLines)
                 {
-                    item.OriginalText = traditionalChinesePreferred ? ChineseHelper.S2T(item.OriginalText) : ChineseHelper.T2S(item.OriginalText);
+                    item.OriginalText = traditionalChinesePreferred ? ChineseHelper.ToTC(item.OriginalText) : ChineseHelper.ToSC(item.OriginalText);
                 }
             }
         }
 
-        private void FillTranslationFromCache(LyricsSearchProvider? provider)
-        {
-            string? translationRaw = null;
-            switch (provider)
-            {
-                case Enums.LyricsSearchProvider.QQ:
-                    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);
-                    break;
-                case Enums.LyricsSearchProvider.LrcLib:
-                    break;
-                case Enums.LyricsSearchProvider.AmllTtmlDb:
-                    break;
-                case Enums.LyricsSearchProvider.LocalMusicFile:
-                    break;
-                case Enums.LyricsSearchProvider.LocalLrcFile:
-                    break;
-                case Enums.LyricsSearchProvider.LocalEslrcFile:
-                    break;
-                case Enums.LyricsSearchProvider.LocalTtmlFile:
-                    break;
-                default:
-                    break;
-            }
-            if (translationRaw != null)
-            {
-                var translationData = new LyricsParser().Parse(translationRaw, (int?)SongInfo?.DurationMs);
-                if (provider == Enums.LyricsSearchProvider.QQ)
-                {
-                    foreach (var data in translationData)
-                    {
-                        foreach (var item in data.LyricsLines)
-                        {
-                            if (item.OriginalText == "//")
-                            {
-                                item.OriginalText = "";
-                            }
-                        }
-                    }
-                }
-
-                _lyricsDataArr = _lyricsDataArr.Concat(translationData).ToList();
-            }
-        }
-
         public void UpdateLyrics()
         {
             _refreshLyricsRunner.RunAsync(RefreshLyricsAsync);

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

@@ -607,10 +607,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                 {
                     UpdateTranslations();
                 }
-                else if (message.PropertyName == nameof(TranslationSettings.ShowTranslationOnly))
-                {
-                    UpdateTranslations();
-                }
                 else if (message.PropertyName == nameof(TranslationSettings.IsChineseRomanizationEnabled))
                 {
                     UpdateTranslations();

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

@@ -105,30 +105,8 @@ namespace BetterLyrics.WinUI3.Services.SettingsService
         {
             switch (e.PropertyName)
             {
-                case nameof(GeneralSettings.Language):
-                    switch (AppSettings.GeneralSettings.Language)
-                    {
-                        case Enums.Language.FollowSystem:
-                            ApplicationLanguages.PrimaryLanguageOverride = "";
-                            break;
-                        case Enums.Language.English:
-                            ApplicationLanguages.PrimaryLanguageOverride = "en-US";
-                            break;
-                        case Enums.Language.SimplifiedChinese:
-                            ApplicationLanguages.PrimaryLanguageOverride = "zh-CN";
-                            break;
-                        case Enums.Language.TraditionalChinese:
-                            ApplicationLanguages.PrimaryLanguageOverride = "zh-TW";
-                            break;
-                        case Enums.Language.Japanese:
-                            ApplicationLanguages.PrimaryLanguageOverride = "ja-JP";
-                            break;
-                        case Enums.Language.Korean:
-                            ApplicationLanguages.PrimaryLanguageOverride = "ko-KR";
-                            break;
-                        default:
-                            break;
-                    }
+                case nameof(GeneralSettings.LanguageCode):
+                    ApplicationLanguages.PrimaryLanguageOverride = AppSettings.GeneralSettings.LanguageCode;
                     break;
                 default:
                     break;

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

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ActionCompleted" xml:space="preserve">
+    <value>Operation completed</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>Local music files</value>
   </data>
@@ -177,6 +180,9 @@
   <data name="ImportSettingsFailed" xml:space="preserve">
     <value>Settings file import failed, application settings remain unchanged</value>
   </data>
+  <data name="Jyutping" xml:space="preserve">
+    <value>Cantonese pinyin</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>Authorization failed, please try again</value>
   </data>
@@ -448,6 +454,12 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="PictureInPictureMode" xml:space="preserve">
     <value>Picture-in-picture mode</value>
   </data>
+  <data name="Pinyin" xml:space="preserve">
+    <value>Mandarin pinyin</value>
+  </data>
+  <data name="Romaji" xml:space="preserve">
+    <value>Romaji</value>
+  </data>
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>Contributors</value>
   </data>
@@ -457,9 +469,18 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SetingsPageFeedback.Text" xml:space="preserve">
     <value>Feedback</value>
   </data>
+  <data name="SetingsPageInstructions.Text" xml:space="preserve">
+    <value>Instructions</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="SettingsPage3DLyrics.Header" xml:space="preserve">
+    <value>3D lyrics</value>
+  </data>
+  <data name="SettingsPage3DLyricsDepth.Header" xml:space="preserve">
+    <value>Depth</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>About</value>
   </data>
@@ -562,9 +583,18 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageChinese.Header" xml:space="preserve">
     <value>Chinese pronunciation</value>
   </data>
+  <data name="SettingsPageChineseLyrics.Text" xml:space="preserve">
+    <value>Chinese lyrics</value>
+  </data>
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>Convert Chinese to Traditional Chinese</value>
   </data>
+  <data name="SettingsPageCJK.Header" xml:space="preserve">
+    <value>CJK Unified Ideograph</value>
+  </data>
+  <data name="SettingsPageClearCache.Content" xml:space="preserve">
+    <value>Clear cache files</value>
+  </data>
   <data name="SettingsPageClickThrough.Header" xml:space="preserve">
     <value>Click-through</value>
   </data>
@@ -712,6 +742,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>Follow system</value>
   </data>
+  <data name="SettingsPageFontColor.Header" xml:space="preserve">
+    <value>Font color</value>
+  </data>
   <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
     <value>Keep the lyrics window on top by polling</value>
   </data>
@@ -808,9 +841,6 @@ 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.Text" xml:space="preserve">
-    <value>Lyrics style and effect</value>
-  </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
     <value>Alignment</value>
   </data>
@@ -818,7 +848,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
     <value>Lyrics background</value>
   </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
-    <value>Font color (Non-current playback area)</value>
+    <value>Non-current playback area</value>
   </data>
   <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
     <value>Font opacity (Non-current playback area)</value>
@@ -854,7 +884,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
     <value>Extra Light</value>
   </data>
   <data name="SettingsPageLyricsFgFontColor.Header" xml:space="preserve">
-    <value>Font color (Current playback area)</value>
+    <value>Current playback area</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveColored.Content" xml:space="preserve">
     <value>Adaptive to lyrics background (Colored)</value>
@@ -892,6 +922,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>Glow effect</value>
   </data>
+  <data name="SettingsPageLyricsHighlight.Header" xml:space="preserve">
+    <value>Highlight</value>
+  </data>
   <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
     <value>Original highlight range</value>
   </data>
@@ -940,9 +973,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageLyricsShadow.Header" xml:space="preserve">
     <value>Shadows</value>
   </data>
-  <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>Lyrics stroke color</value>
-  </data>
   <data name="SettingsPageLyricsStyle.Text" xml:space="preserve">
     <value>Lyrics style</value>
   </data>
@@ -1021,6 +1051,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>Open in file explorer</value>
   </data>
+  <data name="SettingsPageOriginalText.Header" xml:space="preserve">
+    <value>Original text</value>
+  </data>
   <data name="SettingsPagePaletteGeneratorType.Header" xml:space="preserve">
     <value>Color picker style</value>
   </data>
@@ -1036,6 +1069,12 @@ 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="SettingsPagePhonetic.Text" xml:space="preserve">
+    <value>Lyric annotation</value>
+  </data>
+  <data name="SettingsPagePhoneticText.Header" xml:space="preserve">
+    <value>Phonetic symbols</value>
+  </data>
   <data name="SettingsPagePinyin.Content" xml:space="preserve">
     <value>Pinyin of Mandarin</value>
   </data>
@@ -1111,6 +1150,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
     <value>The duration of the first line</value>
   </data>
+  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
+    <value>Server address</value>
+  </data>
   <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
     <value>Test server</value>
   </data>
@@ -1150,6 +1192,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>Current value: </value>
   </data>
+  <data name="SettingsPageSnowFlakeLayer.Header" xml:space="preserve">
+    <value>Snow flake layer</value>
+  </data>
   <data name="SettingsPageSongInfo.Text" xml:space="preserve">
     <value>Song title &amp; artist</value>
   </data>
@@ -1174,7 +1219,10 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>Standard mode</value>
   </data>
-  <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
+  <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
+    <value>Stroke color</value>
+  </data>
+  <data name="SettingsPageSystemLanguage" xml:space="preserve">
     <value>Default</value>
   </data>
   <data name="SettingsPageTargetLanguage.Header" xml:space="preserve">
@@ -1207,6 +1255,9 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageToggleHotKey.Header" xml:space="preserve">
     <value>Switch in and cut out shortcut keys</value>
   </data>
+  <data name="SettingsPageTranslatedText.Header" xml:space="preserve">
+    <value>Translated text</value>
+  </data>
   <data name="SettingsPageTranslation.Text" xml:space="preserve">
     <value>Lyrics translation</value>
   </data>
@@ -1222,6 +1273,9 @@ 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="SettingsPageWesternChar.Header" xml:space="preserve">
+    <value>Latin alphabet</value>
+  </data>
   <data name="SettingsPageWidth.Header" xml:space="preserve">
     <value>Width</value>
   </data>
@@ -1256,7 +1310,7 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
     <value>Reset window position</value>
   </data>
   <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>Resart</value>
+    <value>Restart</value>
   </data>
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>Settings</value>

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

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ActionCompleted" xml:space="preserve">
+    <value>操作が完了しました</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>ローカル音楽ファイル</value>
   </data>
@@ -177,6 +180,9 @@
   <data name="ImportSettingsFailed" xml:space="preserve">
     <value>設定ファイルのインポートに失敗し、アプリケーション設定は変更されません</value>
   </data>
+  <data name="Jyutping" xml:space="preserve">
+    <value>広東語のピンイン</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>承認が失敗しました、もう一度やり直してください</value>
   </data>
@@ -448,6 +454,12 @@
   <data name="PictureInPictureMode" xml:space="preserve">
     <value>ピクチャーインピクチャーモード</value>
   </data>
+  <data name="Pinyin" xml:space="preserve">
+    <value>マンダリンのピンイン</value>
+  </data>
+  <data name="Romaji" xml:space="preserve">
+    <value>ローマン</value>
+  </data>
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>投稿者</value>
   </data>
@@ -457,9 +469,18 @@
   <data name="SetingsPageFeedback.Text" xml:space="preserve">
     <value>フィードバック</value>
   </data>
+  <data name="SetingsPageInstructions.Text" xml:space="preserve">
+    <value>手順</value>
+  </data>
   <data name="SetingsPageThanks.Text" xml:space="preserve">
     <value>このプロジェクトが気に入っている場合は、寄付してサポートすることを検討してください。あなたのサポートは、プロジェクトを生かし続け、さらなる開発を促進するのに役立ちます。</value>
   </data>
+  <data name="SettingsPage3DLyrics.Header" xml:space="preserve">
+    <value>3 D 歌詞</value>
+  </data>
+  <data name="SettingsPage3DLyricsDepth.Header" xml:space="preserve">
+    <value>深度</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>について</value>
   </data>
@@ -562,9 +583,18 @@
   <data name="SettingsPageChinese.Header" xml:space="preserve">
     <value>中国の発音</value>
   </data>
+  <data name="SettingsPageChineseLyrics.Text" xml:space="preserve">
+    <value>中国語の歌詞</value>
+  </data>
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>中国人を伝統的な中国人に変換します</value>
   </data>
+  <data name="SettingsPageCJK.Header" xml:space="preserve">
+    <value>CJK統一漢字</value>
+  </data>
+  <data name="SettingsPageClearCache.Content" xml:space="preserve">
+    <value>キャッシュファイルをクリア</value>
+  </data>
   <data name="SettingsPageClickThrough.Header" xml:space="preserve">
     <value>クリックスルー</value>
   </data>
@@ -712,6 +742,9 @@
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>システムをフォローします</value>
   </data>
+  <data name="SettingsPageFontColor.Header" xml:space="preserve">
+    <value>フォントの色</value>
+  </data>
   <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
     <value>ポーリングで歌詞ウィンドウを一番上に保ちましょう</value>
   </data>
@@ -808,9 +841,6 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX Music Server</value>
   </data>
-  <data name="SettingsPageLyrics.Text" xml:space="preserve">
-    <value>歌詞のスタイルと効果</value>
-  </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
     <value>アライメント</value>
   </data>
@@ -818,7 +848,7 @@
     <value>歌詞の背景</value>
   </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
-    <value>フォントカラー（非電流再生エリア）</value>
+    <value>非電流再生エリア</value>
   </data>
   <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
     <value>フォントの不透明度（非電流再生エリア）</value>
@@ -854,7 +884,7 @@
     <value>余分な光</value>
   </data>
   <data name="SettingsPageLyricsFgFontColor.Header" xml:space="preserve">
-    <value>フォントカラー（現在の再生エリア）</value>
+    <value>現在の再生エリア</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveColored.Content" xml:space="preserve">
     <value>歌詞の背景に適応する（色付き）</value>
@@ -892,6 +922,9 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>グロー効果</value>
   </data>
+  <data name="SettingsPageLyricsHighlight.Header" xml:space="preserve">
+    <value>ハイライト</value>
+  </data>
   <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
     <value>オリジナルのハイライト範囲</value>
   </data>
@@ -940,9 +973,6 @@
   <data name="SettingsPageLyricsShadow.Header" xml:space="preserve">
     <value>影だ</value>
   </data>
-  <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>歌詞ストロークカラー</value>
-  </data>
   <data name="SettingsPageLyricsStyle.Text" xml:space="preserve">
     <value>歌詞スタイル</value>
   </data>
@@ -1021,6 +1051,9 @@
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>ファイルエクスプローラーで開きます</value>
   </data>
+  <data name="SettingsPageOriginalText.Header" xml:space="preserve">
+    <value>原文</value>
+  </data>
   <data name="SettingsPagePaletteGeneratorType.Header" xml:space="preserve">
     <value>カラーピックスタイル</value>
   </data>
@@ -1036,6 +1069,12 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>パスはコンピューターでは見つかりません</value>
   </data>
+  <data name="SettingsPagePhonetic.Text" xml:space="preserve">
+    <value>リリックアノテーション</value>
+  </data>
+  <data name="SettingsPagePhoneticText.Header" xml:space="preserve">
+    <value>発音</value>
+  </data>
   <data name="SettingsPagePinyin.Content" xml:space="preserve">
     <value>マンダリンのピンイン</value>
   </data>
@@ -1111,6 +1150,9 @@
   <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
     <value>最初の行の期間</value>
   </data>
+  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
+    <value>サーバーアドレス</value>
+  </data>
   <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
     <value>テストサーバー</value>
   </data>
@@ -1150,6 +1192,9 @@
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>現在の値： </value>
   </data>
+  <data name="SettingsPageSnowFlakeLayer.Header" xml:space="preserve">
+    <value>スノーフレークレイヤー</value>
+  </data>
   <data name="SettingsPageSongInfo.Text" xml:space="preserve">
     <value>曲のタイトル＆アーティスト</value>
   </data>
@@ -1174,7 +1219,10 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>標準モード</value>
   </data>
-  <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
+  <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
+    <value>ストロークカラー</value>
+  </data>
+  <data name="SettingsPageSystemLanguage" xml:space="preserve">
     <value>デフォルト</value>
   </data>
   <data name="SettingsPageTargetLanguage.Header" xml:space="preserve">
@@ -1207,6 +1255,9 @@
   <data name="SettingsPageToggleHotKey.Header" xml:space="preserve">
     <value>ショートカットキーを切り込んで切り取ります</value>
   </data>
+  <data name="SettingsPageTranslatedText.Header" xml:space="preserve">
+    <value>译文</value>
+  </data>
   <data name="SettingsPageTranslation.Text" xml:space="preserve">
     <value>歌詞翻訳</value>
   </data>
@@ -1222,6 +1273,9 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>バージョン</value>
   </data>
+  <data name="SettingsPageWesternChar.Header" xml:space="preserve">
+    <value>英字</value>
+  </data>
   <data name="SettingsPageWidth.Header" xml:space="preserve">
     <value>幅</value>
   </data>
@@ -1256,7 +1310,7 @@
     <value>ウィンドウの位置をリセットします</value>
   </data>
   <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>再アート</value>
+    <value>再起動</value>
   </data>
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>設定を開く</value>

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

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ActionCompleted" xml:space="preserve">
+    <value>작전 완료</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>로컬 음악 파일</value>
   </data>
@@ -177,6 +180,9 @@
   <data name="ImportSettingsFailed" xml:space="preserve">
     <value>설정 파일 가져 오기 실패, 응용 프로그램 설정은 변경되지 않았습니다</value>
   </data>
+  <data name="Jyutping" xml:space="preserve">
+    <value>광둥어 병음</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>승인이 실패했습니다. 다시 시도하십시오</value>
   </data>
@@ -448,6 +454,12 @@
   <data name="PictureInPictureMode" xml:space="preserve">
     <value>사진 인당 모드</value>
   </data>
+  <data name="Pinyin" xml:space="preserve">
+    <value>만다린의 피니 인</value>
+  </data>
+  <data name="Romaji" xml:space="preserve">
+    <value>로만</value>
+  </data>
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>기여자</value>
   </data>
@@ -457,9 +469,18 @@
   <data name="SetingsPageFeedback.Text" xml:space="preserve">
     <value>피드백</value>
   </data>
+  <data name="SetingsPageInstructions.Text" xml:space="preserve">
+    <value>지침</value>
+  </data>
   <data name="SetingsPageThanks.Text" xml:space="preserve">
     <value>이 프로젝트가 마음에 들면 기부하여 지원을 고려하십시오. 귀하의 지원은 프로젝트를 계속 유지하고 추가 개발을 장려하는 데 도움이 될 것입니다.</value>
   </data>
+  <data name="SettingsPage3DLyrics.Header" xml:space="preserve">
+    <value>3D 가사</value>
+  </data>
+  <data name="SettingsPage3DLyricsDepth.Header" xml:space="preserve">
+    <value>심도</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>에 대한</value>
   </data>
@@ -562,9 +583,18 @@
   <data name="SettingsPageChinese.Header" xml:space="preserve">
     <value>화음</value>
   </data>
+  <data name="SettingsPageChineseLyrics.Text" xml:space="preserve">
+    <value>중국어 가사</value>
+  </data>
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>중국어를 전통적인 중국어로 전환합니다</value>
   </data>
+  <data name="SettingsPageCJK.Header" xml:space="preserve">
+    <value>한중일 통합 이데오그래프</value>
+  </data>
+  <data name="SettingsPageClearCache.Content" xml:space="preserve">
+    <value>캐시 파일을 지웁니다</value>
+  </data>
   <data name="SettingsPageClickThrough.Header" xml:space="preserve">
     <value>클릭률</value>
   </data>
@@ -712,6 +742,9 @@
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>시스템을 따르십시오</value>
   </data>
+  <data name="SettingsPageFontColor.Header" xml:space="preserve">
+    <value>폰트 색상</value>
+  </data>
   <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
     <value>투표를 통해 가사 창을 맨 위에 두세요</value>
   </data>
@@ -808,9 +841,6 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 음악 서버</value>
   </data>
-  <data name="SettingsPageLyrics.Text" xml:space="preserve">
-    <value>가사 스타일과 효과</value>
-  </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
     <value>조정</value>
   </data>
@@ -818,7 +848,7 @@
     <value>가사 배경</value>
   </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
-    <value>글꼴 색상 (비 전류 재생 영역)</value>
+    <value>비 전류 재생 영역</value>
   </data>
   <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
     <value>글꼴 불투명 (비 전류 재생 영역)</value>
@@ -854,7 +884,7 @@
     <value>여분의 빛</value>
   </data>
   <data name="SettingsPageLyricsFgFontColor.Header" xml:space="preserve">
-    <value>글꼴 색상 (현재 재생 영역)</value>
+    <value>현재 재생 영역</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveColored.Content" xml:space="preserve">
     <value>가사 배경 (색상)에 적응</value>
@@ -892,6 +922,9 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>글로우 효과</value>
   </data>
+  <data name="SettingsPageLyricsHighlight.Header" xml:space="preserve">
+    <value>하이라이트</value>
+  </data>
   <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
     <value>원래 하이라이트 범위</value>
   </data>
@@ -940,9 +973,6 @@
   <data name="SettingsPageLyricsShadow.Header" xml:space="preserve">
     <value>그림자</value>
   </data>
-  <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>가사 스트로크 컬러</value>
-  </data>
   <data name="SettingsPageLyricsStyle.Text" xml:space="preserve">
     <value>가사 스타일</value>
   </data>
@@ -1021,6 +1051,9 @@
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>파일 탐색기에서 열립니다</value>
   </data>
+  <data name="SettingsPageOriginalText.Header" xml:space="preserve">
+    <value>원본</value>
+  </data>
   <data name="SettingsPagePaletteGeneratorType.Header" xml:space="preserve">
     <value>색상 선택 스타일</value>
   </data>
@@ -1036,6 +1069,12 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>경로는 컴퓨터에서 찾을 수 없습니다</value>
   </data>
+  <data name="SettingsPagePhonetic.Text" xml:space="preserve">
+    <value>가사 주석</value>
+  </data>
+  <data name="SettingsPagePhoneticText.Header" xml:space="preserve">
+    <value>발성</value>
+  </data>
   <data name="SettingsPagePinyin.Content" xml:space="preserve">
     <value>만다린의 피니 인</value>
   </data>
@@ -1111,6 +1150,9 @@
   <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
     <value>첫 번째 줄의 기간</value>
   </data>
+  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
+    <value>서버 주소</value>
+  </data>
   <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
     <value>테스트 서버</value>
   </data>
@@ -1150,6 +1192,9 @@
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>현재 가치 : </value>
   </data>
+  <data name="SettingsPageSnowFlakeLayer.Header" xml:space="preserve">
+    <value>스노우 플레이크 레이어</value>
+  </data>
   <data name="SettingsPageSongInfo.Text" xml:space="preserve">
     <value>노래 제목 및 아티스트</value>
   </data>
@@ -1174,7 +1219,10 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>표준 모드</value>
   </data>
-  <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
+  <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
+    <value>윤곽선 색상</value>
+  </data>
+  <data name="SettingsPageSystemLanguage" xml:space="preserve">
     <value>기본</value>
   </data>
   <data name="SettingsPageTargetLanguage.Header" xml:space="preserve">
@@ -1207,6 +1255,9 @@
   <data name="SettingsPageToggleHotKey.Header" xml:space="preserve">
     <value>바로 가기 키를 자르고 잘라냅니다</value>
   </data>
+  <data name="SettingsPageTranslatedText.Header" xml:space="preserve">
+    <value>번역</value>
+  </data>
   <data name="SettingsPageTranslation.Text" xml:space="preserve">
     <value>가사 번역</value>
   </data>
@@ -1222,6 +1273,9 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>버전</value>
   </data>
+  <data name="SettingsPageWesternChar.Header" xml:space="preserve">
+    <value>라틴 알파벳</value>
+  </data>
   <data name="SettingsPageWidth.Header" xml:space="preserve">
     <value>너비</value>
   </data>
@@ -1256,7 +1310,7 @@
     <value>창 위치를 재설정합니다</value>
   </data>
   <data name="SystemTrayRestart.Text" xml:space="preserve">
-    <value>resart</value>
+    <value>다시 시작</value>
   </data>
   <data name="SystemTraySettings.Text" xml:space="preserve">
     <value>열기 설정</value>

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

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ActionCompleted" xml:space="preserve">
+    <value>操作完成</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>本地音乐文件</value>
   </data>
@@ -177,6 +180,9 @@
   <data name="ImportSettingsFailed" xml:space="preserve">
     <value>设置文件导入失败，应用程序设置保持不变</value>
   </data>
+  <data name="Jyutping" xml:space="preserve">
+    <value>粤语拼音</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>授权失败，请重试</value>
   </data>
@@ -448,6 +454,12 @@
   <data name="PictureInPictureMode" xml:space="preserve">
     <value>画中画模式</value>
   </data>
+  <data name="Pinyin" xml:space="preserve">
+    <value>普通话拼音</value>
+  </data>
+  <data name="Romaji" xml:space="preserve">
+    <value>罗马音</value>
+  </data>
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>贡献者</value>
   </data>
@@ -457,9 +469,18 @@
   <data name="SetingsPageFeedback.Text" xml:space="preserve">
     <value>反馈</value>
   </data>
+  <data name="SetingsPageInstructions.Text" xml:space="preserve">
+    <value>操作指南</value>
+  </data>
   <data name="SetingsPageThanks.Text" xml:space="preserve">
     <value>如果您喜欢这个项目，请考虑通过捐赠来支持它。您的支持将有助于保持项目的生命并鼓励进一步的发展。</value>
   </data>
+  <data name="SettingsPage3DLyrics.Header" xml:space="preserve">
+    <value>3D 歌词</value>
+  </data>
+  <data name="SettingsPage3DLyricsDepth.Header" xml:space="preserve">
+    <value>深度</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>关于</value>
   </data>
@@ -562,9 +583,18 @@
   <data name="SettingsPageChinese.Header" xml:space="preserve">
     <value>中文注音</value>
   </data>
+  <data name="SettingsPageChineseLyrics.Text" xml:space="preserve">
+    <value>中文歌词</value>
+  </data>
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>中文转换为繁体</value>
   </data>
+  <data name="SettingsPageCJK.Header" xml:space="preserve">
+    <value>中日韩统一表意文字</value>
+  </data>
+  <data name="SettingsPageClearCache.Content" xml:space="preserve">
+    <value>清除缓存文件</value>
+  </data>
   <data name="SettingsPageClickThrough.Header" xml:space="preserve">
     <value>点击穿透</value>
   </data>
@@ -712,6 +742,9 @@
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>跟随系统</value>
   </data>
+  <data name="SettingsPageFontColor.Header" xml:space="preserve">
+    <value>字体颜色</value>
+  </data>
   <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
     <value>通过轮询方式使歌词窗口保持置于顶层状态</value>
   </data>
@@ -808,9 +841,6 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 音乐服务器</value>
   </data>
-  <data name="SettingsPageLyrics.Text" xml:space="preserve">
-    <value>歌词样式与动效</value>
-  </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
     <value>对齐方式</value>
   </data>
@@ -818,7 +848,7 @@
     <value>歌词背景</value>
   </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
-    <value>字体颜色（非当前播放区域）</value>
+    <value>非当前播放区域</value>
   </data>
   <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
     <value>字体不透明度（非当前播放区域）</value>
@@ -854,7 +884,7 @@
     <value>超细</value>
   </data>
   <data name="SettingsPageLyricsFgFontColor.Header" xml:space="preserve">
-    <value>字体颜色（当前播放区域）</value>
+    <value>当前播放区域</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveColored.Content" xml:space="preserve">
     <value>适应歌词背景（彩色）</value>
@@ -892,6 +922,9 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>辉光效果</value>
   </data>
+  <data name="SettingsPageLyricsHighlight.Header" xml:space="preserve">
+    <value>高亮</value>
+  </data>
   <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
     <value>原文高亮显示范围</value>
   </data>
@@ -940,9 +973,6 @@
   <data name="SettingsPageLyricsShadow.Header" xml:space="preserve">
     <value>阴影</value>
   </data>
-  <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>歌词描边颜色</value>
-  </data>
   <data name="SettingsPageLyricsStyle.Text" xml:space="preserve">
     <value>歌词样式</value>
   </data>
@@ -1021,6 +1051,9 @@
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在文件资源管理器中打开</value>
   </data>
+  <data name="SettingsPageOriginalText.Header" xml:space="preserve">
+    <value>原文</value>
+  </data>
   <data name="SettingsPagePaletteGeneratorType.Header" xml:space="preserve">
     <value>取色风格</value>
   </data>
@@ -1036,6 +1069,12 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>无法在您的计算机中找到该路径</value>
   </data>
+  <data name="SettingsPagePhonetic.Text" xml:space="preserve">
+    <value>歌词注音</value>
+  </data>
+  <data name="SettingsPagePhoneticText.Header" xml:space="preserve">
+    <value>注音</value>
+  </data>
   <data name="SettingsPagePinyin.Content" xml:space="preserve">
     <value>普通话拼音</value>
   </data>
@@ -1111,6 +1150,9 @@
   <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
     <value>首行持续时间</value>
   </data>
+  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
+    <value>服务器地址</value>
+  </data>
   <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
     <value>测试服务器</value>
   </data>
@@ -1150,6 +1192,9 @@
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>当前值： </value>
   </data>
+  <data name="SettingsPageSnowFlakeLayer.Header" xml:space="preserve">
+    <value>雪花层</value>
+  </data>
   <data name="SettingsPageSongInfo.Text" xml:space="preserve">
     <value>歌曲标题和艺术家</value>
   </data>
@@ -1174,7 +1219,10 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>标准模式</value>
   </data>
-  <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
+  <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
+    <value>描边颜色</value>
+  </data>
+  <data name="SettingsPageSystemLanguage" xml:space="preserve">
     <value>默认</value>
   </data>
   <data name="SettingsPageTargetLanguage.Header" xml:space="preserve">
@@ -1207,6 +1255,9 @@
   <data name="SettingsPageToggleHotKey.Header" xml:space="preserve">
     <value>切入与切出快捷键</value>
   </data>
+  <data name="SettingsPageTranslatedText.Header" xml:space="preserve">
+    <value>译文</value>
+  </data>
   <data name="SettingsPageTranslation.Text" xml:space="preserve">
     <value>歌词翻译</value>
   </data>
@@ -1222,6 +1273,9 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本号</value>
   </data>
+  <data name="SettingsPageWesternChar.Header" xml:space="preserve">
+    <value>拉丁字母</value>
+  </data>
   <data name="SettingsPageWidth.Header" xml:space="preserve">
     <value>宽度</value>
   </data>

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

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ActionCompleted" xml:space="preserve">
+    <value>操作完成</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>本地音樂文件</value>
   </data>
@@ -177,6 +180,9 @@
   <data name="ImportSettingsFailed" xml:space="preserve">
     <value>設置文件導入失敗，應用程序設置保持不變</value>
   </data>
+  <data name="Jyutping" xml:space="preserve">
+    <value>粵語拼音</value>
+  </data>
   <data name="LastFMAuthFailed" xml:space="preserve">
     <value>授權失敗，請重試</value>
   </data>
@@ -448,6 +454,12 @@
   <data name="PictureInPictureMode" xml:space="preserve">
     <value>畫中畫模式</value>
   </data>
+  <data name="Pinyin" xml:space="preserve">
+    <value>普通話拼音</value>
+  </data>
+  <data name="Romaji" xml:space="preserve">
+    <value>羅馬音</value>
+  </data>
   <data name="SetingsPageContributors.Text" xml:space="preserve">
     <value>貢獻者</value>
   </data>
@@ -457,9 +469,18 @@
   <data name="SetingsPageFeedback.Text" xml:space="preserve">
     <value>回饋</value>
   </data>
+  <data name="SetingsPageInstructions.Text" xml:space="preserve">
+    <value>說明</value>
+  </data>
   <data name="SetingsPageThanks.Text" xml:space="preserve">
     <value>如果您喜歡這個項目，請考慮通過捐贈來支持它。您的支持將有助於保持項目的生命並鼓勵進一步的發展。</value>
   </data>
+  <data name="SettingsPage3DLyrics.Header" xml:space="preserve">
+    <value>3D 歌詞</value>
+  </data>
+  <data name="SettingsPage3DLyricsDepth.Header" xml:space="preserve">
+    <value>深度</value>
+  </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
     <value>關於</value>
   </data>
@@ -562,9 +583,18 @@
   <data name="SettingsPageChinese.Header" xml:space="preserve">
     <value>中文注音</value>
   </data>
+  <data name="SettingsPageChineseLyrics.Text" xml:space="preserve">
+    <value>中文歌詞</value>
+  </data>
   <data name="SettingsPageChinesePreference.Header" xml:space="preserve">
     <value>中文轉換為繁體</value>
   </data>
+  <data name="SettingsPageCJK.Header" xml:space="preserve">
+    <value>中日韓統一表意文字</value>
+  </data>
+  <data name="SettingsPageClearCache.Content" xml:space="preserve">
+    <value>清除快取檔案</value>
+  </data>
   <data name="SettingsPageClickThrough.Header" xml:space="preserve">
     <value>點擊穿透</value>
   </data>
@@ -712,6 +742,9 @@
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
     <value>跟隨系統</value>
   </data>
+  <data name="SettingsPageFontColor.Header" xml:space="preserve">
+    <value>字體顏色</value>
+  </data>
   <data name="SettingsPageForceAlwaysOnTop.Description" xml:space="preserve">
     <value>透過輪詢方式使歌詞視窗保持置於頂層狀態</value>
   </data>
@@ -808,9 +841,6 @@
   <data name="SettingsPageLXMusicServer.Text" xml:space="preserve">
     <value>LX 音樂服務器</value>
   </data>
-  <data name="SettingsPageLyrics.Text" xml:space="preserve">
-    <value>歌詞樣式與動效</value>
-  </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
     <value>對齊方式</value>
   </data>
@@ -818,7 +848,7 @@
     <value>歌詞背景</value>
   </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
-    <value>字體顏色（非當前播放區域）</value>
+    <value>非當前播放區域</value>
   </data>
   <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
     <value>字體不透明度（非目前播放區域）</value>
@@ -854,7 +884,7 @@
     <value>超細</value>
   </data>
   <data name="SettingsPageLyricsFgFontColor.Header" xml:space="preserve">
-    <value>字體顏色（當前播放區域）</value>
+    <value>當前播放區域</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveColored.Content" xml:space="preserve">
     <value>適應歌詞背景（彩色）</value>
@@ -892,6 +922,9 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>輝光效果</value>
   </data>
+  <data name="SettingsPageLyricsHighlight.Header" xml:space="preserve">
+    <value>高亮</value>
+  </data>
   <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
     <value>原文高亮顯示範圍</value>
   </data>
@@ -940,9 +973,6 @@
   <data name="SettingsPageLyricsShadow.Header" xml:space="preserve">
     <value>陰影</value>
   </data>
-  <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>歌詞描邊顏色</value>
-  </data>
   <data name="SettingsPageLyricsStyle.Text" xml:space="preserve">
     <value>歌詞樣式</value>
   </data>
@@ -1021,6 +1051,9 @@
   <data name="SettingsPageOpenFolderButton.Content" xml:space="preserve">
     <value>在檔案總管中開啟</value>
   </data>
+  <data name="SettingsPageOriginalText.Header" xml:space="preserve">
+    <value>原文</value>
+  </data>
   <data name="SettingsPagePaletteGeneratorType.Header" xml:space="preserve">
     <value>取色風格</value>
   </data>
@@ -1036,6 +1069,12 @@
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
     <value>無法在您的電腦中找到該路徑</value>
   </data>
+  <data name="SettingsPagePhonetic.Text" xml:space="preserve">
+    <value>歌詞注音</value>
+  </data>
+  <data name="SettingsPagePhoneticText.Header" xml:space="preserve">
+    <value>注音</value>
+  </data>
   <data name="SettingsPagePinyin.Content" xml:space="preserve">
     <value>普通話拼音</value>
   </data>
@@ -1111,6 +1150,9 @@
   <data name="SettingsPageScrollTopDuration.Header" xml:space="preserve">
     <value>首行持續時間</value>
   </data>
+  <data name="SettingsPageServerAddress.Header" xml:space="preserve">
+    <value>服務器地址</value>
+  </data>
   <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
     <value>測試服務器</value>
   </data>
@@ -1150,6 +1192,9 @@
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
     <value>目前值： </value>
   </data>
+  <data name="SettingsPageSnowFlakeLayer.Header" xml:space="preserve">
+    <value>雪花層</value>
+  </data>
   <data name="SettingsPageSongInfo.Text" xml:space="preserve">
     <value>歌曲標題和藝術家</value>
   </data>
@@ -1174,7 +1219,10 @@
   <data name="SettingsPageStandardMode.Text" xml:space="preserve">
     <value>標準模式</value>
   </data>
-  <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
+  <data name="SettingsPageStrokeFontColor.Header" xml:space="preserve">
+    <value>描邊顏色</value>
+  </data>
+  <data name="SettingsPageSystemLanguage" xml:space="preserve">
     <value>預設</value>
   </data>
   <data name="SettingsPageTargetLanguage.Header" xml:space="preserve">
@@ -1207,6 +1255,9 @@
   <data name="SettingsPageToggleHotKey.Header" xml:space="preserve">
     <value>切入與切出快捷鍵</value>
   </data>
+  <data name="SettingsPageTranslatedText.Header" xml:space="preserve">
+    <value>譯文</value>
+  </data>
   <data name="SettingsPageTranslation.Text" xml:space="preserve">
     <value>歌詞翻譯</value>
   </data>
@@ -1222,6 +1273,9 @@
   <data name="SettingsPageVersion.Text" xml:space="preserve">
     <value>版本號</value>
   </data>
+  <data name="SettingsPageWesternChar.Header" xml:space="preserve">
+    <value>拉丁字母</value>
+  </data>
   <data name="SettingsPageWidth.Header" xml:space="preserve">
     <value>寬度</value>
   </data>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/AppSettingsControlViewModel.cs

@@ -1,11 +1,13 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Services.LiveStatesService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsPageViewModel.cs

@@ -38,8 +38,8 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             LiveStates = _liveStatesService.LiveStates;
 
-            //Volume = SystemVolumeHelper.GetMasterVolume();
-            //SystemVolumeHelper.VolumeChanged += SystemVolumeHelper_VolumeChanged;
+            Volume = SystemVolumeHelper.MasterVolume;
+            SystemVolumeHelper.VolumeNotification += SystemVolumeHelper_VolumeNotification;
 
             _mediaSessionsService = mediaSessionsService;
             _mediaSessionsService.SongInfoChanged += PlaybackService_SongInfoChanged;
@@ -49,16 +49,16 @@ namespace BetterLyrics.WinUI3.ViewModels
             IsSongPlaying = _mediaSessionsService.IsPlaying;
         }
 
+        private void SystemVolumeHelper_VolumeNotification(object? sender, int e)
+        {
+            Volume = e;
+        }
+
         private void PlaybackService_TimelineChanged(object? sender, Events.TimelineChangedEventArgs e)
         {
             SongDurationSeconds = (int)e.End.TotalSeconds;
         }
 
-        //private void SystemVolumeHelper_VolumeChanged(int volume)
-        //{
-        //    Volume = volume;
-        //}
-
         private void PlaybackService_IsPlayingChanged(object? sender, Events.IsPlayingChangedEventArgs e)
         {
             IsSongPlaying = e.IsPlaying;
@@ -139,11 +139,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             TimelineSliderThumbLyricsLine = _mediaSessionsService.CurrentLyricsData?.GetLyricsLine(value);
         }
 
-        //partial void OnVolumeChanged(int value)
-        //{
-        //    SystemVolumeHelper.SetMasterVolume(value);
-        //}
-
         public void Receive(PropertyChangedMessage<TimeSpan> message)
         {
             if (message.Sender is LyricsRendererViewModel.LyricsRendererViewModel)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.CreateResources .cs

@@ -1,37 +0,0 @@
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.WinUI;
-using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Effects;
-using Microsoft.UI;
-using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Storage;
-using Windows.Storage.Streams;
-
-namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
-{
-    public partial class LyricsRendererViewModel
-    {
-        private PixelShaderEffect? _effect;
-
-        public async Task CreateResourcesAsync(Microsoft.Graphics.Canvas.UI.Xaml.CanvasAnimatedControl control)
-        {
-            StorageFile file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/effect.bin"));
-            IBuffer buffer = await FileIO.ReadBufferAsync(file);
-            var bytes = buffer.ToArray();
-            _effect = new PixelShaderEffect(bytes);
-            _effect.Properties["Width"] = Convert.ToSingle(control.ConvertDipsToPixels((float)control.Size.Width, CanvasDpiRounding.Round));
-            _effect.Properties["Height"] = Convert.ToSingle(control.ConvertDipsToPixels((float)control.Size.Height, CanvasDpiRounding.Round));
-            _effect.Properties["color1"] = Colors.Black.ToVector3RGB();
-            _effect.Properties["color2"] = Colors.Black.ToVector3RGB();
-            _effect.Properties["color3"] = Colors.Black.ToVector3RGB();
-            _effect.Properties["color4"] = Colors.Black.ToVector3RGB();
-            _effect.Properties["EnableLightWave"] = false;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Draw.cs

@@ -52,7 +52,18 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             DrawFluidBackground(control, combinedDs);
             DrawSpectrum(control, combinedDs);
 
-            combinedDs.DrawImage(blurredLyrics);
+            if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.Is3DLyricsEnabled)
+            {
+                combinedDs.DrawImage(new Transform3DEffect
+                {
+                    Source = blurredLyrics,
+                    TransformMatrix = _lyrics3DMatrix
+                });
+            }
+            else
+            {
+                combinedDs.DrawImage(blurredLyrics);
+            }
 
             ds.DrawImage(combined);
 
@@ -104,7 +115,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         public void DrawSpectrum(ICanvasAnimatedControl control, CanvasDrawingSession ds)
         {
-            if (_spectrumAnalyzer != null && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsSpectrumOverlayEnabled)
+            if (_spectrumAnalyzer != null && _spectrumAnalyzer.SmoothSpectrum != null && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsSpectrumOverlayEnabled)
             {
                 var points = new Vector2[_spectrumAnalyzer.BarCount];
                 float pointSpacing = 0;
@@ -122,6 +133,17 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     points[i] = new Vector2(x, y);
                 }
 
+                // 限制最高点高度
+                var minY = points.OrderBy(p => p.Y).FirstOrDefault().Y;
+                var limitY = _canvasHeight * (1 - 0.1f);
+                if (minY < limitY)
+                {
+                    var num = (float)(limitY / minY);
+                    points = points.Select(p => new Vector2(p.X, p.Y * num)).ToArray();
+                }
+                // 防止越过画布边界
+                points = points.Select(p => new Vector2(p.X, (float)(Math.Min(_canvasHeight, p.Y)))).ToArray();
+
                 // 用于填充的闭合路径
                 using var pathBuilder = new CanvasPathBuilder(ds);
                 pathBuilder.BeginFigure(points[0]);
@@ -153,32 +175,36 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 using var geometry = CanvasGeometry.CreatePath(pathBuilder);
                 var gradientStops = new CanvasGradientStop[]
                 {
-                    new() { Position = 0.0f, Color = _albumArtAccentColor1Transition.Value },
-                    new() { Position = 1.0f, Color = Colors.Transparent }
+                    new() { Position = 0.0f, Color = Colors.Transparent },
+                    new() { Position = 0.8f, Color = Colors.Transparent },
+                    new() { Position = 1.0f, Color = _adaptiveColoredFontColor ?? _albumArtAccentColor1Transition.Value }
                 };
 
                 using var gradientBrush = new CanvasLinearGradientBrush(ds, gradientStops);
-                gradientBrush.StartPoint = new Vector2((float)_canvasWidth / 2, (float)_canvasHeight);
-                gradientBrush.EndPoint = new Vector2((float)_canvasWidth / 2, points.Select(p => p.Y).Min());
+                gradientBrush.StartPoint = new Vector2(0, 0);
+                gradientBrush.EndPoint = new Vector2(0, (float)_canvasHeight);
 
                 // 使用渐变画刷填充
                 ds.FillGeometry(geometry, gradientBrush);
 
+                // 纯色
+                //ds.FillGeometry(geometry, _adaptiveColoredFontColor ?? _albumArtAccentColor1Transition.Value);
+
                 // 绘制轮廓线
-                // var lineColor = Colors.SkyBlue;
-                // float strokeWidth = 2f;
-                // session.DrawGeometry(geometry, lineColor, strokeWidth);
+                //var lineColor = Colors.SkyBlue;
+                //float strokeWidth = 2f;
+                //ds.DrawGeometry(geometry, _albumArtAccentColor4Transition.Value, strokeWidth);
 
             }
         }
 
         private void DrawFluidBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds)
         {
-            if (_effect != null && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsFluidOverlayEnabled)
+            if (_fluidEffect != null && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsFluidOverlayEnabled)
             {
                 ds.DrawImage(new OpacityEffect
                 {
-                    Source = _effect,
+                    Source = _fluidEffect,
                     Opacity = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.FluidOverlayOpacity / 100f
                 });
             }
@@ -308,7 +334,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 var line = _currentLyricsData?.LyricsLines.ElementAtOrDefault(i);
                 if (line == null) continue;
 
-                var textLayout = line.CanvasTextLayout;
+                var textLayout = line.OriginalCanvasTextLayout;
                 if (textLayout == null) continue;
 
                 double layoutWidth = (double)textLayout.LayoutBounds.Width;
@@ -318,10 +344,11 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
                 double yOffset = line.YOffsetTransition.Value + _canvasHeight / 2 + _lyricsYTransition.Value;
 
-                // 组合变换：缩放 -> 旋转 -> 平移
+                //// 组合变换：缩放 -> 旋转 -> 平移
                 ds.Transform =
                     Matrix3x2.CreateScale((float)line.ScaleTransition.Value, line.CenterPosition)
-                    * Matrix3x2.CreateRotation((float)line.AngleTransition.Value, currentPlayingLine.Position)
+                    * Matrix3x2.CreateRotation((float)line.AngleTransition.Value,
+                    currentPlayingLine.OriginalPosition.WithX(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.FanLyricsAngle < 0 ? (float)_maxLyricsWidth : 0))
                     * Matrix3x2.CreateTranslation((float)_lyricsXTransition.Value, (float)yOffset);
 
                 using var combined = new CanvasCommandList(control);
@@ -330,6 +357,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 // 先铺一层带默认透明度的已经加了模糊效果的歌词作为最底层（背景歌词层次）
                 using var backgroundFontEffect = CanvasHelper.CreateFontEffect(line, control, _strokeFontColor,
                     _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontStrokeWidth, _bgFontColor);
+
                 using var backgroundEffect = CanvasHelper.CreateBackgroundEffect(line, backgroundFontEffect, _lyricsOpacityTransition.Value);
                 combinedDs.DrawImage(backgroundEffect);
 
@@ -348,12 +376,19 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
                     using var effectLayer = new CanvasCommandList(control);
                     using var effectLayerDs = effectLayer.CreateDrawingSession();
-                    if (line.OriginalText != line.DisplayedText && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsTranslationHighlightAmount != 0)
+                    if (line.PhoneticText != "" && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.PhoneticLyricsHighlightAmount != 0)
                     {
-                        using var translationHighlightMask = CanvasHelper.CreateTranslationHighlightMask(control, line);
-                        using var foregroundTranslationHighlightEffect = CanvasHelper.CreateForegroundHighlightEffect(foregroundFontEffect, translationHighlightMask,
-                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsTranslationHighlightAmount / 100.0);
-                        effectLayerDs.DrawImage(foregroundTranslationHighlightEffect);
+                        using var phoneticHighlightMask = CanvasHelper.CreatePhoneticHighlightMask(control, line);
+                        using var foregroundPhoneticHighlightEffect = CanvasHelper.CreateForegroundHighlightEffect(foregroundFontEffect, phoneticHighlightMask,
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.PhoneticLyricsHighlightAmount / 100.0);
+                        effectLayerDs.DrawImage(foregroundPhoneticHighlightEffect);
+                    }
+                    if (line.TranslatedText != "" && _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.TranslatedLyricsHighlightAmount != 0)
+                    {
+                        using var translatedHighlightMask = CanvasHelper.CreateTranslatedHighlightMask(control, line);
+                        using var foregroundTranslatedHighlightEffect = CanvasHelper.CreateForegroundHighlightEffect(foregroundFontEffect, translatedHighlightMask,
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.TranslatedLyricsHighlightAmount / 100.0);
+                        effectLayerDs.DrawImage(foregroundTranslatedHighlightEffect);
                     }
                     if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsLyricsShadowEnabled)
                     {
@@ -371,12 +406,12 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                             _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsGlowEffectAmount);
                         effectLayerDs.DrawImage(foregroundBlurEffect);
                     }
-                    if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsHighlightAmount != 0)
+                    if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.OriginalLyricsHighlightAmount != 0)
                     {
                         var highlightEffectMask = CanvasHelper.GetAlphaMask(control, charMask, lineStartToCharMask, lineMask,
-                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsHighlightScope);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.OriginalLyricsHighlightScope);
                         using var foregroundHighlightEffect = CanvasHelper.CreateForegroundHighlightEffect(foregroundFontEffect, highlightEffectMask,
-                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsHighlightAmount / 100.0);
+                            _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.OriginalLyricsHighlightAmount / 100.0);
                         effectLayerDs.DrawImage(foregroundHighlightEffect);
                     }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Effects.cs

@@ -5,7 +5,10 @@ using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
 using System;
 using System.Numerics;
+using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
+using Windows.Storage;
+using Windows.Storage.Streams;
 
 namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 {
@@ -13,6 +16,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
     {
         private OpacityEffect? _albumArtBgEffect;
         private CanvasCommandList? _albumArtEffect;
+        private PixelShaderEffect? _fluidEffect;
 
         private OpacityEffect CreateBgImageEffect(CanvasBitmap canvasBitmap, double opacity)
         {
@@ -246,5 +250,28 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             // 给一个偏移，是为了避免绘制时从原点开始，这样会造成阴影被裁切
             ds.DrawImage(_albumArtEffect, control.Size.ToVector2() / 2 - new Vector2((float)_albumArtSize, (float)_albumArtSize) / 2);
         }
+
+        private void DisposeFluidEffect()
+        {
+            _fluidEffect?.Dispose();
+            _fluidEffect = null;
+        }
+
+        private async void RecreateFluidEffect(ICanvasAnimatedControl control)
+        {
+            DisposeFluidEffect();
+
+            StorageFile file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/FluidEffect.bin"));
+            IBuffer buffer = await FileIO.ReadBufferAsync(file);
+            var bytes = buffer.ToArray();
+            _fluidEffect = new PixelShaderEffect(bytes);
+            _fluidEffect.Properties["Width"] = (float)control.ConvertDipsToPixels((float)control.Size.Width, CanvasDpiRounding.Round);
+            _fluidEffect.Properties["Height"] = (float)control.ConvertDipsToPixels((float)control.Size.Height, CanvasDpiRounding.Round);
+            _fluidEffect.Properties["color1"] = _albumArtAccentColor1Transition.Value.ToVector3RGB();
+            _fluidEffect.Properties["color2"] = _albumArtAccentColor2Transition.Value.ToVector3RGB();
+            _fluidEffect.Properties["color3"] = _albumArtAccentColor3Transition.Value.ToVector3RGB();
+            _fluidEffect.Properties["color4"] = _albumArtAccentColor4Transition.Value.ToVector3RGB();
+            _fluidEffect.Properties["EnableLightWave"] = false;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Messages.cs

@@ -56,6 +56,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsFloatAnimationEnabled))
                 {
                 }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.Is3DLyricsEnabled))
+                {
+                    _isLyrics3DMatrixChanged = true;
+                }
             }
             else if (message.Sender is MediaSourceProviderInfo)
             {
@@ -96,6 +100,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                     _isSpectrumOverlayEnabledChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsBackgroundSettings.IsFluidOverlayEnabled))
+                {
+                    _isFluidOverlayEnabledChanged = true;
+                }
             }
         }
 
@@ -207,10 +215,38 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.FanLyricsAngle))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.Lyrics3DXAngle))
+                {
+                    _isLyrics3DMatrixChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.Lyrics3DYAngle))
+                {
+                    _isLyrics3DMatrixChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.Lyrics3DZAngle))
+                {
+                    _isLyrics3DMatrixChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.Lyrics3DDepth))
+                {
+                    _isLyrics3DMatrixChanged = true;
+                }
             }
             else if (message.Sender is LyricsStyleSettings)
             {
-                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontSize))
+                if (message.PropertyName == nameof(LyricsStyleSettings.PhoneticLyricsFontSize))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.OriginalLyricsFontSize))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsStyleSettings.TranslatedLyricsFontSize))
                 {
                     _isLayoutChanged = true;
                 }
@@ -244,7 +280,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                     _isLayoutChanged = true;
                 }
-                else if (message.PropertyName == nameof(LyricsEffectSettings.LyricsHighlightScope))
+                else if (message.PropertyName == nameof(LyricsEffectSettings.OriginalLyricsHighlightScope))
                 {
                     _isLayoutChanged = true;
                 }
@@ -348,7 +384,14 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         {
             if (message.Sender is LyricsStyleSettings)
             {
-                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsFontFamily))
+                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsCJKFontFamily))
+                {
+                    _isLayoutChanged = true;
+                }
+            }
+            if (message.Sender is LyricsStyleSettings)
+            {
+                if (message.PropertyName == nameof(LyricsStyleSettings.LyricsWesternFontFamily))
                 {
                     _isLayoutChanged = true;
                 }
@@ -363,7 +406,7 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                     UpdateColorConfig();
                     UpdateSongInfoFontSize();
-                    
+
                     _isLayoutChanged = true;
                 }
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.Update.cs

@@ -2,6 +2,7 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.WinUI;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Effects;
@@ -55,6 +56,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
         private bool _isAlbumArtSizeChanged = false;
 
         private bool _isSpectrumOverlayEnabledChanged = true;
+        private bool _isFluidOverlayEnabledChanged = true;
+
+        private bool _isLyrics3DMatrixChanged = true;
 
         public void Update(ICanvasAnimatedControl control, CanvasAnimatedUpdateEventArgs args)
         {
@@ -73,27 +77,41 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             //_effect?.Properties["iTime"] = Convert.ToSingle(TotalTime.TotalSeconds);
 
-            if (_effect != null)
+            if (_isFluidOverlayEnabledChanged)
             {
-                var effectTime = Convert.ToSingle(_effect.Properties["iTime"]);
+                if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsFluidOverlayEnabled)
+                {
+                    RecreateFluidEffect(control);
+                }
+                else
+                {
+                    DisposeFluidEffect();
+                }
+
+                _isFluidOverlayEnabledChanged = false;
+            }
+
+            if (_fluidEffect != null)
+            {
+                var effectTime = Convert.ToSingle(_fluidEffect.Properties["iTime"]);
                 effectTime += Convert.ToSingle(_elapsedTime.TotalSeconds);
-                _effect.Properties["iTime"] = effectTime;
+                _fluidEffect.Properties["iTime"] = effectTime;
 
                 if (_albumArtAccentColor1Transition.IsTransitioning)
                 {
-                    _effect.Properties["color1"] = _albumArtAccentColor1Transition.Value.ToVector3RGB();
+                    _fluidEffect.Properties["color1"] = _albumArtAccentColor1Transition.Value.ToVector3RGB();
                 }
                 if (_albumArtAccentColor2Transition.IsTransitioning)
                 {
-                    _effect.Properties["color2"] = _albumArtAccentColor2Transition.Value.ToVector3RGB();
+                    _fluidEffect.Properties["color2"] = _albumArtAccentColor2Transition.Value.ToVector3RGB();
                 }
                 if (_albumArtAccentColor3Transition.IsTransitioning)
                 {
-                    _effect.Properties["color3"] = _albumArtAccentColor3Transition.Value.ToVector3RGB();
+                    _fluidEffect.Properties["color3"] = _albumArtAccentColor3Transition.Value.ToVector3RGB();
                 }
                 if (_albumArtAccentColor4Transition.IsTransitioning)
                 {
-                    _effect.Properties["color4"] = _albumArtAccentColor4Transition.Value.ToVector3RGB();
+                    _fluidEffect.Properties["color4"] = _albumArtAccentColor4Transition.Value.ToVector3RGB();
                 }
             }
 
@@ -163,9 +181,10 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 UpdateSongInfoFontSize();
 
                 _isCoverAcrylicEffectAmountChanged = true;
+                _isLyrics3DMatrixChanged = true;
 
-                _effect?.Properties["Width"] = (float)control.ConvertDipsToPixels((float)_canvasWidth, CanvasDpiRounding.Round);
-                _effect?.Properties["Height"] = (float)control.ConvertDipsToPixels((float)_canvasHeight, CanvasDpiRounding.Round);
+                _fluidEffect?.Properties["Width"] = (float)control.ConvertDipsToPixels((float)_canvasWidth, CanvasDpiRounding.Round);
+                _fluidEffect?.Properties["Height"] = (float)control.ConvertDipsToPixels((float)_canvasHeight, CanvasDpiRounding.Round);
             }
 
             if (_isSongInfoFontSizeChanged || _isSongTitleVisibilityChanged || _isSongArtistsVisibilityChanged)
@@ -274,6 +293,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _isSongInfoFontSizeChanged = false;
                 _isSongTitleVisibilityChanged = false;
                 _isSongArtistsVisibilityChanged = false;
+
+                _isLyrics3DMatrixChanged = true;
             }
 
             // 先重置这两个的变化状态
@@ -387,6 +408,13 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 _maxLyricsWidth = _canvasWidth - _lyricsXTransition.Value - _rightMargin;
                 _maxLyricsWidth = Math.Max(_maxLyricsWidth, 0);
                 _isLayoutChanged = true;
+                _isLyrics3DMatrixChanged = true;
+            }
+
+            if (_isLyrics3DMatrixChanged)
+            {
+                UpdateLyrics3DMatrix();
+                _isLyrics3DMatrixChanged = false;
             }
 
             if (_isLayoutChanged)
@@ -432,6 +460,13 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             _canvasYScrollTransition.Update(_elapsedTime);
         }
 
+        private string AutoSelectFontFamily(string text)
+        {
+            return LanguageHelper.IsCJK(text)
+                    ? _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsCJKFontFamily
+                    : _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsWesternFontFamily;
+        }
+
         private void ReLayout(ICanvasAnimatedControl control)
         {
             if (control == null)
@@ -439,14 +474,23 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             if (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.IsDynamicLyricsFontSize)
             {
-                _lyricsTextFormat.FontSize = (float)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 15, 12, 96);
+                _originalLyricsFontSize = (int)Math.Clamp(Math.Min(_canvasHeight, _canvasWidth) / 15, 12, 96);
+                _translatedLyricsFontSize = _phoneticLyricsFontSize = (int)(_originalLyricsFontSize * 0.6);
             }
             else
             {
-                _lyricsTextFormat.FontSize = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontSize;
+                _phoneticLyricsFontSize = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.PhoneticLyricsFontSize;
+                _originalLyricsFontSize = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.OriginalLyricsFontSize;
+                _translatedLyricsFontSize = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.TranslatedLyricsFontSize;
+            }
+
+            _originalLyricsFontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight;
+
+            if (SongInfo != null)
+            {
+                _titleTextFormat.FontFamily = AutoSelectFontFamily(SongInfo.Title);
+                _artistTextFormat.FontFamily = AutoSelectFontFamily(SongInfo.Artist);
             }
-            _lyricsTextFormat.FontWeight = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontWeight.ToFontWeight();
-            _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontFamily;
 
             _canvasYScrollTransition.SetDuration(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollDuration / 1000.0);
             _canvasYScrollTransition.SetEasingType(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.LyricsScrollEasingType);
@@ -463,16 +507,70 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                     continue;
                 }
 
-                line.Position = new Vector2(0, (float)y);
-                line.RecreateTextLayout(control, _lyricsTextFormat, _maxLyricsWidth, _canvasHeight, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsAlignmentType);
-                line.UpdateCenterPosition(_maxLyricsWidth, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsAlignmentType);
-
+                line.RecreateTextLayout(control,
+                    _settingsService.AppSettings.TranslationSettings.IsChineseRomanizationEnabled || _settingsService.AppSettings.TranslationSettings.IsJapaneseRomanizationEnabled,
+                    _settingsService.AppSettings.TranslationSettings.IsTranslationEnabled,
+                    _phoneticLyricsFontSize, _originalLyricsFontSize, _translatedLyricsFontSize,
+                    _originalLyricsFontWeight,
+                    _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsCJKFontFamily, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsWesternFontFamily,
+                    _maxLyricsWidth, _canvasHeight, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsAlignmentType);
                 line.RecreateTextGeometry();
 
-                y +=
-                    (double)line.CanvasTextLayout!.LayoutBounds.Height
-                    / line.CanvasTextLayout.LineCount
-                    * (line.CanvasTextLayout.LineCount + _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsLineSpacingFactor);
+                // 设定注音文本布局坐标
+                line.PhoneticPosition = new Vector2(0, (float)y);
+
+                // Y += 注音文本布局高度
+                if (line.PhoneticCanvasTextLayout != null)
+                {
+                    y += line.PhoneticCanvasTextLayout.LayoutBounds.Height;
+                }
+
+                // Y += 自定义 倍注音文本行高
+                if (line.PhoneticCanvasTextLayout != null)
+                {
+                    y +=
+                        (double)line.PhoneticCanvasTextLayout.LayoutBounds.Height
+                        / line.PhoneticCanvasTextLayout.LineCount
+                        * 0.1;
+                }
+
+                // 设定原文文本布局坐标
+                line.OriginalPosition = new Vector2(0, (float)y);
+
+                // Y += 原文文本布局高度
+                if (line.OriginalCanvasTextLayout != null)
+                {
+                    y += (double)line.OriginalCanvasTextLayout.LayoutBounds.Height;
+                }
+
+                if (line.TranslatedCanvasTextLayout != null)
+                {
+                    // Y += 自定义 倍翻译文本行高
+                    y +=
+                        (double)line.TranslatedCanvasTextLayout.LayoutBounds.Height
+                        / line.TranslatedCanvasTextLayout.LineCount
+                        * 0.1;
+                }
+
+                // 设定翻译文本布局坐标
+                line.TranslatedPosition = new Vector2(0, (float)y);
+
+                // Y += 翻译文本布局高度
+                if (line.TranslatedCanvasTextLayout != null)
+                {
+                    y += line.TranslatedCanvasTextLayout.LayoutBounds.Height;
+                }
+
+                // Y += 用户自定义倍数原文文本布局高度
+                if (line.OriginalCanvasTextLayout != null)
+                {
+                    y += (double)line.OriginalCanvasTextLayout.LayoutBounds.Height
+                        / line.OriginalCanvasTextLayout.LineCount
+                        * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsLineSpacingFactor;
+                }
+
+                line.UpdateCenterPosition(_maxLyricsWidth, _liveStatesService.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsAlignmentType);
+
             }
         }
 
@@ -488,11 +586,15 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             if (currentPlayingLine == null) return;
 
-            var playingTextLayout = currentPlayingLine?.CanvasTextLayout;
+            var playingTextLayout = currentPlayingLine?.OriginalCanvasTextLayout;
 
             if (playingTextLayout == null) return;
 
-            double? targetYScrollOffset = -currentPlayingLine!.Position.Y + _currentLyricsData?.LyricsLines[0].Position.Y - playingTextLayout.LayoutBounds.Height / 2.0;
+            //double? targetYScrollOffset = -currentPlayingLine!.OriginalPosition.Y + _currentLyricsData?.LyricsLines[0].OriginalPosition.Y - playingTextLayout.LayoutBounds.Height / 2.0;
+            double? targetYScrollOffset =
+                -currentPlayingLine!.OriginalPosition.Y
+                + _currentLyricsData?.LyricsLines[0].OriginalPosition.Y
+                - (currentPlayingLine.TranslatedPosition.Y + (currentPlayingLine.TranslatedCanvasTextLayout?.LayoutBounds.Height ?? 0) - currentPlayingLine.PhoneticPosition.Y) / 2.0;
 
             if (!targetYScrollOffset.HasValue) return;
 
@@ -528,9 +630,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             {
                 int mid = (left + right) / 2;
                 var line = lines[mid];
-                var layout = line.CanvasTextLayout;
+                var layout = line.OriginalCanvasTextLayout;
                 if (layout == null) break;
-                double value = offset + line.Position.Y + (double)layout.LayoutBounds.Height;
+                double value = offset + line.OriginalPosition.Y + (double)layout.LayoutBounds.Height;
                 if (value >= 0)
                 {
                     result = mid;
@@ -551,9 +653,9 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             {
                 int mid = (left + right) / 2;
                 var line = lines[mid];
-                var layout = line.CanvasTextLayout;
+                var layout = line.OriginalCanvasTextLayout;
                 if (layout == null) break;
-                double value = offset + line.Position.Y + (double)layout.LayoutBounds.Height;
+                double value = offset + line.OriginalPosition.Y + (double)layout.LayoutBounds.Height;
                 if (value >= canvasHeight)
                 {
                     result = mid;
@@ -619,11 +721,11 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
             {
                 if (isLight)
                 {
-                    _adaptiveColoredFontColor = _albumArtDarkAccentColors.FirstOrDefault();
+                    _adaptiveColoredFontColor = _albumArtDarkAccentColors.ElementAtOrDefault(0);
                 }
                 else
                 {
-                    _adaptiveColoredFontColor = _albumArtLightAccentColors.FirstOrDefault();
+                    _adaptiveColoredFontColor = _albumArtLightAccentColors.ElementAtOrDefault(0);
                 }
             }
 
@@ -691,12 +793,12 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
                 {
                     int lineCountDelta = i - _playingLineIndex;
                     int absoluteLineCountDelta = Math.Abs(lineCountDelta);
-                    double distanceFromPlayingLine = Math.Abs(line.Position.Y - currentPlayingLine.Position.Y);
+                    double distanceFromPlayingLine = Math.Abs(line.OriginalPosition.Y - currentPlayingLine.OriginalPosition.Y);
                     double distanceFactor = Math.Clamp(distanceFromPlayingLine / (_canvasHeight / 2), 0, 1);
 
                     line.AngleTransition.StartTransition(_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.IsFanLyricsEnabled
                             ? Math.PI
-                                * (30.0 / 180.0)
+                                * (_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.FanLyricsAngle / 180.0)
                                 * distanceFactor
                                 * (i > _playingLineIndex ? 1 : -1)
                             : 0
@@ -798,5 +900,37 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
             _isSongInfoFontSizeChanged = true;
         }
+
+        private void UpdateLyrics3DMatrix()
+        {
+            if (!_liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.Is3DLyricsEnabled) return;
+
+            Vector3 center = new(
+                (float)(_lyricsXTransition.Value + _maxLyricsWidth / 2),
+                (float)(_lyricsYTransition.Value + _canvasHeight / 2),
+                0);
+
+            float rotationX = (float)(Math.PI * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.Lyrics3DXAngle / 180.0);
+            float rotationY = (float)(Math.PI * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.Lyrics3DYAngle / 180.0);
+            float rotationZ = (float)(Math.PI * _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.Lyrics3DZAngle / 180.0);
+
+            Matrix4x4 rotation =
+                Matrix4x4.CreateRotationX(rotationX) *
+                Matrix4x4.CreateRotationY(rotationY) *
+                Matrix4x4.CreateRotationZ(rotationZ);
+            Matrix4x4 perspective = Matrix4x4.Identity;
+            perspective.M34 = 1.0f / _liveStatesService.LiveStates.LyricsWindowStatus.LyricsEffectSettings.Lyrics3DDepth;
+
+            // 组合变换：
+            // 1. 将中心移到原点
+            // 2. 旋转
+            // 3. 应用透视
+            // 4. 将中心移回原位
+            _lyrics3DMatrix =
+                Matrix4x4.CreateTranslation(-center) *
+                rotation *
+                perspective *
+                Matrix4x4.CreateTranslation(center);
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsRendererViewModel/LyricsRendererViewModel.cs

@@ -27,6 +27,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
@@ -133,12 +134,12 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private int _timelineSyncThreshold = 0;
 
-        private CanvasTextFormat _lyricsTextFormat = new()
-        {
-            HorizontalAlignment = CanvasHorizontalAlignment.Left,
-            VerticalAlignment = CanvasVerticalAlignment.Top,
-            FontSize = 12,
-        };
+        private int _phoneticLyricsFontSize = 18;
+        private int _originalLyricsFontSize = 36;
+        private int _translatedLyricsFontSize = 18;
+
+        private LyricsFontWeight _originalLyricsFontWeight = LyricsFontWeight.Bold;
+
         private CanvasTextFormat _titleTextFormat = new()
         {
             FontSize = 18,
@@ -174,6 +175,8 @@ namespace BetterLyrics.WinUI3.ViewModels.LyricsRendererViewModel
 
         private SpectrumAnalyzer? _spectrumAnalyzer;
 
+        private Matrix4x4 _lyrics3DMatrix = Matrix4x4.Identity;
+
         public LyricsRendererViewModel(
             ISettingsService settingsService,
             IMediaSessionsService mediaSessionsService,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs

@@ -36,7 +36,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial LyricsSearchResult? SelectedLyricsSearchResult { get; set; }
 
         [ObservableProperty]
-        public partial LyricsData? LyricsData { get; set; }
+        public partial ObservableCollection<LyricsData>? LyricsDataArr { get; set; }
 
         [ObservableProperty]
         public partial LyricsLine? SelectedLyricsLine { get; set; }
@@ -68,7 +68,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private void InitMappedSongSearchQuery()
         {
             LyricsSearchResults.Clear();
-            LyricsData = null;
+            LyricsDataArr = null;
             if (_mediaSessionsService.SongInfo != null)
             {
                 var found = GetMappedSongSearchQueryFromSettings();
@@ -172,12 +172,15 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (value?.Raw != null)
             {
                 var lyricsParser = new LyricsParser();
-                var lyricsDataArr = lyricsParser.Parse(value?.Raw, (int?)_mediaSessionsService.SongInfo?.DurationMs);
-                LyricsData = lyricsDataArr.FirstOrDefault();
+                lyricsParser.Parse(
+                    MappedSongSearchQuery?.MappedTitle ?? "",
+                    MappedSongSearchQuery?.MappedArtist ?? "",
+                    value?.Raw, (int?)_mediaSessionsService.SongInfo?.DurationMs, value?.Provider);
+                LyricsDataArr = [.. lyricsParser.LyricsDataArr];
             }
             else
             {
-                LyricsData = null;
+                LyricsDataArr = null;
             }
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowSettingsControlViewModel.cs

@@ -56,7 +56,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private void RefreshMonitorDeviceNames()
         {
             MonitorDeviceNames = [.. MonitorHelper.GetAllMonitorDeviceNames()];
-            LiveStates.LyricsWindowStatus.MonitorDeviceName = MonitorHelper.GetPrimaryMonitorDeviceName();
+            LiveStates.LyricsWindowStatus.MonitorDeviceName = MonitorDeviceNames.FirstOrDefault() ?? "";
         }
 
         [RelayCommand]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsWindowViewModel.cs

@@ -70,7 +70,7 @@ namespace BetterLyrics.WinUI3
 
         [ObservableProperty] public partial ElementTheme ThemeType { get; set; } = ElementTheme.Default;
 
-        [ObservableProperty] public partial double TitleBarFontSize { get; set; } = 11;
+        [ObservableProperty] public partial double TitleBarFontSize { get; set; } = 12;
 
         [ObservableProperty] public partial Visibility CloseButtonVisibility { get; set; } = Visibility.Visible;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/PlaybackSettingsControlViewModel.cs

@@ -17,9 +17,11 @@ using Hqub.Lastfm.Entities;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.Globalization;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -56,6 +58,12 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial TranslationSearchProvider? TranslationSearchProvider { get; set; } = null;
 
+        [ObservableProperty]
+        public partial string OriginalLyricsRef { get; set; } = "about:blank";
+
+        [ObservableProperty]
+        public partial string TranslatedLyricsRef { get; set; } = "about:blank";
+
         [ObservableProperty]
         public partial int SelectedTargetLanguageIndex { get; set; }
 
@@ -83,7 +91,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             AppleMusicMediaUserToken = PasswordVaultHelper.Get(Constants.App.AppName, Constants.AppleMusic.MediaUserTokenKey) ?? "";
 
-            SelectedTargetLanguageIndex = LanguageHelper.SupportedTargetLanguages.ToList().FindIndex(x => x.Code == AppSettings.TranslationSettings.SelectedTargetLanguageCode);
+            SelectedTargetLanguageIndex = LanguageHelper.SupportedTranslationTargetLanguages.ToList().FindIndex(x => x.LanguageCode == AppSettings.TranslationSettings.SelectedTargetLanguageCode);
 
             IsLastFMAuthenticated = _lastFMService.IsAuthenticated;
             LastFMUser = _lastFMService.User;
@@ -223,7 +231,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         partial void OnSelectedTargetLanguageIndexChanged(int value)
         {
-            AppSettings.TranslationSettings.SelectedTargetLanguageCode = LanguageHelper.SupportedTargetLanguages[value].Code;
+            AppSettings.TranslationSettings.SelectedTargetLanguageCode = LanguageHelper.SupportedTranslationTargetLanguages[value].LanguageCode;
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsPageViewModel.cs

@@ -2,6 +2,7 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Helper.BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services;
@@ -24,6 +25,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.Services.Store;
+using Windows.Storage;
 using WinRT.Interop;
 
 namespace BetterLyrics.WinUI3.ViewModels
@@ -124,5 +126,27 @@ namespace BetterLyrics.WinUI3.ViewModels
                 App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader?.GetString("ExportSettingsSuccess") ?? "", InfoBarSeverity.Success);
             }
         }
+
+        [RelayCommand]
+        private void ClearCacheFiles()
+        {
+            DirectoryHelper.DeleteAllFiles(PathHelper.LogDirectory);
+
+            DirectoryHelper.DeleteAllFiles(PathHelper.LyricsCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.AmllTtmlDbLyricsCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.KugouLyricsCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.LrcLibLyricsCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.NeteaseLyricsCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.QQLyricsCacheDirectory);
+
+            DirectoryHelper.DeleteAllFiles(PathHelper.TranslationCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.KugouTranslationCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.NeteaseTranslationCacheDirectory);
+            DirectoryHelper.DeleteAllFiles(PathHelper.QQTranslationCacheDirectory);
+
+            DirectoryHelper.DeleteAllFiles(PathHelper.iTunesAlbumArtCacheDirectory);
+
+            App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("ActionCompleted"), InfoBarSeverity.Success);
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml

@@ -5,9 +5,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
     xmlns:canvas="using:Microsoft.Graphics.Canvas.UI.Xaml"
+    xmlns:const="using:BetterLyrics.WinUI3.Constants"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:labs="using:CommunityToolkit.Labs.WinUI.MarqueeTextRns"
     xmlns:local="using:BetterLyrics.WinUI3.Views"
@@ -18,19 +20,25 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid" SizeChanged="RootGrid_SizeChanged" RightTapped="RootGrid_RightTapped">
+    <Grid
+        x:Name="RootGrid"
+        RightTapped="RootGrid_RightTapped"
+        SizeChanged="RootGrid_SizeChanged">
         <!--  Lyrics area  -->
         <renderer:LyricsRenderer />
-        <!--<Image Source="/Assets/Cover.jpg" />-->
+
+        <dev:SnowFlakeEffect FlakeCount="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.SnowFlakeOverlayAmount, Mode=OneWay}" Visibility="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsBackgroundSettings.IsSnowFlakeOverlayEnabled, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
         <!--  No music playing placeholder  -->
         <Grid x:Name="NoMusicPlayingGrid" Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}">
-            <TextBlock
-                x:Uid="MainPageNoMusicPlaying"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                FontFamily="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontFamily, Mode=OneWay}"
-                FontSize="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsFontSize, Mode=OneWay}" />
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                <TextBlock
+                    x:Uid="MainPageNoMusicPlaying"
+                    HorizontalAlignment="Center"
+                    FontFamily="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings.LyricsCJKFontFamily, Mode=OneWay}"
+                    FontSize="{x:Bind ViewModel.LiveStates.LyricsWindowStatus.LyricsStyleSettings.OriginalLyricsFontSize, Mode=OneWay}"
+                    TextWrapping="Wrap" />
+            </StackPanel>
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
@@ -80,6 +88,66 @@
                             <TextBlock Text="{Binding ElementName=TimelineSlider, Path=Maximum, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
                         </StackPanel>
 
+                        <!--  Volume  -->
+                        <Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
+                            <Grid>
+
+                                <!--  Volumn: 0  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel0"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE74F;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+
+                                <!--  Volumn: 1-32  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel1"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE993;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+
+                                <!--  Volumn: 33-65  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel2"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE994;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+
+                                <!--  Volumn: 66-100  -->
+                                <FontIcon
+                                    x:Name="VolumeLevel3"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE995;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+                            </Grid>
+
+                            <Button.ContextFlyout>
+                                <Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
+                                    <uc:ExtendedSlider
+                                        Frequency="10"
+                                        IsSliderEnabled="False"
+                                        Maximum="100"
+                                        Minimum="0"
+                                        ResetButtonVisibility="Collapsed"
+                                        Unit="%"
+                                        ValueChangedByUser="ExtendedSlider_ValueChangedByUser"
+                                        Value="{x:Bind ViewModel.Volume, Mode=TwoWay}" />
+                                </Flyout>
+                            </Button.ContextFlyout>
+                        </Button>
+
                     </StackPanel>
                 </Grid>
 
@@ -147,78 +215,6 @@
                         Orientation="Horizontal"
                         Spacing="3">
 
-                        <!--  Volume  -->
-                        <!--<Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
-                            <Grid>
-
-                        -->
-                        <!--  Volumn: 0  -->
-                        <!--
-                                <FontIcon
-                                    x:Name="VolumeLevel0"
-                                    FontFamily="{StaticResource IconFontFamily}"
-                                    Glyph="&#xE74F;">
-                                    <FontIcon.OpacityTransition>
-                                        <ScalarTransition />
-                                    </FontIcon.OpacityTransition>
-                                </FontIcon>
-
-                        -->
-                        <!--  Volumn: 1-32  -->
-                        <!--
-                                <FontIcon
-                                    x:Name="VolumeLevel1"
-                                    FontFamily="{StaticResource IconFontFamily}"
-                                    Glyph="&#xE993;">
-                                    <FontIcon.OpacityTransition>
-                                        <ScalarTransition />
-                                    </FontIcon.OpacityTransition>
-                                </FontIcon>
-
-                        -->
-                        <!--  Volumn: 33-65  -->
-                        <!--
-                                <FontIcon
-                                    x:Name="VolumeLevel2"
-                                    FontFamily="{StaticResource IconFontFamily}"
-                                    Glyph="&#xE994;">
-                                    <FontIcon.OpacityTransition>
-                                        <ScalarTransition />
-                                    </FontIcon.OpacityTransition>
-                                </FontIcon>
-
-                        -->
-                        <!--  Volumn: 66-100  -->
-                        <!--
-                                <FontIcon
-                                    x:Name="VolumeLevel3"
-                                    FontFamily="{StaticResource IconFontFamily}"
-                                    Glyph="&#xE995;">
-                                    <FontIcon.OpacityTransition>
-                                        <ScalarTransition />
-                                    </FontIcon.OpacityTransition>
-                                </FontIcon>
-                            </Grid>
-                            <Button.ContextFlyout>
-                                <Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
-                                    <StackPanel Orientation="Horizontal">
-                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
-                                        <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.Volume, Mode=OneWay}" />
-                                        <TextBlock Margin="0,0,14,0" VerticalAlignment="Center" />
-                                        <Slider
-                                            Width="150"
-                                            Maximum="100"
-                                            Minimum="0"
-                                            SnapsTo="Ticks"
-                                            StepFrequency="1"
-                                            TickFrequency="1"
-                                            TickPlacement="None"
-                                            Value="{x:Bind ViewModel.Volume, Mode=TwoWay}" />
-                                    </StackPanel>
-                                </Flyout>
-                            </Button.DataContext>
-                        </Button>-->
-
                         <Button
                             Click="LyricsSearchShortcutButton_Click"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -272,7 +268,7 @@
                             x:Name="SettingsButton"
                             Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                  Glyph=&#xF8B0;}"
+                                                  Glyph=&#xE713;}"
                             Style="{StaticResource GhostButtonStyle}">
                             <ToolTipService.ToolTip>
                                 <ToolTip x:Name="SettingsToolTip" x:Uid="LyricsPageSettingsButtonToolTip" />
@@ -312,7 +308,8 @@
                             Margin="0,0,0,2"
                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                             Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.StartMs, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
-                        <TextBlock Margin="0,0,0,2" Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.DisplayedText, Mode=OneWay}" />
+                        <!--  TODO 原文翻译共同显示  -->
+                        <TextBlock Margin="0,0,0,2" Text="{x:Bind ViewModel.TimelineSliderThumbLyricsLine.OriginalText, Mode=OneWay}" />
                     </StackPanel>
                 </Grid>
                 <Grid
@@ -370,7 +367,7 @@
         <uc:SystemTray />
 
         <VisualStateManager.VisualStateGroups>
-            <!--<VisualStateGroup x:Name="VolumeState">
+            <VisualStateGroup x:Name="VolumeState">
                 <VisualState x:Name="Volume0">
                     <VisualState.StateTriggers>
                         <ui:CompareStateTrigger
@@ -427,7 +424,7 @@
                         <Setter Target="VolumeLevel3.Opacity" Value="1" />
                     </VisualState.Setters>
                 </VisualState>
-            </VisualStateGroup>-->
+            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsPage.xaml.cs

@@ -83,10 +83,10 @@ namespace BetterLyrics.WinUI3.Views
             }
         }
 
-        //private void VolumeButton_Click(object sender, RoutedEventArgs e)
-        //{
-        //    VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
-        //}
+        private void VolumeButton_Click(object sender, RoutedEventArgs e)
+        {
+            VolumeFlyout.ShowAt(BottomLeftCommandStackPanel);
+        }
 
         private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
@@ -180,5 +180,10 @@ namespace BetterLyrics.WinUI3.Views
                 BottomCommandFlyout.ShowAt(BottomCommandFlyoutTrigger);
             }
         }
+
+        private void ExtendedSlider_ValueChangedByUser(object sender, Events.ExtendedSliderValueChangedByUserEventArgs e)
+        {
+            SystemVolumeHelper.MasterVolume = ViewModel.Volume;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsSearchWindow.xaml.cs

@@ -33,6 +33,8 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
             AppWindow.SetIcons();
 
+            ExtendsContentIntoTitleBar = true;
+
             AppWindow.Closing += AppWindow_Closing;
 
             SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(Enums.BackdropType.Transparent);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml

@@ -57,6 +57,14 @@
                         </ToolTipService.ToolTip>
                     </Button>
 
+                    <Button
+                        x:Name="SettingsWindowButton"
+                        Click="SettingsWindowButton_Click"
+                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                              FontSize=12,
+                                              Glyph=&#xE713;}"
+                        Style="{StaticResource TitleBarButtonStyle}" />
+
                     <Button Click="LyricsWindowSwitchButton_Click" Style="{StaticResource TitleBarButtonStyle}">
                         <FontIcon
                             FontFamily="{StaticResource IconFontFamily}"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/LyricsWindow.xaml.cs

@@ -23,7 +23,6 @@ namespace BetterLyrics.WinUI3.Views
 {
     public sealed partial class LyricsWindow : Window
     {
-        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
         private readonly ILiveStatesService _liveStatesService = Ioc.Default.GetRequiredService<ILiveStatesService>();
         private readonly WindowMessageMonitor _wmm;
 
@@ -83,6 +82,11 @@ namespace BetterLyrics.WinUI3.Views
 
         private void AppWindow_Changed(AppWindow sender, AppWindowChangedEventArgs args)
         {
+            if (_liveStatesService.LiveStates.IsLyricsWindowStatusRefreshing)
+            {
+                //return;
+            }
+
             if (args.DidPositionChange || args.DidSizeChange)
             {
                 var size = AppWindow.Size;
@@ -95,10 +99,6 @@ namespace BetterLyrics.WinUI3.Views
                 else
                 {
                     _liveStatesService.LiveStates.LyricsWindowStatus.WindowBounds = new Windows.Foundation.Rect(rect.X, rect.Y, size.Width, size.Height);
-                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowX = rect.X;
-                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowY = rect.Y;
-                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowWidth = size.Width;
-                    _liveStatesService.LiveStates.LyricsWindowStatus.WindowHeight = size.Height;
                 }
             }
         }
@@ -132,5 +132,10 @@ namespace BetterLyrics.WinUI3.Views
         {
             WindowHelper.OpenOrShowWindow<LyricsWindowSwitchWindow>();
         }
+
+        private void SettingsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<SettingsWindow>();
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml

@@ -12,6 +12,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:media="using:CommunityToolkit.WinUI.Media"
     xmlns:models="using:BetterLyrics.WinUI3.Models"
+    xmlns:muxm="using:Microsoft.UI.Xaml.Media"
     xmlns:templateselector="using:BetterLyrics.WinUI3.TemplateSelector"
     xmlns:ui="using:CommunityToolkit.WinUI"
     Unloaded="Page_Unloaded"
@@ -92,18 +93,11 @@
                     </Flyout>
                 </Grid.Tag>
 
-                <ListView
+                <Pivot
                     VerticalAlignment="Top"
                     ItemsSource="{x:Bind ViewModel.SongsTabInfoList, Mode=OneWay}"
-                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
                     SelectedIndex="{x:Bind ViewModel.SelectedSongsTabInfoIndex, Mode=TwoWay}">
-                    <ListView.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <ItemsStackPanel Orientation="Horizontal" />
-                        </ItemsPanelTemplate>
-                    </ListView.ItemsPanel>
-                    <ListView.ItemTemplate>
+                    <Pivot.HeaderTemplate>
                         <DataTemplate x:DataType="models:SongsTabInfo">
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -123,11 +117,12 @@
                                         Grid.Column="0"
                                         FontFamily="{StaticResource IconFontFamily}"
                                         FontSize="16"
-                                        Glyph="{Binding Icon}" />
+                                        Glyph="{x:Bind Icon}" />
                                     <TextBlock
                                         Grid.Column="1"
                                         VerticalAlignment="Center"
-                                        Text="{Binding Name}" />
+                                        Style="{StaticResource BodyTextBlockStyle}"
+                                        Text="{x:Bind Name}" />
                                 </Grid>
                                 <Button
                                     Grid.Column="1"
@@ -137,13 +132,16 @@
                                                           Glyph=&#xE8BB;}"
                                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                     Style="{StaticResource GhostButtonStyle}"
-                                    Visibility="{Binding IsClosable, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                    Visibility="{x:Bind IsClosable, Converter={StaticResource BoolToVisibilityConverter}}" />
                             </Grid>
                         </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
+                    </Pivot.HeaderTemplate>
+                    <Pivot.ItemTemplate>
+                        <DataTemplate />
+                    </Pivot.ItemTemplate>
+                </Pivot>
 
-                <Grid Margin="0,48,0,0" VerticalAlignment="Top">
+                <Grid Margin="0,56,0,0" VerticalAlignment="Top">
                     <AutoSuggestBox
                         x:Name="SongSearchBox"
                         x:Uid="MusicGalleryPageSongSearchBox"
@@ -156,7 +154,7 @@
                     <StackPanel
                         HorizontalAlignment="Left"
                         Orientation="Horizontal"
-                        Spacing="12">
+                        Spacing="6">
                         <ToggleButton
                             x:Name="SelectAllToggleButton"
                             x:Uid="MusicGalleryPageSelectAll"
@@ -181,7 +179,7 @@
                     <StackPanel
                         HorizontalAlignment="Right"
                         Orientation="Horizontal"
-                        Spacing="12">
+                        Spacing="6">
                         <StackPanel Orientation="Horizontal" Spacing="12">
                             <TextBlock
                                 x:Uid="MusicGalleryPageSortType"
@@ -208,56 +206,68 @@
                             SelectionMode="Multiple">
                             <ListView.ItemTemplate>
                                 <DataTemplate x:DataType="atl:Track">
-                                    <Grid Padding="12" RightTapped="SongListViewItemGrid_RightTapped">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="2*" />
-                                            <ColumnDefinition Width="1.5*" />
-                                            <ColumnDefinition Width="1.5*" />
-                                            <ColumnDefinition Width="1*" />
-                                            <ColumnDefinition Width="1*" />
-                                        </Grid.ColumnDefinitions>
+                                    <Grid RightTapped="SongListViewItemGrid_RightTapped">
 
-                                        <!--  歌曲名  -->
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            VerticalAlignment="Center"
-                                            Text="{Binding Title}"
-                                            TextWrapping="Wrap" />
+                                        <Grid
+                                            x:Name="SongListViewItemContentGrid"
+                                            Padding="12"
+                                            ColumnSpacing="12">
 
-                                        <!--  歌手名  -->
-                                        <HyperlinkButton
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Click="ArtistHyperlibkButton_Click"
-                                            Tag="{Binding Artist}">
-                                            <TextBlock Text="{Binding Artist}" TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="0.5*" />
+                                                <ColumnDefinition Width="2*" />
+                                                <ColumnDefinition Width="1.5*" />
+                                                <ColumnDefinition Width="1.5*" />
+                                                <ColumnDefinition Width="1*" />
+                                                <ColumnDefinition Width="1*" />
+                                            </Grid.ColumnDefinitions>
 
-                                        <!--  专辑名  -->
-                                        <HyperlinkButton
-                                            Grid.Column="2"
-                                            VerticalAlignment="Center"
-                                            Click="AlbumHyperlibkButton_Click"
-                                            Tag="{Binding Album}">
-                                            <TextBlock Text="{Binding Album}" TextWrapping="Wrap" />
-                                        </HyperlinkButton>
+                                            <Grid Grid.Column="0" CornerRadius="6">
+                                                <Image Source="{Binding EmbeddedPictures[0].PictureData, Mode=OneWay, Converter={StaticResource ByteArrayToImageConverter}}" Stretch="UniformToFill" />
+                                            </Grid>
 
-                                        <!--  年份  -->
-                                        <TextBlock
-                                            Grid.Column="3"
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Year}"
-                                            TextWrapping="Wrap" />
+                                            <!--  歌曲名  -->
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding Title}"
+                                                TextWrapping="Wrap" />
 
-                                        <!--  歌曲时长  -->
-                                        <TextBlock
-                                            Grid.Column="4"
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
-                                            TextAlignment="Right"
-                                            TextWrapping="Wrap" />
+                                            <!--  歌手名  -->
+                                            <HyperlinkButton
+                                                Grid.Column="2"
+                                                VerticalAlignment="Center"
+                                                Click="ArtistHyperlibkButton_Click"
+                                                Tag="{Binding Artist}">
+                                                <TextBlock Text="{Binding Artist}" TextWrapping="Wrap" />
+                                            </HyperlinkButton>
+
+                                            <!--  专辑名  -->
+                                            <HyperlinkButton
+                                                Grid.Column="3"
+                                                VerticalAlignment="Center"
+                                                Click="AlbumHyperlibkButton_Click"
+                                                Tag="{Binding Album}">
+                                                <TextBlock Text="{Binding Album}" TextWrapping="Wrap" />
+                                            </HyperlinkButton>
+
+                                            <!--  年份  -->
+                                            <TextBlock
+                                                Grid.Column="4"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Year}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  歌曲时长  -->
+                                            <TextBlock
+                                                Grid.Column="5"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
+                                                TextAlignment="Right"
+                                                TextWrapping="Wrap" />
+                                        </Grid>
                                     </Grid>
                                 </DataTemplate>
                             </ListView.ItemTemplate>
@@ -320,7 +330,7 @@
                 Grid.Column="1"
                 Margin="0,0,12,0">
 
-                <StackPanel Margin="0,10,0,0" Spacing="12">
+                <StackPanel Margin="0,10,0,0" Spacing="6">
                     <Grid Margin="0,6,0,0" VerticalAlignment="Top">
                         <TextBlock x:Uid="MusicGalleryPagePlayingQueue" Style="{StaticResource BodyStrongTextBlockStyle}" />
                         <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
@@ -329,7 +339,7 @@
                             <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TrackPlayingQueue.Count, Mode=OneWay}" />
                         </StackPanel>
                     </Grid>
-                    <StackPanel Orientation="Horizontal" Spacing="12">
+                    <StackPanel Orientation="Horizontal" Spacing="6">
                         <Button x:Uid="MusicGalleryPageEmptyPlayingQueue" Click="EmptyPlayingQueueButton_Click" />
                         <Button x:Uid="MusicGalleryPageScrollToPlayingItem" Click="ScrollToPlayingItemButton_Click" />
                     </StackPanel>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml

@@ -6,13 +6,34 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:BetterLyrics.WinUI3.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="MusicGalleryWindow"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Window.SystemBackdrop>
-        <MicaBackdrop />
+        <DesktopAcrylicBackdrop />
     </Window.SystemBackdrop>
 
-    <local:MusicGalleryPage />
+    <Grid>
+
+        <local:MusicGalleryPage Margin="0,40,0,0" />
+
+        <StackPanel VerticalAlignment="Top" Orientation="Horizontal">
+            <Button
+                x:Name="LyricsWindowButton"
+                Click="LyricsWindowButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE90B;}"
+                Style="{StaticResource TitleBarButtonStyle}" />
+            <Button
+                x:Name="SettingsWindowButton"
+                Click="SettingsWindowButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE713;}"
+                Style="{StaticResource TitleBarButtonStyle}" />
+        </StackPanel>
+
+    </Grid>
 
 </Window>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryWindow.xaml.cs

@@ -34,6 +34,8 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
             AppWindow.SetIcons();
 
+            ExtendsContentIntoTitleBar = true;
+
             AppWindow.Closing += AppWindow_Closing;
         }
 
@@ -41,5 +43,15 @@ namespace BetterLyrics.WinUI3.Views
         {
             WindowHelper.CloseWindow<MusicGalleryWindow>();
         }
+
+        private void LyricsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+        }
+
+        private void SettingsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<SettingsWindow>();
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsPage.xaml

@@ -122,10 +122,14 @@
                                     <controls:SettingsExpander.Items>
 
                                         <controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
-                                            <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                                <HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.GitHubUrl}" />
-                                                <HyperlinkButton x:Uid="SettingsPageFAQ" NavigateUri="{x:Bind const:Link.FAQUrl}" />
+                                            <StackPanel Spacing="6">
+                                                <TextBlock x:Uid="SetingsPageInstructions" />
+                                                <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
+                                                    <HyperlinkButton Content="GitHub" NavigateUri="{x:Bind const:Link.GitHubUrl}" />
+                                                    <HyperlinkButton Content="Wiki" NavigateUri="{x:Bind const:Link.WikiUrl}" />
+                                                </StackPanel>
                                             </StackPanel>
+
                                         </controls:SettingsCard>
 
                                         <controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
@@ -201,7 +205,7 @@
                                         </controls:SettingsCard>
 
                                     </controls:SettingsExpander.Items>
-                                    <controls:SettingsExpander.ItemsHeader>
+                                    <controls:SettingsExpander.ItemsFooter>
                                         <InfoBar
                                             x:Uid="SettingsPageDisclaimer"
                                             BorderThickness="0"
@@ -209,16 +213,21 @@
                                             IsClosable="False"
                                             IsOpen="True"
                                             Severity="Warning" />
-                                    </controls:SettingsExpander.ItemsHeader>
+                                    </controls:SettingsExpander.ItemsFooter>
                                 </controls:SettingsExpander>
 
                                 <controls:SettingsCard x:Uid="SettingsPageMockMusicPlaying">
                                     <HyperlinkButton x:Uid="SettingsPagePlayingMockMusicButton" NavigateUri="https://soundcloud.com/carlyraejepsen/cut-to-the-feeling" />
                                 </controls:SettingsCard>
 
-                                <controls:SettingsCard x:Uid="SettingsPageCache">
+                                <controls:SettingsExpander x:Uid="SettingsPageCache" IsExpanded="True">
                                     <Button x:Uid="SettingsPageOpenFolderButton" Command="{x:Bind ViewModel.OpenCacheFolderCommand}" />
-                                </controls:SettingsCard>
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard>
+                                            <Button x:Uid="SettingsPageClearCache" Command="{x:Bind ViewModel.ClearCacheFilesCommand}" />
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
 
                                 <controls:SettingsCard x:Uid="SettingsPageSettings">
                                     <Button x:Uid="SettingsPageOpenFolderButton" Command="{x:Bind ViewModel.OpenSettingsFolderCommand}" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml

@@ -7,14 +7,35 @@
     xmlns:local="using:BetterLyrics.WinUI3.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:scontrols="using:ShadowViewer.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Window.SystemBackdrop>
-        <MicaBackdrop />
+        <DesktopAcrylicBackdrop />
     </Window.SystemBackdrop>
 
     <Grid x:Name="RootGrid">
-        <Frame x:Name="RootFrame" />
+        <Frame x:Name="RootFrame" Margin="0,40,0,0" />
+
+        <StackPanel VerticalAlignment="Top" Orientation="Horizontal">
+            <Button
+                x:Name="LyricsWindowButton"
+                Click="LyricsWindowButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE90B;}"
+                Style="{StaticResource TitleBarButtonStyle}" />
+            <Button
+                Click="MusicGalleryButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      FontSize=12,
+                                      Glyph=&#xE8F1;}"
+                Style="{StaticResource TitleBarButtonStyle}">
+                <ToolTipService.ToolTip>
+                    <ToolTip x:Uid="HostWindowMusicGalleryButtonToolTip" />
+                </ToolTipService.ToolTip>
+            </Button>
+        </StackPanel>
 
         <scontrols:NotificationPanel
             x:Name="TipContainerCenter"

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/SettingsWindow.xaml.cs

@@ -18,6 +18,8 @@ namespace BetterLyrics.WinUI3.Views
             AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
             AppWindow.SetIcons();
 
+            ExtendsContentIntoTitleBar = true;
+
             AppWindow.Closing += AppWindow_Closing;
 
             RootFrame.Navigate(typeof(SettingsPage));
@@ -32,5 +34,15 @@ namespace BetterLyrics.WinUI3.Views
         {
             App.Current.SettingsWindowNotificationPanel = TipContainerCenter;
         }
+
+        private void LyricsWindowButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+        }
+
+        private void MusicGalleryButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenOrShowWindow<MusicGalleryWindow>();
+        }
     }
 }

FAQ/index.md

@@ -1,40 +1,63 @@
 # Welcome to BetterLyrics
 
-### Where I can find the logs?
+### 🤔 Where can I find the logs?
 `%LocalAppData%\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\logs`
 
-### Where I can find the lyrics cache?
+### 🤔 Where can I find the lyrics cache?
 `%LocalAppData%\Packages\37412.BetterLyrics_rd1g0rsrrtxw8\LocalCache\lyrics`
 
-### How to add more modes?
+### 🤔 I cannot see any buttons.
 
-If this is the first time that you use this app, only standard mode was initially added for you. To add more modes, follow the steps below:
+By default, the top command bar and the bottom command bar (playback control panel) are automatically hidden when your mouse is out of those areas. Just hover your mouse back to those areas to show them again.
+
+### 🤔 No music is playing now. What should I do?
+
+Some of the players need additional config, check out **Multiple Music Players Supported** under [this](https://github.com/jayfunc/BetterLyrics/blob/dev/README.md#-highlighted-features) section.
+
+### 🤔 How to add more modes?
+
+If this is the first time that you use this app, only the standard mode was initially added for you. To add more modes, follow the steps below:
 
 Settings -> Lyrics window manager -> Create from templates -> Fullscreen mode
 
 ![](PixPin_2025-10-24_18-06-32.gif)
 
-### How to switch modes
+### 🤔 How to switch modes?
 
-You can switch modes by pressing default shortcuts `Ctrl + Alt + S` and then choosing one of the modes displayed on your screen. (Press `Escape` to close the choosing window)
+You can switch modes by pressing the default shortcuts `Ctrl + Alt + S` and then choosing one of the modes displayed on your screen. (Press `Escape` to close the choosing window)
 
 ![](PixPin_2025-10-24_18-07-45.gif)
 
-### How to install ".msixbundle" package? (for test package only)
-[See this doc](https://github.com/jayfunc/BetterLyrics/blob/dev/How2Install/How2Install.md)
+### 🤔 How to move and resize the window? I cannot touch the window.
 
-### Lyrics are moving back and forth constantly, how to fix it?
+If you are not able to select and move the window, make sure that you have both:
+
+- Disabled `Click-through` in `Advanced settings` in `Lyrics window manager`.
+- Selected **_other than_** `None` in `Draggable area` in `General` in `Lyrics window manager`.
+
+> Click-through ensure that all mouse activity will go through a pinned widget and straight to the underlying game or application - [Microsoft Learn](https://learn.microsoft.com/en-us/gaming/game-bar/guide/click-through)
+
+Alternatively, you can skip the steps above and directly adjust window position and size in `General` in  `Lyrics window manager`. See the clip below.
+
+![](PixPin_2025-10-25_09-08-47.gif)
+
+### 🤔 How to install ".msixbundle" package? (for test package only)
+[See this doc](https://github.com/jayfunc/BetterLyrics/blob/dev/Sideloadly/index.md)
+
+### 🤔 Lyrics are moving back and forth constantly.
 ![](Snipaste_2025-08-22_14-59-53.png)
 
 Go to Settings > Playback sources > Disable "Lyrics timeline sync" or increase "Lyrics timeline sync threshold"
 
-### Wrong lyrics are shown, how to fix it?
+### 🤔 Wrong lyrics are shown.
 ![](image.png)
 
-Open search panel to manually search for the correct lyrics.
+Open the search panel to manually search for the correct lyrics.
 
-### Playback control panel is not showing in dock mode, how to fix it?
+### 🤔 Bottom command bar (playback control panel) is hidden?
+
+By default, the playback control panel at the bottom is hidden automatically when your mouse is out of that area. 
 
 ![](Snipaste_2025-08-22_14-50-16.png)
 
-Hover over the bottom of the lyrics window and click on the white line to show the playback control panel.
+But when the window size is too small to place that panel, only hovering over the bottom of the lyrics window and clicking on the white line can the playback control panel be displayed, or just right-click on the inner side of the window.

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Zhe Fang
+Copyright (c) 2025 Zhe Fang and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,15 +1,23 @@
-[_Click here to view frequently asked questions (FAQ)_](https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/index.md)
-
 ![](Promotion/banner.png)
 
 <div align=center>
-  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="64">
+  <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="" width="96">
 </div>
 
 <h2 align=center>
 BetterLyrics
 </h2>
 
+<h4 align="center">
+Your dynamic lyrics display tool, built with WinUI 3 and Win2D, works with in-app playback and other players
+</h4>
+
+<div align="center">
+
+[**_Click here to view wiki_**](https://github.com/jayfunc/BetterLyrics/wiki)
+	
+</div>
+
 <div align=center>
 
 ![Static Badge](https://img.shields.io/badge/Language-C%23-purple) ![Static Badge](https://img.shields.io/badge/License-MIT-red) ![Static Badge](https://img.shields.io/badge/IDE-Visual%20Studio-purple) ![Static Badge](https://img.shields.io/badge/Framework-WinUI%203-blue)
@@ -22,10 +30,6 @@ BetterLyrics
 
 </div>
 
-<h4 align="center">
-Your dynamic lyrics display tool, built with WinUI 3 and Win2D, works with local playback and other players
-</h3>
-
 ## 🎉 This project was featured by SSPAI!
 
 Check out the article: [BetterLyrics – An immersive and smooth lyrics display tool designed for Windows](https://sspai.com/post/101028)
@@ -37,7 +41,12 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 ## 🌟 Highlighted features
 
 - 🌠 **Pleasing User Interface**
-  - Fluent animations and effects
+  - Smooth and highly personalized style, animations and effects
+    - Immersive fluid background
+    - Perspective/fan-shaped lyrics
+    - Snowflake effect
+    - Multiple lyrics scrolling functions
+    - ... (and more)
 - ↔️ **Strong Lyrics Translation**
   - Offline machine translation (supporting 30+ languages)
   - Auto-reading local lyrics files for embedded translation
@@ -60,108 +69,33 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
  
 - 🎶 **Multiple Music Players Supported**
 
-  - <details><summary>网易云音乐</summary>
-
-    - Please make sure that you have the latest version (3.1.20+) of 网易云音乐 installed on your PC.
-    - Install the [BetterNCM plugin](https://microblock.cc/betterncm) first
-    - After that, install the [InfLink-rs](https://github.com/apoint123/inflink-rs) plugin in PluginMarket. After the installation is complete, please restart 网易云音乐. At this point, all preparatory operations have been completed. Enjoy it!
-
-    </details>
-
-  - <details><summary>⚠️ 酷狗音乐</summary>
-
-    - Please make sure that the 酷狗音乐 setting "Support system playback controls, such as lock screen interface" is turned on
-    - No timeline information broadcast, which means when you change the timeline position in Kugou Music, BetterLyrics has no way to detect this change
-    - ⚠️ Please note that there are issues with the timeline due to Kugou itself
-
-    </details>
-
-  - <details><summary>⚠️ foobar2000</summary>
-
-    - Make sure you have https://github.com/dumbie/foo_mediacontrol installed with it
-    - ⚠️ Please note that there are issues with the timeline due to a plugin issue
-
-    </details>
-
-  - Apple Music
-  - Spotify
-  - PotPlayer
-  - Media Player (System)
-
-  - <details><summary>QQ 音乐</summary>
-
-    - Please keep it at the latest version
-    - Then open Settings in QQ 音乐, enable "Show System Media Transport Controls (SMTC)".
-
-    </details>
-
-  - <details><summary>LX Music</summary>
-
-    - Please make sure you have enabled "Open API" in LX Music settings page
-    - Then open BetterLyrics, go to settings, go to "Playback sources", input your LX Music server address (mostly like http://127.0.0.1:23330) and there you go!
-
-    </details>
-
-  - <details><summary>MusicBee</summary>
-
-    - Please install https://github.com/HenryPDT/mb_MediaControl before using
-
-    </details>
-
-  - <details><summary>iTunes</summary>
-
-    - Please install https://github.com/thewizrd/iTunes-SMTC before using
-
-    </details>
-
-  - <details><summary>AIMP</summary>
-
-    - Please install https://www.aimp.ru/?do=catalog&rec_id=1097 before using
-
-    </details>
+  - Check it out [here](https://github.com/jayfunc/BetterLyrics/wiki/Known-supported-music-players-(configuration-guidance)) for detailed info
 
 - 🪟 **Multiple Display Modes**
   - **Standard Mode**
     - Enjoy an immersive listening journey with rich lyrics, animations and beautifully dynamic backgrounds
-  - **Dock Mode**
+  - **Docked Mode**
     - A smart animated lyrics bar docked to your screen edge
   - **Desktop Mode**
     - Enjoy immersive lyrics floating above your apps
+  - **And More...**
+    - Waiting for you to discover... 
 - 🧠 **Smart Behaviors**
   - Auto hide when music paused
 
-> This project is still under development, bugs and unexpected behaviours may exist in the latest branch.
-
 ## Screenshots
 
-### Standard mode
-
-![alt text](Screenshots/std.png)
-
-### Narrow mode
-
-![alt text](Screenshots/std-narrow.png)
-
-### Fullscreen mode
+![](Screenshots/fs2.png)
+![](Screenshots/std.png)
+![](Screenshots/narrow.png)
+![](Screenshots/Snipaste_2025-10-31_19-23-17.png)
+![](Screenshots/Snipaste_2025-10-31_19-27-34.png)
+![](Screenshots/dock.png)
+![](Screenshots/desktop.png)
 
 > ⚠️ Due to GIF format and frame rate limitations, the displayed effect is for preview only. Please refer to the actual device for the actual effect.
 
 ![](Screenshots/PixPin_2025-10-24_18-13-44.gif)
-
-![alt text](Screenshots/std-fullscreen.png)
-
-### Docked mode
-
-![alt text](Screenshots/dock.png)
-
-### Desktop mode
-
-![alt text](Screenshots/desktop.png)
-
-### Song switching animation
-
-> ⚠️ Due to GIF format and frame rate limitations, the displayed effect is for preview only. Please refer to the actual device for the actual effect.
-
 ![](Screenshots/PixPin_2025-10-24_18-17-17.gif)
 
 ## Demonstration
@@ -170,8 +104,6 @@ Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bi
 
 ## Try it now
 
-### Microsoft Store (Latest version)
-
 <a href="https://apps.microsoft.com/detail/9P1WCD1P597R?referrer=appbadge&mode=direct">
 	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
 </a>
@@ -180,19 +112,7 @@ Watch our demo video (uploaded on 21 Oct 2025) on Bilibili [here](https://www.bi
 
 ☕ If you find it useful, please consider [donating](#donations) or purchasing 🧧 it in **Microsoft Store**, I'll appreciate it! 🥰
 
-### Unable to download from the MS Store? (Alternative way to download from MS Store, latest version too)
-
-1. Visit https://store.rg-adguard.net/
-2. Type https://apps.microsoft.com/detail/9p1wcd1p597r in the link input area
-3. Select Retail from the drop-down list
-4. Click the check mark
-5. Select the largest installation package in the resulting list to download and install. If you fail to install, try to install the dependency packages first.
-
-### Unable to launch the app?
-
-If you are using a third-party modified Windows, you probably can not launch the app.
-
-To solve this issue, please try to download from Google Drive (see [release](https://github.com/jayfunc/BetterLyrics/releases/latest) for the download link) and follow the instructions [here](https://github.com/jayfunc/BetterLyrics/blob/dev/Sideloadly/index.md).
+Having trouble downloading and installing from the MS Store? See the alternative way to install it [here](https://github.com/jayfunc/BetterLyrics/wiki/Alternative-way-to-download-and-install). 
 
 ## Build
 
@@ -200,26 +120,24 @@ Before you build, make sure that you have already replaced `BetterLyrics\BetterL
 
 ## 💖 Many thanks to
 
-- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - Provide lyrics fetch, decryption, and parsing for QQ, Netease, and Kugou sources
-- [lrclib](https://github.com/tranxuanthang/lrclib)
-  - LRCLIB lyrics API provider
-- [Manzana-Apple-Music-Lyrics](https://github.com/dropcreations/Manzana-Apple-Music-Lyrics)
-  - Apple Music lyrics fetch using Python
-- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
-  - Used for extracting pictures from music files
-- [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - Provide easy ways to access the Win32 API regarding windowing
-- [TagLib#](https://github.com/mono/taglib-sharp)
-  - Used for reading the original lyrics content
-- [Vanara](https://github.com/dahall/Vanara)
-  - Win32 API wrapper
-- [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate)
-  - Provide the ability for offline lyrics translation
-- [Isolation](https://github.com/Storyteller-Studios/Isolation)
-  - Dynamic fluid background implementation
+| Projects/Packages | Description |
+| :--- | :--- |
+| [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper) | Provide lyrics fetch, decryption, and parsing for QQ, Netease, and Kugou sources |
+| [lrclib](https://github.com/tranxuanthang/lrclib) | LRCLIB lyrics API provider |
+| [Manzana-Apple-Music-Lyrics](https://github.com/dropcreations/Manzana-Apple-Music-Lyrics) | Apple Music lyrics fetch using Python |
+| [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet) | Used for extracting pictures from music files |
+| [WinUIEx](https://github.com/dotMorten/WinUIEx) | Provide easy ways to access the Win32 API regarding windowing |
+| [TagLib#](https://github.com/mono/taglib-sharp) | Used for reading the original lyrics content |
+| [Vanara](https://github.com/dahall/Vanara) | Win32 API wrapper |
+| [LibreTranslate](https://github.com/LibreTranslate/LibreTranslate) | Provide the ability for offline lyrics translation |
+| [Isolation](https://github.com/Storyteller-Studios/Isolation) | Dynamic fluid background implementation |
+| [SpectrumVisualization](https://github.com/Johnwikix/SpectrumVisualization) | Audio visualization reference |
+| [DevWinUI](https://github.com/ghost1372/DevWinUI) | Provide many out-of-the-box features for building WinUI 3 applications |
+| ... | ... |
+ 
+### Tutorials/Blogs/etc.
+
 - [Stackoverflow - How to animate Margin property in WPF](https://stackoverflow.com/a/21542882/11048731)
-- [DevWinUI](https://github.com/ghost1372/DevWinUI)
 - [Bilibili -【WinUI3】SystemBackdropController：定义云母、亚克力效果](https://www.bilibili.com/video/BV1PY4FevEkS)
 - [cnblogs - .NET App 与 Windows 系统媒体控制(SMTC)交互](https://www.cnblogs.com/TwilightLemon/p/18279496)
 - [Win2D 中的游戏循环：CanvasAnimatedControl](https://www.cnblogs.com/walterlv/p/10236395.html)
@@ -235,14 +153,15 @@ Before you build, make sure that you have already replaced `BetterLyrics\BetterL
 
 ## ✍️ Help us translate into your language
 
-Cannot find your language?
-Don't worry! Start translating and become one of the contributors! 😆
+Cannot find your language? Or have better translations? Don't worry! Start translating and becoming one of the contributors! 😆
 
-Fork this project and navigate to `BetterLyrics\BetterLyrics.WinUI3\BetterLyrics.WinUI3\Strings\` then open any `.resw` file to start contributing!
+Visit https://crowdin.com/project/betterlyrics/invite?h=c9bfb28fce061484883c0891e7a26f9b2592556 to accept the invitation and become a valuable translator now!
 
 ## Star history
 
-[![](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
+<div style="display: flex; justify-content: space-around; align-items: flex-start;">
+  <img src="https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date" width="100%" >
+</div>
 
 ## Any issues and PRs are welcome