Merge pull request #72 from jayfunc/dev

v1.0.32.0

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

@@ -0,0 +1,27 @@
+name: Notify Telegram on GitHub Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send release info to Telegram
+        env:
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+          RELEASE_URL: ${{ github.event.release.html_url }}
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
+          RELEASE_NAME: ${{ github.event.release.name }}
+          RELEASE_BODY: ${{ github.event.release.body }}
+        run: |
+          TEXT="🚀 *New Release:* ${RELEASE_TAG} - ${RELEASE_NAME}%0A"
+          TEXT+="📝 *Description:*%0A${RELEASE_BODY}%0A"
+          TEXT+="🔗 [View on GitHub](${RELEASE_URL})"
+
+          curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
+               -d chat_id="${CHAT_ID}" \
+               -d text="${TEXT}" \
+               -d parse_mode=Markdown

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

@@ -1,3 +1,5 @@
+name: Notify Discord on GitHub Release
+
 on:
   release:
     types: [published]

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.30.0" />
+	  Version="1.0.32.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -48,6 +48,7 @@
             <converter:IntToCornerRadius x:Key="IntToCornerRadius" />
             <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
+            <converter:TranslationSearchProviderToDisplayNameConverter x:Key="TranslationSearchProviderToDisplayNameConverter" />
             <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
             <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -102,7 +103,7 @@
             </Style>
 
             <Style x:Key="GhostSliderStyle" TargetType="Slider">
-                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                <Setter Property="Background" Value="{ThemeResource ControlStrokeColorOnAccentDefaultBrush}" />
                 <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
                 <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
                 <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
@@ -285,190 +286,6 @@
                 </Setter>
             </Style>
 
-            <Style x:Key="TransparentSliderStyle" TargetType="Slider">
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
-                <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-                <Setter Property="ManipulationMode" Value="None" />
-                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-                <Setter Property="FocusVisualMargin" Value="-7,0,-7,0" />
-                <Setter Property="IsFocusEngagementEnabled" Value="True" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Slider">
-                            <Grid Margin="{TemplateBinding Padding}">
-                                <Grid.Resources>
-                                    <Style x:Key="SliderThumbStyle" TargetType="Thumb">
-                                        <Setter Property="BorderThickness" Value="0" />
-                                        <Setter Property="Background" Value="Transparent" />
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate TargetType="Thumb">
-                                                    <Border
-                                                        Background="{TemplateBinding Background}"
-                                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                                        CornerRadius="0,1,1,0" />
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </Grid.Resources>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
-                                <ContentPresenter
-                                    x:Name="HeaderContentPresenter"
-                                    Grid.Row="0"
-                                    Margin="{ThemeResource SliderTopHeaderMargin}"
-                                    x:DeferLoadStrategy="Lazy"
-                                    Content="{TemplateBinding Header}"
-                                    ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                    FontWeight="{ThemeResource SliderHeaderThemeFontWeight}"
-                                    Foreground="{ThemeResource SliderHeaderForeground}"
-                                    TextWrapping="Wrap"
-                                    Visibility="Collapsed" />
-                                <Grid
-                                    x:Name="SliderContainer"
-                                    Grid.Row="1"
-                                    Background="{ThemeResource SliderContainerBackground}"
-                                    Control.IsTemplateFocusTarget="True">
-                                    <Grid x:Name="HorizontalTemplate" MinHeight="{ThemeResource SliderHorizontalHeight}">
-
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="{ThemeResource SliderPreContentMargin}" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="{ThemeResource SliderPostContentMargin}" />
-                                        </Grid.RowDefinitions>
-                                        <Rectangle
-                                            x:Name="HorizontalTrackRect"
-                                            Grid.Row="1"
-                                            Grid.ColumnSpan="3"
-                                            Height="8"
-                                            Fill="Transparent" />
-                                        <Rectangle
-                                            x:Name="HorizontalDecreaseRect"
-                                            Grid.Row="1"
-                                            Fill="Transparent" />
-                                        <TickBar
-                                            x:Name="TopTickBar"
-                                            Grid.ColumnSpan="3"
-                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
-                                            Margin="0,0,0,4"
-                                            VerticalAlignment="Bottom"
-                                            Fill="{ThemeResource SliderTickBarFill}"
-                                            Visibility="Collapsed" />
-                                        <TickBar
-                                            x:Name="HorizontalInlineTickBar"
-                                            Grid.Row="1"
-                                            Grid.ColumnSpan="3"
-                                            Height="8"
-                                            Fill="{ThemeResource SliderInlineTickBarFill}"
-                                            Visibility="Collapsed" />
-                                        <TickBar
-                                            x:Name="BottomTickBar"
-                                            Grid.Row="2"
-                                            Grid.ColumnSpan="3"
-                                            Height="{ThemeResource SliderOutsideTickBarThemeHeight}"
-                                            Margin="0,4,0,0"
-                                            VerticalAlignment="Top"
-                                            Fill="{ThemeResource SliderTickBarFill}"
-                                            Visibility="Collapsed" />
-                                        <Thumb
-                                            x:Name="HorizontalThumb"
-                                            Grid.Row="0"
-                                            Grid.RowSpan="3"
-                                            Grid.Column="1"
-                                            Width="8"
-                                            Height="8"
-                                            AutomationProperties.AccessibilityView="Raw"
-                                            DataContext="{TemplateBinding Value}"
-                                            FocusVisualMargin="-14,-6,-14,-6"
-                                            Style="{StaticResource SliderThumbStyle}" />
-                                    </Grid>
-                                    <Grid
-                                        x:Name="VerticalTemplate"
-                                        MinWidth="{ThemeResource SliderVerticalWidth}"
-                                        Visibility="Collapsed">
-
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="*" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="{ThemeResource SliderPreContentMargin}" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="{ThemeResource SliderPostContentMargin}" />
-                                        </Grid.ColumnDefinitions>
-                                        <Rectangle
-                                            x:Name="VerticalTrackRect"
-                                            Grid.RowSpan="3"
-                                            Grid.Column="1"
-                                            Width="{ThemeResource SliderTrackThemeHeight}"
-                                            Fill="{TemplateBinding Background}" />
-                                        <Rectangle
-                                            x:Name="VerticalDecreaseRect"
-                                            Grid.Row="2"
-                                            Grid.Column="1"
-                                            Fill="{TemplateBinding Foreground}" />
-                                        <TickBar
-                                            x:Name="LeftTickBar"
-                                            Grid.RowSpan="3"
-                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
-                                            Margin="0,0,4,0"
-                                            HorizontalAlignment="Right"
-                                            Fill="{ThemeResource SliderTickBarFill}"
-                                            Visibility="Collapsed" />
-                                        <TickBar
-                                            x:Name="VerticalInlineTickBar"
-                                            Grid.RowSpan="3"
-                                            Grid.Column="1"
-                                            Width="{ThemeResource SliderTrackThemeHeight}"
-                                            Fill="{ThemeResource SliderInlineTickBarFill}"
-                                            Visibility="Collapsed" />
-                                        <TickBar
-                                            x:Name="RightTickBar"
-                                            Grid.RowSpan="3"
-                                            Grid.Column="2"
-                                            Width="{ThemeResource SliderOutsideTickBarThemeHeight}"
-                                            Margin="4,0,0,0"
-                                            HorizontalAlignment="Left"
-                                            Fill="{ThemeResource SliderTickBarFill}"
-                                            Visibility="Collapsed" />
-                                        <Thumb
-                                            x:Name="VerticalThumb"
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Grid.ColumnSpan="3"
-                                            Width="8"
-                                            Height="8"
-                                            AutomationProperties.AccessibilityView="Raw"
-                                            DataContext="{TemplateBinding Value}"
-                                            FocusVisualMargin="-6,-14,-6,-14"
-                                            Style="{StaticResource SliderThumbStyle}" />
-                                    </Grid>
-
-                                </Grid>
-
-                            </Grid>
-
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
             <Style x:Key="ListViewStretchedItemContainerStyle" TargetType="ListViewItem">
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                 <Setter Property="Margin" Value="0" />

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

@@ -75,14 +75,14 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.RealTime;
-
             WindowHelper.OpenWindow<LyricsWindow>();
-            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow == null) return;
 
-            lyricsWindow.ViewModel.InitLockHotKey();
-            lyricsWindow.AutoSelectLyricsMode();
+            var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                lyricsWindow.ViewModel.InitLockHotKey();
+                lyricsWindow.AutoSelectLyricsMode();
+            }
         }
 
         private static void ConfigureServices()

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

@@ -14,7 +14,9 @@
         x:Name="TrayIcon"
         x:FieldModifier="public"
         ContextMenuMode="SecondWindow"
+        DoubleClickCommand="{x:Bind ViewModel.OpenLyricsWindowCommand}"
         IconSource="ms-appx:///Assets/Logo.ico"
+        LeftClickCommand="{x:Bind ViewModel.OpenLyricsWindowCommand}"
         NoLeftClickDelay="True"
         ToolTipText="{x:Bind ViewModel.ToolTipText, Mode=OneWay}">
         <tb:TaskbarIcon.ContextFlyout>
@@ -22,7 +24,7 @@
                 AreOpenCloseAnimationsEnabled="True"
                 LightDismissOverlayMode="On"
                 ShowMode="TransientWithDismissOnPointerMoveAway">
-                <MenuFlyoutItem x:Uid="SystemTrayMusicGallery" Command="{x:Bind ViewModel.OpenSettingsCommand}" />
+                <MenuFlyoutItem x:Uid="SystemTrayMusicGallery" Command="{x:Bind ViewModel.OpenMusicGalleryCommand}" />
                 <MenuFlyoutItem x:Uid="SystemTraySettings" Command="{x:Bind ViewModel.OpenSettingsCommand}" />
                 <MenuFlyoutItem x:Uid="SystemTrayExit" Command="{x:Bind ViewModel.ExitAppCommand}" />
                 <MenuFlyoutItem

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

@@ -14,19 +14,19 @@ namespace BetterLyrics.WinUI3.Converter
             {
                 return provider switch
                 {
-                    LyricsSearchProvider.LrcLib => App.ResourceLoader!.GetString("LyricsSearchProviderLrcLib"),
-                    LyricsSearchProvider.QQ => App.ResourceLoader!.GetString("LyricsSearchProviderQQ"),
-                    LyricsSearchProvider.Netease => App.ResourceLoader!.GetString("LyricsSearchProviderNetease"),
-                    LyricsSearchProvider.Kugou => App.ResourceLoader!.GetString("LyricsSearchProviderKugou"),
-                    LyricsSearchProvider.AmllTtmlDb => App.ResourceLoader!.GetString("LyricsSearchProviderAmllTtmlDb"),
+                    LyricsSearchProvider.LrcLib => "LrcLib",
+                    LyricsSearchProvider.QQ => "QQ",
+                    LyricsSearchProvider.Netease => "Netease",
+                    LyricsSearchProvider.Kugou => "Kugou",
+                    LyricsSearchProvider.AmllTtmlDb => "amll-ttml-db",
                     LyricsSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
                     LyricsSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),
                     LyricsSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderEslrcFile"),
                     LyricsSearchProvider.LocalTtmlFile => App.ResourceLoader!.GetString("LyricsSearchProviderTtmlFile"),
-                    _ => "",
+                    _ => "N/A",
                 };
             }
-            return "";
+            return "N/A";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)

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

@@ -0,0 +1,38 @@
+// 2025/6/23 by Zhe Fang
+
+using System;
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml.Data;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class TranslationSearchProviderToDisplayNameConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is TranslationSearchProvider provider)
+            {
+                return provider switch
+                {
+                    TranslationSearchProvider.LrcLib => "LrcLib",
+                    TranslationSearchProvider.QQ => "QQ",
+                    TranslationSearchProvider.Netease => "Netease",
+                    TranslationSearchProvider.Kugou => "Kugou",
+                    TranslationSearchProvider.AmllTtmlDb => "amll-ttml-db",
+                    TranslationSearchProvider.LocalLrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalLrcFile"),
+                    TranslationSearchProvider.LocalMusicFile => App.ResourceLoader!.GetString("LyricsSearchProviderLocalMusicFile"),
+                    TranslationSearchProvider.LocalEslrcFile => App.ResourceLoader!.GetString("LyricsSearchProviderEslrcFile"),
+                    TranslationSearchProvider.LocalTtmlFile => App.ResourceLoader!.GetString("LyricsSearchProviderTtmlFile"),
+                    TranslationSearchProvider.LibreTranslate => "LibreTranslate",
+                    _ => "N/A",
+                };
+            }
+            return "N/A";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -61,5 +61,22 @@ namespace BetterLyrics.WinUI3.Enums
         {
             return !provider.IsLocal();
         }
+
+        public static TranslationSearchProvider? ToTranslationSearchProvider(this LyricsSearchProvider? provider)
+        {
+            return provider switch
+            {
+                LyricsSearchProvider.LrcLib => TranslationSearchProvider.LrcLib,
+                LyricsSearchProvider.QQ => TranslationSearchProvider.QQ,
+                LyricsSearchProvider.Kugou => TranslationSearchProvider.Kugou,
+                LyricsSearchProvider.Netease => TranslationSearchProvider.Netease,
+                LyricsSearchProvider.AmllTtmlDb => TranslationSearchProvider.AmllTtmlDb,
+                LyricsSearchProvider.LocalMusicFile => TranslationSearchProvider.LocalMusicFile,
+                LyricsSearchProvider.LocalLrcFile => TranslationSearchProvider.LocalLrcFile,
+                LyricsSearchProvider.LocalEslrcFile => TranslationSearchProvider.LocalEslrcFile,
+                LyricsSearchProvider.LocalTtmlFile => TranslationSearchProvider.LocalTtmlFile,
+                _ => null,
+            };
+        }
     }
 }

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

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum TranslationSearchProvider
+    {
+        QQ,
+        Kugou,
+        Netease,
+        LrcLib,
+        AmllTtmlDb,
+        LocalMusicFile,
+        LocalLrcFile,
+        LocalEslrcFile,
+        LocalTtmlFile,
+        LibreTranslate,
+    }
+}

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

@@ -231,5 +231,22 @@ namespace BetterLyrics.WinUI3.Helper
             square.Save(ms, new PngEncoder());
             return ms.ToArray();
         }
+
+        public static byte[] Resize(byte[] imageBytes, int size)
+        {
+            using Image image = Image.Load(imageBytes);
+            var factor = Math.Max(size / image.Width, size / image.Height);
+            if (factor <= 1)
+            {
+                return imageBytes;
+            }
+            int width = image.Width * factor;
+            int height = image.Height * factor;
+            image.Mutate(x => x.Resize(width, height, KnownResamplers.Welch));
+
+            using var ms = new MemoryStream();
+            image.Save(ms, new PngEncoder());
+            return ms.ToArray();
+        }
     }
 }

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

@@ -164,7 +164,7 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 List<LyricsLine> originalLines = [];
                 List<LyricsLine> translationLines = [];
-                var xdoc = XDocument.Parse(raw);
+                var xdoc = XDocument.Parse(raw, LoadOptions.PreserveWhitespace);
                 var body = xdoc.Descendants().FirstOrDefault(e => e.Name.LocalName == "body");
                 if (body == null) return;
                 var ps = body.Descendants().Where(e => e.Name.LocalName == "p");
@@ -190,16 +190,18 @@ namespace BetterLyrics.WinUI3.Helper
                         .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value == "x-translation")
                         .ToList();
 
-                    // 原文（非 CJK 语言添加空格）
-                    string originalText = string.Concat(originalTextSpans.Select(s => s.Value));
-                    if (!LanguageHelper.IsCJK(originalText))
+                    // 处理原文span后的空白
+                    for (int i = 0; i < originalTextSpans.Count; i++)
                     {
-                        foreach (var span in originalTextSpans)
+                        var span = originalTextSpans[i];
+                        var nextNode = span.NodesAfterSelf().FirstOrDefault();
+                        if (nextNode is XText textNode)
                         {
-                            span.Value += " ";
+                            span.Value += textNode.Value;
                         }
-                        originalText = string.Concat(originalTextSpans.Select(s => s.Value));
                     }
+                    // 拼接空白字符后的原文
+                    string originalText = string.Concat(originalTextSpans.Select(s => s.Value));
 
                     var originalCharTimings = new List<LyricsChar>();
                     int originalStartIndex = 0;

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

@@ -63,6 +63,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
             var castedWindow = (Window)window;
             castedWindow.Restore();
+            castedWindow.Activate();
         }
 
         public static void RestartApp(string args = "")

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

@@ -61,7 +61,9 @@ namespace BetterLyrics.WinUI3.Services
         LyricsFontColorType LyricsFgFontColorType { get; set; }
         LyricsFontColorType LyricsStrokeFontColorType { get; set; }
 
-        int LyricsFontSize { get; set; }
+        int LyricsStandardFontSize { get; set; }
+        int LyricsDockFontSize { get; set; }
+        int LyricsDesktopFontSize { get; set; }
 
         ElementTheme LyricsBackgroundTheme { get; set; }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/PlaybackService.cs

@@ -176,6 +176,7 @@ namespace BetterLyrics.WinUI3.Services
                 if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
                 {
                     _SMTCAlbumArtBytes = await ImageHelper.ToByteArrayAsync(streamReference);
+                    _SMTCAlbumArtBytes = ImageHelper.Resize(_SMTCAlbumArtBytes, 800);
                 }
                 else
                 {
@@ -343,18 +344,18 @@ namespace BetterLyrics.WinUI3.Services
 
         private void Sse_MessageReceived(object sender, EventSourceMessageEventArgs e)
         {
-            var data = JsonSerializer.Deserialize(e.Message, Serialization.SourceGenerationContext.Default.JsonElement);
-            if (data.TryGetDouble(out double seconds))
+            if (_cachedSongInfo?.SourceAppUserModelId == _lxMusicId)
             {
-                if (_cachedSongInfo?.SourceAppUserModelId == _lxMusicId)
+                var data = JsonSerializer.Deserialize(e.Message, Serialization.SourceGenerationContext.Default.JsonElement);
+                if (data.ValueKind == JsonValueKind.Number)
                 {
                     if (e.Event == "progress")
                     {
-                        _lxMusicPositionSeconds = seconds;
+                        _lxMusicPositionSeconds = data.GetDouble();
                     }
                     else if (e.Event == "duration")
                     {
-                        _lxMusicDurationSeconds = seconds;
+                        _lxMusicDurationSeconds = data.GetDouble();
                     }
                     _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
@@ -367,31 +368,46 @@ namespace BetterLyrics.WinUI3.Services
         public async Task PlayAsync()
         {
             var focusedSession = _mediaManager.GetFocusedSession();
-            await focusedSession?.ControlSession.TryPlayAsync();
+            if (focusedSession != null)
+            {
+                await focusedSession.ControlSession?.TryPlayAsync();
+            }
         }
 
         public async Task PauseAsync()
         {
             var focusedSession = _mediaManager.GetFocusedSession();
-            await focusedSession?.ControlSession.TryPauseAsync();
+            if (focusedSession != null)
+            {
+                await focusedSession.ControlSession?.TryPauseAsync();
+            }
         }
 
         public async Task PreviousAsync()
         {
             var focusedSession = _mediaManager.GetFocusedSession();
-            await focusedSession?.ControlSession.TrySkipPreviousAsync();
+            if (focusedSession != null)
+            {
+                await focusedSession.ControlSession?.TrySkipPreviousAsync();
+            }
         }
 
         public async Task NextAsync()
         {
             var focusedSession = _mediaManager.GetFocusedSession();
-            await focusedSession?.ControlSession.TrySkipNextAsync();
+            if (focusedSession != null)
+            {
+                await focusedSession.ControlSession?.TrySkipNextAsync();
+            }
         }
 
         public async Task ChangePosition(double seconds)
         {
             var focusedSession = _mediaManager.GetFocusedSession();
-            await focusedSession?.ControlSession.TryChangePlaybackPositionAsync(TimeSpan.FromSeconds(seconds).Ticks);
+            if (focusedSession != null)
+            {
+                await focusedSession.ControlSession?.TryChangePlaybackPositionAsync(TimeSpan.FromSeconds(seconds).Ticks);
+            }
         }
 
         public void Receive(PropertyChangedMessage<ObservableCollection<MediaSourceProviderInfo>> message)

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

@@ -62,7 +62,11 @@ namespace BetterLyrics.WinUI3.Services
 
         private const string LyricsFontStrokeWidthKey = "LyricsFontStrokeWidth";
 
-        private const string LyricsFontSizeKey = "LyricsFontSize";
+        // Lyrics font size
+        private const string LyricsStandardFontSizeKey = "LyricsStandardFontSize";
+        private const string LyricsDockFontSizeKey = "LyricsDockFontSize";
+        private const string LyricsDesktopFontSizeKey = "LyricsDesktopFontSize";
+
         private const string LyricsFontWeightKey = "LyricsFontWeightKey";
         private const string LyricsGlowEffectScopeKey = "LyricsGlowEffectScope";
         private const string LyricsHighlightSopeKey = "LyricsHighlightSope";
@@ -204,7 +208,10 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(LyricsCustomFgFontColorKey, Colors.White.ToInt());
             SetDefault(LyricsCustomStrokeFontColorKey, Colors.White.ToInt());
 
-            SetDefault(LyricsFontSizeKey, 28);
+            SetDefault(LyricsStandardFontSizeKey, 28);
+            SetDefault(LyricsDockFontSizeKey, 20);
+            SetDefault(LyricsDesktopFontSizeKey, 28);
+
             SetDefault(LyricsLineSpacingFactorKey, 0.5f);
             SetDefault(LyricsVerticalEdgeOpacityKey, 0);
             SetDefault(IsLyricsGlowEffectEnabledKey, true);
@@ -511,10 +518,22 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(LyricsFontStrokeWidthKey, value);
         }
 
-        public int LyricsFontSize
+        public int LyricsStandardFontSize
         {
-            get => GetValue<int>(LyricsFontSizeKey);
-            set => SetValue(LyricsFontSizeKey, value);
+            get => GetValue<int>(LyricsStandardFontSizeKey);
+            set => SetValue(LyricsStandardFontSizeKey, value);
+        }
+
+        public int LyricsDockFontSize
+        {
+            get => GetValue<int>(LyricsDockFontSizeKey);
+            set => SetValue(LyricsDockFontSizeKey, value);
+        }
+
+        public int LyricsDesktopFontSize
+        {
+            get => GetValue<int>(LyricsDesktopFontSizeKey);
+            set => SetValue(LyricsDesktopFontSizeKey, value);
         }
 
         public LyricsFontWeight LyricsFontWeight

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

@@ -264,8 +264,14 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value>x line height</value>
   </data>
-  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
-    <value>Font size</value>
+  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
+    <value>Font size (Standard mode)</value>
+  </data>
+  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
+    <value>Font size (Dock mode)</value>
+  </data>
+  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
+    <value>Font size (Desktop mode)</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>Lyrics only</value>
@@ -481,9 +487,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>Local music files</value>
   </data>
-  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
-    <value>LRCLIB</value>
-  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -499,18 +502,6 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>This folder contains added folders, please delete these folders to add the folder</value>
   </data>
-  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
-    <value>amll-ttml-db</value>
-  </data>
-  <data name="LyricsSearchProviderQQ" xml:space="preserve">
-    <value>QQ</value>
-  </data>
-  <data name="LyricsSearchProviderNetease" xml:space="preserve">
-    <value>Netease</value>
-  </data>
-  <data name="LyricsSearchProviderKugou" xml:space="preserve">
-    <value>Kugou</value>
-  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>Show debug overlay</value>
   </data>
@@ -910,4 +901,10 @@ If you encounter any problems, please go to the Settings page, About tab, and vi
   <data name="SettingsPageTelegram.Header" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
+    <value>Lyrics provider</value>
+  </data>
+  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
+    <value>Translation provider</value>
+  </data>
 </root>

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

@@ -264,8 +264,14 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value>x線の高さ</value>
   </data>
-  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
-    <value>フォントサイズ</value>
+  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
+    <value>フォントサイズ（標準モード）</value>
+  </data>
+  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
+    <value>フォントサイズ（ドックモード）</value>
+  </data>
+  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
+    <value>フォントサイズ（デスクトップモード）</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>歌詞のみ</value>
@@ -481,9 +487,6 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>ローカル音楽ファイル</value>
   </data>
-  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
-    <value>LRCLIB</value>
-  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -499,18 +502,6 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>このフォルダーには追加されたフォルダーが含まれています。これらのフォルダを削除してフォルダーを追加してください</value>
   </data>
-  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
-    <value>amll-ttml-db</value>
-  </data>
-  <data name="LyricsSearchProviderQQ" xml:space="preserve">
-    <value>QQ</value>
-  </data>
-  <data name="LyricsSearchProviderNetease" xml:space="preserve">
-    <value>Netease</value>
-  </data>
-  <data name="LyricsSearchProviderKugou" xml:space="preserve">
-    <value>Kugou</value>
-  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>デバッグオーバーレイを表示します</value>
   </data>
@@ -910,4 +901,10 @@
   <data name="SettingsPageTelegram.Header" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
+    <value>歌詞プロバイダー</value>
+  </data>
+  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
+    <value>翻訳プロバイダー</value>
+  </data>
 </root>

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

@@ -264,8 +264,14 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value>X 라인 높이</value>
   </data>
-  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
-    <value>글꼴 크기</value>
+  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
+    <value>글꼴 크기 (표준 모드)</value>
+  </data>
+  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
+    <value>글꼴 크기 (도크 모드)</value>
+  </data>
+  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
+    <value>글꼴 크기 (데스크탑 모드)</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>가사 만</value>
@@ -481,9 +487,6 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>로컬 음악 파일</value>
   </data>
-  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
-    <value>LRCLIB</value>
-  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -499,18 +502,6 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>이 폴더에는 추가 된 폴더가 포함되어 있습니다. 폴더를 추가하려면이 폴더를 삭제하십시오.</value>
   </data>
-  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
-    <value>amll-ttml-db</value>
-  </data>
-  <data name="LyricsSearchProviderQQ" xml:space="preserve">
-    <value>QQ</value>
-  </data>
-  <data name="LyricsSearchProviderNetease" xml:space="preserve">
-    <value>Netease</value>
-  </data>
-  <data name="LyricsSearchProviderKugou" xml:space="preserve">
-    <value>Kugou</value>
-  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>디버그 오버레이를 표시하십시오</value>
   </data>
@@ -910,4 +901,10 @@
   <data name="SettingsPageTelegram.Header" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
+    <value>가사 제공자</value>
+  </data>
+  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
+    <value>번역 제공자</value>
+  </data>
 </root>

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

@@ -264,8 +264,14 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value> 倍行高</value>
   </data>
-  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
-    <value>字体大小</value>
+  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
+    <value>字体尺寸（标准模式）</value>
+  </data>
+  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
+    <value>字体大小（停靠模式）</value>
+  </data>
+  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
+    <value>字体尺寸（桌面模式）</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>仅显示歌词</value>
@@ -481,9 +487,6 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>本地音乐文件</value>
   </data>
-  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
-    <value>LRCLIB</value>
-  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -499,18 +502,6 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>该文件夹包含已添加文件夹，请删除这些文件夹以添加该文件夹</value>
   </data>
-  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
-    <value>amll-ttml-db</value>
-  </data>
-  <data name="LyricsSearchProviderQQ" xml:space="preserve">
-    <value>QQ</value>
-  </data>
-  <data name="LyricsSearchProviderNetease" xml:space="preserve">
-    <value>Netease</value>
-  </data>
-  <data name="LyricsSearchProviderKugou" xml:space="preserve">
-    <value>Kugou</value>
-  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>显示调试覆盖层</value>
   </data>
@@ -910,4 +901,10 @@
   <data name="SettingsPageTelegram.Header" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
+    <value>歌词来源</value>
+  </data>
+  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
+    <value>翻译来源</value>
+  </data>
 </root>

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

@@ -264,8 +264,14 @@
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
     <value> 倍行高</value>
   </data>
-  <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
-    <value>字體大小</value>
+  <data name="SettingsPageLyricsStandardFontSize.Header" xml:space="preserve">
+    <value>字體尺寸（標準模式）</value>
+  </data>
+  <data name="SettingsPageLyricsDockFontSize.Header" xml:space="preserve">
+    <value>字體大小（停靠模式）</value>
+  </data>
+  <data name="SettingsPageLyricsDesktopFontSize.Header" xml:space="preserve">
+    <value>字體尺寸（桌面模式）</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
     <value>僅顯示歌詞</value>
@@ -481,9 +487,6 @@
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
     <value>本地音樂文件</value>
   </data>
-  <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
-    <value>LRCLIB</value>
-  </data>
   <data name="SettingsPageJA.Content" xml:space="preserve">
     <value>日本語</value>
   </data>
@@ -499,18 +502,6 @@
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
     <value>該文件夾包含已添加文件夾，請刪除這些文件夾以添加該文件夾</value>
   </data>
-  <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
-    <value>amll-ttml-db</value>
-  </data>
-  <data name="LyricsSearchProviderQQ" xml:space="preserve">
-    <value>QQ</value>
-  </data>
-  <data name="LyricsSearchProviderNetease" xml:space="preserve">
-    <value>Netease</value>
-  </data>
-  <data name="LyricsSearchProviderKugou" xml:space="preserve">
-    <value>Kugou</value>
-  </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
     <value>顯示調試覆蓋層</value>
   </data>
@@ -910,4 +901,10 @@
   <data name="SettingsPageTelegram.Header" xml:space="preserve">
     <value>Telegram</value>
   </data>
+  <data name="LyricsPageLyricsProviderPrefix.Text" xml:space="preserve">
+    <value>歌詞來源</value>
+  </data>
+  <data name="LyricsPageTranslationProviderPrefix.Text" xml:space="preserve">
+    <value>翻譯來源</value>
+  </data>
 </root>

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

@@ -23,7 +23,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<int>>,
         IRecipient<PropertyChangedMessage<string>>,
-        IRecipient<PropertyChangedMessage<TimeSpan>>
+        IRecipient<PropertyChangedMessage<TimeSpan>>,
+        IRecipient<PropertyChangedMessage<LyricsSearchProvider?>>,
+        IRecipient<PropertyChangedMessage<TranslationSearchProvider?>>
     {
         private readonly IPlaybackService _playbackService;
         private readonly ThrottleHelper _timelineThrottle = new(TimeSpan.FromSeconds(1));
@@ -37,7 +39,9 @@ namespace BetterLyrics.WinUI3.ViewModels
             PositionOffset = _settingsService.PositionOffset;
             IsImmersiveMode = _settingsService.IsImmersiveMode;
             ShowTranslationOnly = _settingsService.ShowTranslationOnly;
-            LyricsFontSize = _settingsService.LyricsFontSize;
+
+            LyricsStandardFontSize = _settingsService.LyricsStandardFontSize;
+
             LyricsFontFamily = _settingsService.LyricsFontFamily;
 
             OnIsImmersiveModeChanged(IsImmersiveMode);
@@ -91,7 +95,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial string LyricsFontFamily { get; set; }
 
         [ObservableProperty]
-        public partial int LyricsFontSize { get; set; }
+        public partial int LyricsStandardFontSize { get; set; }
 
         [ObservableProperty]
         public partial bool IsImmersiveMode { get; set; }
@@ -134,6 +138,12 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial bool IsSongPlaying { get; set; }
 
+        [ObservableProperty]
+        public partial LyricsSearchProvider? LyricsSearchProvider { get; set; } = null;
+
+        [ObservableProperty]
+        public partial TranslationSearchProvider? TranslationSearchProvider { get; set; } = null;
+
         public void Receive(PropertyChangedMessage<bool> message)
         {
             if (message.Sender is LyricsWindowViewModel)
@@ -236,9 +246,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             if (message.Sender is SettingsPageViewModel)
             {
-                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsStandardFontSize))
                 {
-                    LyricsFontSize = message.NewValue;
+                    LyricsStandardFontSize = message.NewValue;
                 }
             }
         }
@@ -275,5 +285,27 @@ namespace BetterLyrics.WinUI3.ViewModels
                 }
             }
         }
+
+        public void Receive(PropertyChangedMessage<LyricsSearchProvider?> message)
+        {
+            if (message.Sender is LyricsRendererViewModel)
+            {
+                if (message.PropertyName == nameof(LyricsRendererViewModel.LyricsSearchProvider))
+                {
+                    LyricsSearchProvider = message.NewValue;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<TranslationSearchProvider?> message)
+        {
+            if (message.Sender is LyricsRendererViewModel)
+            {
+                if (message.PropertyName == nameof(LyricsRendererViewModel.TranslationSearchProvider))
+                {
+                    TranslationSearchProvider = message.NewValue;
+                }
+            }
+        }
     }
 }

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

@@ -33,7 +33,11 @@ namespace BetterLyrics.WinUI3.ViewModels
             _lyricsAlignmentType = _settingsService.LyricsAlignmentType;
             _lyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
             _lyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
-            _lyricsFontSize = _settingsService.LyricsFontSize;
+            
+            _lyricsStandardFontSize = _settingsService.LyricsStandardFontSize;
+            _lyricsDockFontSize = _settingsService.LyricsDockFontSize;
+            _lyricsDesktopFontSize = _settingsService.LyricsDesktopFontSize;
+
             _lyricsBlurAmount = _settingsService.LyricsBlurAmount;
             _isLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
             _lyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;

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

@@ -97,12 +97,14 @@ namespace BetterLyrics.WinUI3.ViewModels
                     _isDockMode = message.NewValue;
                     UpdateColorConfig();
                     UpdateImmersiveBackgroundOpacity();
+                    _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                 {
                     _isDesktopMode = message.NewValue;
                     UpdateColorConfig();
                     UpdateImmersiveBackgroundOpacity();
+                    _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsLyricsWindowLocked))
                 {
@@ -205,9 +207,19 @@ namespace BetterLyrics.WinUI3.ViewModels
                     _lyricsBlurAmount = message.NewValue;
                     _isLayoutChanged = true;
                 }
-                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsStandardFontSize))
                 {
-                    _lyricsFontSize = message.NewValue;
+                    _lyricsStandardFontSize = message.NewValue;
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsDockFontSize))
+                {
+                    _lyricsDockFontSize = message.NewValue;
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsDesktopFontSize))
+                {
+                    _lyricsDesktopFontSize = message.NewValue;
                     _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.SelectedTargetLanguageIndex))

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

@@ -140,7 +140,18 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (control == null)
                 return;
 
-            _lyricsTextFormat.FontSize = _lyricsFontSize;
+            if (_isDockMode)
+            {
+                _lyricsTextFormat.FontSize = _lyricsDockFontSize;
+            }
+            else if (_isDesktopMode)
+            {
+                _lyricsTextFormat.FontSize = _lyricsDesktopFontSize;
+            }
+            else
+            {
+                _lyricsTextFormat.FontSize = _lyricsStandardFontSize;
+            }
 
             float y = 0;
 

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

@@ -74,6 +74,14 @@ namespace BetterLyrics.WinUI3.ViewModels
         private readonly float _coverRotateSpeed = 0.003f;
         private float _rotateAngle = 0f;
 
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsSearchProvider? LyricsSearchProvider { get; set; } = null;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial TranslationSearchProvider? TranslationSearchProvider { get; set; } = null;
+
         private TextAlignmentType _lyricsAlignmentType;
 
         private readonly float _lyricsGlowEffectAmount = 8f;
@@ -85,7 +93,9 @@ namespace BetterLyrics.WinUI3.ViewModels
         private LineRenderingType _lyricsHighlightScope;
 
         private int _lyricsFontStrokeWidth;
-        private int _lyricsFontSize;
+        private int _lyricsStandardFontSize;
+        private int _lyricsDockFontSize;
+        private int _lyricsDesktopFontSize;
         private float _lyricsLineSpacingFactor;
 
         private LyricsFontColorType _lyricsBgFontColorType;
@@ -396,6 +406,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void UpdateTranslations()
         {
+            TranslationSearchProvider = null;
             _lyricsDataArr.ElementAtOrDefault(0)?.SetDisplayedTextInOriginalText();
             _isLayoutChanged = true;
 
@@ -448,6 +459,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                         _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found], 50);
                         _langIndex = 0;
                     }
+                    TranslationSearchProvider = LyricsSearchProvider.ToTranslationSearchProvider();
                 }
                 else if (_isLibreTranslateEnabled)
                 {
@@ -468,6 +480,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                             _lyricsDataArr[0].SetDisplayedTextAlongWith(translated);
                             _langIndex = 0;
                         }
+                        TranslationSearchProvider = Enums.TranslationSearchProvider.LibreTranslate;
                         token.ThrowIfCancellationRequested();
                     }
                     catch (Exception)
@@ -480,27 +493,29 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private async Task RefreshLyricsAsync(CancellationToken token)
         {
+            LyricsSearchProvider = null;
             _logger.LogInformation("Refreshing lyrics...");
 
             _lyricsDataArr = [LyricsData.GetLoadingPlaceholder()];
             _isLayoutChanged = true;
 
             string? lyricsRaw = null;
-            LyricsSearchProvider? provider = null;
+            LyricsSearchProvider? lyricsSearchProvider = null;
 
             if (SongInfo != null)
             {
-                (lyricsRaw, provider) = await _lyrcsSearchService.SearchAsync(
+                (lyricsRaw, lyricsSearchProvider) = await _lyrcsSearchService.SearchAsync(
                     SongInfo.Title,
                     SongInfo.Artist,
                     SongInfo.Album ?? "",
                     SongInfo.DurationMs ?? 0,
                     token
                 );
+                LyricsSearchProvider = lyricsSearchProvider;
                 _logger.LogInformation("Lyrics search result: {LyricsRaw}", lyricsRaw ?? "null");
                 token.ThrowIfCancellationRequested();
                 _lyricsDataArr = new LyricsParser().Parse(lyricsRaw, (int?)SongInfo?.DurationMs);
-                FillTranslationFromCache(provider);
+                FillTranslationFromCache(LyricsSearchProvider);
             }
             else
             {
@@ -521,25 +536,25 @@ namespace BetterLyrics.WinUI3.ViewModels
             string? translationRaw = null;
             switch (provider)
             {
-                case LyricsSearchProvider.QQ:
+                case Enums.LyricsSearchProvider.QQ:
                     translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
                     break;
-                case LyricsSearchProvider.Kugou:
+                case Enums.LyricsSearchProvider.Kugou:
                     break;
-                case LyricsSearchProvider.Netease:
+                case Enums.LyricsSearchProvider.Netease:
                     translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
                     break;
-                case LyricsSearchProvider.LrcLib:
+                case Enums.LyricsSearchProvider.LrcLib:
                     break;
-                case LyricsSearchProvider.AmllTtmlDb:
+                case Enums.LyricsSearchProvider.AmllTtmlDb:
                     break;
-                case LyricsSearchProvider.LocalMusicFile:
+                case Enums.LyricsSearchProvider.LocalMusicFile:
                     break;
-                case LyricsSearchProvider.LocalLrcFile:
+                case Enums.LyricsSearchProvider.LocalLrcFile:
                     break;
-                case LyricsSearchProvider.LocalEslrcFile:
+                case Enums.LyricsSearchProvider.LocalEslrcFile:
                     break;
-                case LyricsSearchProvider.LocalTtmlFile:
+                case Enums.LyricsSearchProvider.LocalTtmlFile:
                     break;
                 default:
                     break;
@@ -547,7 +562,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (translationRaw != null)
             {
                 var translationData = new LyricsParser().Parse(translationRaw, (int?)SongInfo?.DurationMs);
-                if (provider == LyricsSearchProvider.QQ)
+                if (provider == Enums.LyricsSearchProvider.QQ)
                 {
                     foreach (var data in translationData)
                     {

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

@@ -0,0 +1,91 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class SettingsPageViewModel
+    {
+        public SettingsPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IPlaybackService playbackService, ITranslateService libreTranslateService) : base(settingsService)
+        {
+            _libWatcherService = libWatcherService;
+            _playbackService = playbackService;
+            _libreTranslateService = libreTranslateService;
+
+            IsLibreTranslateEnabled = _settingsService.IsLibreTranslateEnabled;
+            LibreTranslateServer = _settingsService.LibreTranslateServer;
+            SelectedTargetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
+
+            LocalMediaFolders = [.. _settingsService.LocalMediaFolders];
+            LyricsSearchProvidersInfo = [.. _settingsService.LyricsSearchProvidersInfo];
+            AlbumArtSearchProvidersInfo = [.. _settingsService.AlbumArtSearchProvidersInfo];
+
+            Language = _settingsService.Language;
+            CoverImageRadius = _settingsService.CoverImageRadius;
+
+            AutoStartWindowType = _settingsService.AutoStartWindowType;
+            AutoLockOnDesktopMode = _settingsService.AutoLockOnDesktopMode;
+
+            IsDynamicCoverOverlayEnabled = _settingsService.IsDynamicCoverOverlayEnabled;
+            CoverOverlayOpacity = _settingsService.CoverOverlayOpacity;
+            CoverOverlayBlurAmount = _settingsService.CoverOverlayBlurAmount;
+
+            CoverAcrylicEffectAmount = _settingsService.CoverAcrylicEffectAmount;
+
+            LyricsAlignmentType = _settingsService.LyricsAlignmentType;
+            SongInfoAlignmentType = _settingsService.SongInfoAlignmentType;
+            LyricsFontWeight = _settingsService.LyricsFontWeight;
+            LyricsBlurAmount = _settingsService.LyricsBlurAmount;
+            LyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
+            LyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
+
+            // Font size
+            LyricsStandardFontSize = _settingsService.LyricsStandardFontSize;
+            LyricsDockFontSize = _settingsService.LyricsDockFontSize;
+            LyricsDesktopFontSize = _settingsService.LyricsDesktopFontSize;
+
+            IsLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
+            LyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
+            LyricsHighlightScope = _settingsService.LyricsHighlightScope;
+            IsFanLyricsEnabled = _settingsService.IsFanLyricsEnabled;
+
+            LyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
+            LyricsFgFontColorType = _settingsService.LyricsFgFontColorType;
+            LyricsStrokeFontColorType = _settingsService.LyricsStrokeFontColorType;
+
+            LyricsCustomBgFontColor = _settingsService.LyricsCustomBgFontColor;
+            LyricsCustomFgFontColor = _settingsService.LyricsCustomFgFontColor;
+            LyricsCustomStrokeFontColor = _settingsService.LyricsCustomStrokeFontColor;
+
+            LyricsFontStrokeWidth = _settingsService.LyricsFontStrokeWidth;
+            LyricsBackgroundTheme = _settingsService.LyricsBackgroundTheme;
+            MediaSourceProvidersInfo = [.. _settingsService.MediaSourceProvidersInfo];
+            IgnoreFullscreenWindow = _settingsService.IgnoreFullscreenWindow;
+
+            LyricsScrollEasingType = _settingsService.LyricsScrollEasingType;
+            LyricsScrollDuration = _settingsService.LyricsScrollDuration;
+            TimelineSyncThreshold = _settingsService.TimelineSyncThreshold;
+
+            IsLyricsFloatAnimationEnabled = _settingsService.IsLyricsFloatAnimationEnabled;
+            ResetPositionOffsetOnSongChanged = _settingsService.ResetPositionOffsetOnSongChanged;
+            LockHotKeyIndex = _settingsService.LockHotKeyIndex;
+
+            LXMusicServer = _settingsService.LXMusicServer;
+            DockPlacement = _settingsService.DockPlacement;
+            LyricsBgFontOpacity = _settingsService.LyricsBgFontOpacity;
+            HideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
+            DockWindowHeight = _settingsService.DockWindowHeight;
+
+            SystemFontNames = [.. FontHelper.SystemFontFamilies];
+            SelectedFontFamilyIndex = _settingsService.SelectedFontFamilyIndex;
+            LyricsFontFamily = _settingsService.LyricsFontFamily;
+            IsDragEverywhereEnabled = _settingsService.IsDragEverywhereEnabled;
+
+            _playbackService.MediaSourceProvidersInfoChanged += PlaybackService_SessionIdsChanged;
+        }
+    }
+}

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

@@ -0,0 +1,227 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Views;
+using Microsoft.UI.Xaml;
+using Windows.Globalization;
+using Windows.UI;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class SettingsPageViewModel
+    {
+        partial void OnDockPlacementChanged(DockPlacement value)
+        {
+            _settingsService.DockPlacement = value;
+        }
+        partial void OnLyricsScrollEasingTypeChanged(EasingType value)
+        {
+            _settingsService.LyricsScrollEasingType = value;
+        }
+        partial void OnLyricsScrollDurationChanged(int value)
+        {
+            _settingsService.LyricsScrollDuration = value;
+        }
+        partial void OnLyricsBackgroundThemeChanged(ElementTheme value)
+        {
+            _settingsService.LyricsBackgroundTheme = value;
+        }
+        partial void OnLyricsFontStrokeWidthChanged(int value)
+        {
+            _settingsService.LyricsFontStrokeWidth = value;
+        }
+        partial void OnIgnoreFullscreenWindowChanged(bool value)
+        {
+            _settingsService.IgnoreFullscreenWindow = value;
+        }
+        partial void OnSelectedTargetLanguageIndexChanged(int value)
+        {
+            _settingsService.SelectedTargetLanguageIndex = value;
+        }
+        partial void OnLibreTranslateServerChanged(string value)
+        {
+            _settingsService.LibreTranslateServer = value;
+        }
+        partial void OnLXMusicServerChanged(string value)
+        {
+            _settingsService.LXMusicServer = value;
+        }
+        partial void OnAutoStartWindowTypeChanged(AutoStartWindowType value)
+        {
+            _settingsService.AutoStartWindowType = value;
+        }
+        partial void OnAutoLockOnDesktopModeChanged(bool value)
+        {
+            _settingsService.AutoLockOnDesktopMode = value;
+        }
+        partial void OnCoverImageRadiusChanged(int value)
+        {
+            _settingsService.CoverImageRadius = value;
+        }
+        partial void OnCoverOverlayBlurAmountChanged(int value)
+        {
+            _settingsService.CoverOverlayBlurAmount = value;
+        }
+        partial void OnCoverAcrylicEffectAmountChanged(int value)
+        {
+            _settingsService.CoverAcrylicEffectAmount = value;
+        }
+        partial void OnCoverOverlayOpacityChanged(int value)
+        {
+            _settingsService.CoverOverlayOpacity = value;
+        }
+        partial void OnIsDynamicCoverOverlayEnabledChanged(bool value)
+        {
+            _settingsService.IsDynamicCoverOverlayEnabled = value;
+        }
+        partial void OnLanguageChanged(Enums.Language value)
+        {
+            switch (value)
+            {
+                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;
+            }
+            _settingsService.Language = Language;
+        }
+        partial void OnIsFanLyricsEnabledChanged(bool value)
+        {
+            _settingsService.IsFanLyricsEnabled = value;
+        }
+        partial void OnIsLyricsGlowEffectEnabledChanged(bool value)
+        {
+            _settingsService.IsLyricsGlowEffectEnabled = value;
+        }
+        partial void OnLyricsAlignmentTypeChanged(TextAlignmentType value)
+        {
+            _settingsService.LyricsAlignmentType = value;
+        }
+        partial void OnSongInfoAlignmentTypeChanged(TextAlignmentType value)
+        {
+            _settingsService.SongInfoAlignmentType = value;
+        }
+        partial void OnLyricsBlurAmountChanged(int value)
+        {
+            _settingsService.LyricsBlurAmount = value;
+        }
+        partial void OnLyricsCustomBgFontColorChanged(Color value)
+        {
+            _settingsService.LyricsCustomBgFontColor = value;
+        }
+        partial void OnLyricsCustomFgFontColorChanged(Color value)
+        {
+            _settingsService.LyricsCustomFgFontColor = value;
+        }
+        partial void OnLyricsCustomStrokeFontColorChanged(Color value)
+        {
+            _settingsService.LyricsCustomStrokeFontColor = value;
+        }
+        partial void OnLyricsBgFontColorTypeChanged(LyricsFontColorType value)
+        {
+            _settingsService.LyricsBgFontColorType = value;
+        }
+        partial void OnLyricsFgFontColorTypeChanged(LyricsFontColorType value)
+        {
+            _settingsService.LyricsFgFontColorType = value;
+        }
+        partial void OnLyricsStrokeFontColorTypeChanged(LyricsFontColorType value)
+        {
+            _settingsService.LyricsStrokeFontColorType = value;
+        }
+        partial void OnLyricsStandardFontSizeChanged(int value)
+        {
+            _settingsService.LyricsStandardFontSize = value;
+        }
+        partial void OnLyricsDockFontSizeChanged(int value)
+        {
+            _settingsService.LyricsDockFontSize = value;
+        }
+        partial void OnLyricsDesktopFontSizeChanged(int value)
+        {
+            _settingsService.LyricsDesktopFontSize = value;
+        }
+        partial void OnLyricsFontWeightChanged(LyricsFontWeight value)
+        {
+            _settingsService.LyricsFontWeight = value;
+        }
+        partial void OnLyricsGlowEffectScopeChanged(LineRenderingType value)
+        {
+            _settingsService.LyricsGlowEffectScope = value;
+        }
+        partial void OnLyricsHighlightScopeChanged(LineRenderingType value)
+        {
+            _settingsService.LyricsHighlightScope = value;
+        }
+        partial void OnLyricsLineSpacingFactorChanged(float value)
+        {
+            _settingsService.LyricsLineSpacingFactor = value;
+        }
+        partial void OnLyricsVerticalEdgeOpacityChanged(int value)
+        {
+            _settingsService.LyricsVerticalEdgeOpacity = value;
+        }
+        partial void OnTimelineSyncThresholdChanged(int value)
+        {
+            _settingsService.TimelineSyncThreshold = value;
+        }
+        partial void OnIsLyricsFloatAnimationEnabledChanged(bool value)
+        {
+            _settingsService.IsLyricsFloatAnimationEnabled = value;
+        }
+        partial void OnResetPositionOffsetOnSongChangedChanged(bool value)
+        {
+            _settingsService.ResetPositionOffsetOnSongChanged = value;
+        }
+        partial void OnLyricsBgFontOpacityChanged(int value)
+        {
+            _settingsService.LyricsBgFontOpacity = value;
+        }
+        partial void OnHideWindowWhenNotPlayingChanged(bool value)
+        {
+            _settingsService.HideWindowWhenNotPlaying = value;
+        }
+        partial void OnDockWindowHeightChanged(int value)
+        {
+            _settingsService.DockWindowHeight = value;
+        }
+        partial void OnSelectedFontFamilyIndexChanged(int value)
+        {
+            _settingsService.SelectedFontFamilyIndex = value;
+            LyricsFontFamily = SystemFontNames[value];
+        }
+        partial void OnLyricsFontFamilyChanged(string value)
+        {
+            _settingsService.LyricsFontFamily = value;
+        }
+        partial void OnIsDragEverywhereEnabledChanged(bool value)
+        {
+            _settingsService.IsDragEverywhereEnabled = value;
+
+            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                lyricsWindow.UpdateTitleBarArea();
+            }
+        }
+        partial void OnIsLibreTranslateEnabledChanged(bool value)
+        {
+            _settingsService.IsLibreTranslateEnabled = value;
+        }
+    }
+}

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

@@ -0,0 +1,237 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class SettingsPageViewModel
+    {
+        public string Version { get; set; } = MetadataHelper.AppVersion;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLibreTranslateEnabled { get; set; }
+
+        [ObservableProperty]
+        public partial bool IsDragEverywhereEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial string LyricsFontFamily { get; set; }
+
+        [ObservableProperty]
+        public partial ObservableCollection<string> SystemFontNames { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int SelectedFontFamilyIndex { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial DockPlacement DockPlacement { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LockHotKeyIndex { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial ElementTheme LyricsBackgroundTheme { get; set; }
+
+        [ObservableProperty]
+        public partial AutoStartWindowType AutoStartWindowType { get; set; }
+
+        [ObservableProperty]
+        public partial bool AutoLockOnDesktopMode { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverImageRadius { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverOverlayBlurAmount { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverOverlayOpacity { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsDebugOverlayEnabled { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLogEnabled { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsDynamicCoverOverlayEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int CoverAcrylicEffectAmount { get; set; }
+
+        [ObservableProperty]
+        public partial Enums.Language Language { get; set; }
+
+        [ObservableProperty]
+        public partial ObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial ObservableCollection<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial ObservableCollection<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; }
+
+        [ObservableProperty]
+        public partial ObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsFanLyricsEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLyricsGlowEffectEnabled { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial TextAlignmentType LyricsAlignmentType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial TextAlignmentType SongInfoAlignmentType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsBlurAmount { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial Color LyricsCustomBgFontColor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial Color LyricsCustomFgFontColor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial Color LyricsCustomStrokeFontColor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsBgFontOpacity { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontColorType LyricsBgFontColorType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontColorType LyricsFgFontColorType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontColorType LyricsStrokeFontColorType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsStandardFontSize { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsDockFontSize { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsDesktopFontSize { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LyricsFontWeight LyricsFontWeight { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LineRenderingType LyricsGlowEffectScope { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LineRenderingType LyricsHighlightScope { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial float LyricsLineSpacingFactor { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsVerticalEdgeOpacity { get; set; }
+
+        [ObservableProperty]
+        public partial object NavViewSelectedItemTag { get; set; } = "App";
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool ResetPositionOffsetOnSongChanged { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLyricsFloatAnimationEnabled { get; set; }
+
+        [ObservableProperty]
+        public partial string LibreTranslateServer { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int SelectedTargetLanguageIndex { get; set; } = 0;
+
+        [ObservableProperty]
+        public partial bool IsLibreTranslateServerTesting { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsFontStrokeWidth { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IgnoreFullscreenWindow { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial EasingType LyricsScrollEasingType { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsScrollDuration { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int TimelineSyncThreshold { get; set; }
+
+        [ObservableProperty]
+        public partial bool IsLXMusicServerTesting { get; set; } = false;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial string LXMusicServer { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool HideWindowWhenNotPlaying { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int DockWindowHeight { get; set; }
+    }
+}

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

@@ -31,296 +31,11 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private readonly string _autoStartupTaskId = "AutoStartup";
 
-        public SettingsPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IPlaybackService playbackService, ITranslateService libreTranslateService) : base(settingsService)
-        {
-            _libWatcherService = libWatcherService;
-            _playbackService = playbackService;
-            _libreTranslateService = libreTranslateService;
-
-            IsLibreTranslateEnabled = _settingsService.IsLibreTranslateEnabled;
-            LibreTranslateServer = _settingsService.LibreTranslateServer;
-            SelectedTargetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
-
-            LocalMediaFolders = [.. _settingsService.LocalMediaFolders];
-            LyricsSearchProvidersInfo = [.. _settingsService.LyricsSearchProvidersInfo];
-            AlbumArtSearchProvidersInfo = [.. _settingsService.AlbumArtSearchProvidersInfo];
-
-            Language = _settingsService.Language;
-            CoverImageRadius = _settingsService.CoverImageRadius;
-
-            AutoStartWindowType = _settingsService.AutoStartWindowType;
-            AutoLockOnDesktopMode = _settingsService.AutoLockOnDesktopMode;
-
-            IsDynamicCoverOverlayEnabled = _settingsService.IsDynamicCoverOverlayEnabled;
-            CoverOverlayOpacity = _settingsService.CoverOverlayOpacity;
-            CoverOverlayBlurAmount = _settingsService.CoverOverlayBlurAmount;
-
-            CoverAcrylicEffectAmount = _settingsService.CoverAcrylicEffectAmount;
-
-            LyricsAlignmentType = _settingsService.LyricsAlignmentType;
-            SongInfoAlignmentType = _settingsService.SongInfoAlignmentType;
-            LyricsFontWeight = _settingsService.LyricsFontWeight;
-            LyricsBlurAmount = _settingsService.LyricsBlurAmount;
-            LyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
-            LyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
-            LyricsFontSize = _settingsService.LyricsFontSize;
-            IsLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
-            LyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
-            LyricsHighlightScope = _settingsService.LyricsHighlightScope;
-            IsFanLyricsEnabled = _settingsService.IsFanLyricsEnabled;
-
-            LyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
-            LyricsFgFontColorType = _settingsService.LyricsFgFontColorType;
-            LyricsStrokeFontColorType = _settingsService.LyricsStrokeFontColorType;
-
-            LyricsCustomBgFontColor = _settingsService.LyricsCustomBgFontColor;
-            LyricsCustomFgFontColor = _settingsService.LyricsCustomFgFontColor;
-            LyricsCustomStrokeFontColor = _settingsService.LyricsCustomStrokeFontColor;
-
-            LyricsFontStrokeWidth = _settingsService.LyricsFontStrokeWidth;
-            LyricsBackgroundTheme = _settingsService.LyricsBackgroundTheme;
-            MediaSourceProvidersInfo = [.. _settingsService.MediaSourceProvidersInfo];
-            IgnoreFullscreenWindow = _settingsService.IgnoreFullscreenWindow;
-
-            LyricsScrollEasingType = _settingsService.LyricsScrollEasingType;
-            LyricsScrollDuration = _settingsService.LyricsScrollDuration;
-            TimelineSyncThreshold = _settingsService.TimelineSyncThreshold;
-
-            IsLyricsFloatAnimationEnabled = _settingsService.IsLyricsFloatAnimationEnabled;
-            ResetPositionOffsetOnSongChanged = _settingsService.ResetPositionOffsetOnSongChanged;
-            LockHotKeyIndex = _settingsService.LockHotKeyIndex;
-
-            LXMusicServer = _settingsService.LXMusicServer;
-            DockPlacement = _settingsService.DockPlacement;
-            LyricsBgFontOpacity = _settingsService.LyricsBgFontOpacity;
-            HideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
-            DockWindowHeight = _settingsService.DockWindowHeight;
-
-            SystemFontNames = [.. FontHelper.SystemFontFamilies];
-            SelectedFontFamilyIndex = _settingsService.SelectedFontFamilyIndex;
-            LyricsFontFamily = _settingsService.LyricsFontFamily;
-            IsDragEverywhereEnabled = _settingsService.IsDragEverywhereEnabled;
-
-            _playbackService.MediaSourceProvidersInfoChanged += PlaybackService_SessionIdsChanged;
-        }
-
         private void PlaybackService_SessionIdsChanged(object? sender, Events.MediaSourceProvidersInfoEventArgs e)
         {
             MediaSourceProvidersInfo = [.. e.MediaSourceProviersInfo];
         }
 
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsLibreTranslateEnabled { get; set; }
-
-        [ObservableProperty]
-        public partial bool IsDragEverywhereEnabled { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial string LyricsFontFamily { get; set; }
-
-
-        [ObservableProperty]
-        public partial ObservableCollection<string> SystemFontNames { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int SelectedFontFamilyIndex { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial DockPlacement DockPlacement { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LockHotKeyIndex { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial ElementTheme LyricsBackgroundTheme { get; set; }
-
-        [ObservableProperty]
-        public partial AutoStartWindowType AutoStartWindowType { get; set; }
-
-        [ObservableProperty]
-        public partial bool AutoLockOnDesktopMode { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int CoverImageRadius { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int CoverOverlayBlurAmount { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int CoverOverlayOpacity { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsDebugOverlayEnabled { get; set; } = false;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsLogEnabled { get; set; } = false;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsDynamicCoverOverlayEnabled { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int CoverAcrylicEffectAmount { get; set; }
-
-        [ObservableProperty]
-        public partial Enums.Language Language { get; set; }
-
-        [ObservableProperty]
-        public partial ObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial ObservableCollection<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial ObservableCollection<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; }
-
-        [ObservableProperty]
-        public partial ObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsFanLyricsEnabled { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsLyricsGlowEffectEnabled { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial TextAlignmentType LyricsAlignmentType { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial TextAlignmentType SongInfoAlignmentType { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LyricsBlurAmount { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial Color LyricsCustomBgFontColor { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial Color LyricsCustomFgFontColor { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial Color LyricsCustomStrokeFontColor { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LyricsBgFontOpacity { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LyricsFontColorType LyricsBgFontColorType { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LyricsFontColorType LyricsFgFontColorType { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LyricsFontColorType LyricsStrokeFontColorType { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LyricsFontSize { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LyricsFontWeight LyricsFontWeight { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LineRenderingType LyricsGlowEffectScope { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial LineRenderingType LyricsHighlightScope { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial float LyricsLineSpacingFactor { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LyricsVerticalEdgeOpacity { get; set; }
-
-        [ObservableProperty]
-        public partial object NavViewSelectedItemTag { get; set; } = "App";
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool ResetPositionOffsetOnSongChanged { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IsLyricsFloatAnimationEnabled { get; set; }
-
-        public string Version { get; set; } = MetadataHelper.AppVersion;
-
-        [ObservableProperty]
-        public partial string LibreTranslateServer { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int SelectedTargetLanguageIndex { get; set; } = 0;
-
-        [ObservableProperty]
-        public partial bool IsLibreTranslateServerTesting { get; set; } = false;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LyricsFontStrokeWidth { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool IgnoreFullscreenWindow { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial EasingType LyricsScrollEasingType { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int LyricsScrollDuration { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int TimelineSyncThreshold { get; set; }
-
-        [ObservableProperty]
-        public partial bool IsLXMusicServerTesting { get; set; } = false;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial string LXMusicServer { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial bool HideWindowWhenNotPlaying { get; set; }
-
-        [ObservableProperty]
-        [NotifyPropertyChangedRecipients]
-        public partial int DockWindowHeight { get; set; }
-
         public void OnLyricsSearchProvidersReordered()
         {
             _settingsService.LyricsSearchProvidersInfo = [.. LyricsSearchProvidersInfo];
@@ -525,212 +240,5 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             return result;
         }
-
-        partial void OnDockPlacementChanged(DockPlacement value)
-        {
-            _settingsService.DockPlacement = value;
-        }
-        partial void OnLyricsScrollEasingTypeChanged(EasingType value)
-        {
-            _settingsService.LyricsScrollEasingType = value;
-        }
-        partial void OnLyricsScrollDurationChanged(int value)
-        {
-            _settingsService.LyricsScrollDuration = value;
-        }
-        partial void OnLyricsBackgroundThemeChanged(ElementTheme value)
-        {
-            _settingsService.LyricsBackgroundTheme = value;
-        }
-        partial void OnLyricsFontStrokeWidthChanged(int value)
-        {
-            _settingsService.LyricsFontStrokeWidth = value;
-        }
-        partial void OnIgnoreFullscreenWindowChanged(bool value)
-        {
-            _settingsService.IgnoreFullscreenWindow = value;
-        }
-        partial void OnSelectedTargetLanguageIndexChanged(int value)
-        {
-            _settingsService.SelectedTargetLanguageIndex = value;
-        }
-        partial void OnLibreTranslateServerChanged(string value)
-        {
-            _settingsService.LibreTranslateServer = value;
-        }
-        partial void OnLXMusicServerChanged(string value)
-        {
-            _settingsService.LXMusicServer = value;
-        }
-        partial void OnAutoStartWindowTypeChanged(AutoStartWindowType value)
-        {
-            _settingsService.AutoStartWindowType = value;
-        }
-        partial void OnAutoLockOnDesktopModeChanged(bool value)
-        {
-            _settingsService.AutoLockOnDesktopMode = value;
-        }
-        partial void OnCoverImageRadiusChanged(int value)
-        {
-            _settingsService.CoverImageRadius = value;
-        }
-        partial void OnCoverOverlayBlurAmountChanged(int value)
-        {
-            _settingsService.CoverOverlayBlurAmount = value;
-        }
-        partial void OnCoverAcrylicEffectAmountChanged(int value)
-        {
-            _settingsService.CoverAcrylicEffectAmount = value;
-        }
-        partial void OnCoverOverlayOpacityChanged(int value)
-        {
-            _settingsService.CoverOverlayOpacity = value;
-        }
-        partial void OnIsDynamicCoverOverlayEnabledChanged(bool value)
-        {
-            _settingsService.IsDynamicCoverOverlayEnabled = value;
-        }
-        partial void OnLanguageChanged(Enums.Language value)
-        {
-            switch (value)
-            {
-                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;
-            }
-            _settingsService.Language = Language;
-        }
-        partial void OnIsFanLyricsEnabledChanged(bool value)
-        {
-            _settingsService.IsFanLyricsEnabled = value;
-        }
-        partial void OnIsLyricsGlowEffectEnabledChanged(bool value)
-        {
-            _settingsService.IsLyricsGlowEffectEnabled = value;
-        }
-        partial void OnLyricsAlignmentTypeChanged(TextAlignmentType value)
-        {
-            _settingsService.LyricsAlignmentType = value;
-        }
-        partial void OnSongInfoAlignmentTypeChanged(TextAlignmentType value)
-        {
-            _settingsService.SongInfoAlignmentType = value;
-        }
-        partial void OnLyricsBlurAmountChanged(int value)
-        {
-            _settingsService.LyricsBlurAmount = value;
-        }
-        partial void OnLyricsCustomBgFontColorChanged(Color value)
-        {
-            _settingsService.LyricsCustomBgFontColor = value;
-        }
-        partial void OnLyricsCustomFgFontColorChanged(Color value)
-        {
-            _settingsService.LyricsCustomFgFontColor = value;
-        }
-        partial void OnLyricsCustomStrokeFontColorChanged(Color value)
-        {
-            _settingsService.LyricsCustomStrokeFontColor = value;
-        }
-        partial void OnLyricsBgFontColorTypeChanged(LyricsFontColorType value)
-        {
-            _settingsService.LyricsBgFontColorType = value;
-        }
-        partial void OnLyricsFgFontColorTypeChanged(LyricsFontColorType value)
-        {
-            _settingsService.LyricsFgFontColorType = value;
-        }
-        partial void OnLyricsStrokeFontColorTypeChanged(LyricsFontColorType value)
-        {
-            _settingsService.LyricsStrokeFontColorType = value;
-        }
-        partial void OnLyricsFontSizeChanged(int value)
-        {
-            _settingsService.LyricsFontSize = value;
-        }
-        partial void OnLyricsFontWeightChanged(LyricsFontWeight value)
-        {
-            _settingsService.LyricsFontWeight = value;
-        }
-        partial void OnLyricsGlowEffectScopeChanged(LineRenderingType value)
-        {
-            _settingsService.LyricsGlowEffectScope = value;
-        }
-        partial void OnLyricsHighlightScopeChanged(LineRenderingType value)
-        {
-            _settingsService.LyricsHighlightScope = value;
-        }
-        partial void OnLyricsLineSpacingFactorChanged(float value)
-        {
-            _settingsService.LyricsLineSpacingFactor = value;
-        }
-        partial void OnLyricsVerticalEdgeOpacityChanged(int value)
-        {
-            _settingsService.LyricsVerticalEdgeOpacity = value;
-        }
-        partial void OnTimelineSyncThresholdChanged(int value)
-        {
-            _settingsService.TimelineSyncThreshold = value;
-        }
-        partial void OnIsLyricsFloatAnimationEnabledChanged(bool value)
-        {
-            _settingsService.IsLyricsFloatAnimationEnabled = value;
-        }
-        partial void OnResetPositionOffsetOnSongChangedChanged(bool value)
-        {
-            _settingsService.ResetPositionOffsetOnSongChanged = value;
-        }
-        partial void OnLyricsBgFontOpacityChanged(int value)
-        {
-            _settingsService.LyricsBgFontOpacity = value;
-        }
-        partial void OnHideWindowWhenNotPlayingChanged(bool value)
-        {
-            _settingsService.HideWindowWhenNotPlaying = value;
-        }
-        partial void OnDockWindowHeightChanged(int value)
-        {
-            _settingsService.DockWindowHeight = value;
-        }
-        partial void OnSelectedFontFamilyIndexChanged(int value)
-        {
-            _settingsService.SelectedFontFamilyIndex = value;
-            LyricsFontFamily = SystemFontNames[value];
-        }
-        partial void OnLyricsFontFamilyChanged(string value)
-        {
-            _settingsService.LyricsFontFamily = value;
-        }
-        partial void OnIsDragEverywhereEnabledChanged(bool value)
-        {
-            _settingsService.IsDragEverywhereEnabled = value;
-
-            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (lyricsWindow != null)
-            {
-                lyricsWindow.UpdateTitleBarArea();
-            }
-        }
-        partial void OnIsLibreTranslateEnabledChanged(bool value)
-        {
-            _settingsService.IsLibreTranslateEnabled = value;
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SystemTrayViewModel.cs

@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Xaml;
+using System;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -40,7 +41,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 DockModeHelper.Disable(lyricsWindow);
             }
-            Application.Current.Exit();
+            Environment.Exit(0);
         }
 
         [RelayCommand]
@@ -49,6 +50,18 @@ namespace BetterLyrics.WinUI3.ViewModels
             WindowHelper.OpenWindow<SettingsWindow>();
         }
 
+        [RelayCommand]
+        private static void OpenMusicGallery()
+        {
+            WindowHelper.OpenWindow<MusicGalleryWindow>();
+        }
+
+        [RelayCommand]
+        private static void OpenLyricsWindow()
+        {
+            WindowHelper.OpenWindow<LyricsWindow>();
+        }
+
         [RelayCommand]
         private void UnlockWindow()
         {

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

@@ -29,7 +29,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 FontFamily="{x:Bind ViewModel.LyricsFontFamily, Mode=OneWay}"
-                FontSize="{x:Bind ViewModel.LyricsFontSize, Mode=OneWay}" />
+                FontSize="{x:Bind ViewModel.LyricsStandardFontSize, Mode=OneWay}" />
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
@@ -264,7 +264,7 @@
                             </Button.DataContext>
                         </Button>-->
 
-                        <!--  Translation  -->
+                        <!--  Lyrics & Translation  -->
                         <Button
                             Click="TranslationButton_Click"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -275,12 +275,27 @@
                             </ToolTipService.ToolTip>
                             <Button.ContextFlyout>
                                 <Flyout x:Name="TranslationFlyout" ShouldConstrainToRootBounds="False">
-                                    <StackPanel>
-                                        <ToggleSwitch x:Uid="LyricsPageTranslationEnabled" IsOn="{x:Bind ViewModel.IsTranslationEnabled, Mode=TwoWay}" />
-                                        <ToggleSwitch
-                                            x:Uid="LyricsPageTranslationOnly"
-                                            IsEnabled="{x:Bind ViewModel.IsTranslationEnabled, Mode=OneWay}"
-                                            IsOn="{x:Bind ViewModel.ShowTranslationOnly, Mode=TwoWay}" />
+                                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                                        <controls:SettingsExpander
+                                            x:Uid="LyricsPageTranslationEnabled"
+                                            HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                                     Glyph=&#xE774;}"
+                                            IsExpanded="True">
+                                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsTranslationEnabled, Mode=TwoWay}" />
+                                            <controls:SettingsExpander.Items>
+                                                <controls:SettingsCard x:Uid="LyricsPageTranslationOnly" IsEnabled="{x:Bind ViewModel.IsTranslationEnabled, Mode=OneWay}">
+                                                    <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTranslationOnly, Mode=TwoWay}" />
+                                                </controls:SettingsCard>
+                                            </controls:SettingsExpander.Items>
+                                        </controls:SettingsExpander>
+                                        <StackPanel Orientation="Horizontal" Spacing="6">
+                                            <TextBlock x:Uid="LyricsPageLyricsProviderPrefix" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.LyricsSearchProvider, Mode=OneWay, Converter={StaticResource LyricsSearchProviderToDisplayNameConverter}}" />
+                                        </StackPanel>
+                                        <StackPanel Orientation="Horizontal" Spacing="6">
+                                            <TextBlock x:Uid="LyricsPageTranslationProviderPrefix" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind ViewModel.TranslationSearchProvider, Mode=OneWay, Converter={StaticResource TranslationSearchProviderToDisplayNameConverter}}" />
+                                        </StackPanel>
                                     </StackPanel>
                                 </Flyout>
                             </Button.ContextFlyout>
@@ -337,19 +352,9 @@
                     Maximum="{x:Bind ViewModel.SongDurationSeconds, Mode=OneWay}"
                     Minimum="0"
                     Style="{StaticResource GhostSliderStyle}"
+                    Tapped="TimelineSliderOverlay_Tapped"
                     ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}"
                     Value="{x:Bind ViewModel.TimelinePositionSeconds, Mode=OneWay}" />
-
-                <Slider
-                    x:Name="TimelineSliderOverlay"
-                    Margin="0,-32,0,0"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Maximum="{Binding ElementName=TimelineSlider, Path=Maximum}"
-                    Minimum="0"
-                    Style="{StaticResource TransparentSliderStyle}"
-                    Tapped="TimelineSliderOverlay_Tapped"
-                    ThumbToolTipValueConverter="{StaticResource SecondsToFormattedTimeConverter}" />
             </Grid>
 
         </Grid>

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

@@ -142,7 +142,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void TimelineSliderOverlay_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
         {
-            _playbackService.ChangePosition(TimelineSliderOverlay.Value);
+            _playbackService.ChangePosition(TimelineSlider.Value);
         }
     }
 }

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

@@ -10,6 +10,7 @@ using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
+using System;
 using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -272,7 +273,7 @@ namespace BetterLyrics.WinUI3.Views
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
             DockModeHelper.Disable(this);
-            Application.Current.Exit();
+            Environment.Exit(0);
         }
 
         private void MaximiseButton_Click(object sender, RoutedEventArgs e)

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

@@ -688,22 +688,60 @@
                                     </interactivity:Interaction.Behaviors>
                                 </ColorPicker>
 
-                                <controls:SettingsCard x:Uid="SettingsPageLyricsFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsStandardFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
                                         <TextBlock
                                             Margin="0,0,14,0"
                                             VerticalAlignment="Center"
-                                            Text="{Binding ElementName=LyricsFontSizeSlider, Path=Value, Mode=OneWay}" />
+                                            Text="{Binding ElementName=LyricsStandardFontSizeSlider, Path=Value, Mode=OneWay}" />
                                         <Slider
-                                            x:Name="LyricsFontSizeSlider"
+                                            x:Name="LyricsStandardFontSizeSlider"
                                             Maximum="96"
                                             Minimum="12"
                                             SnapsTo="Ticks"
                                             StepFrequency="2"
                                             TickFrequency="2"
                                             TickPlacement="Outside"
-                                            Value="{x:Bind ViewModel.LyricsFontSize, Mode=TwoWay}" />
+                                            Value="{x:Bind ViewModel.LyricsStandardFontSize, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsDockFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock
+                                            Margin="0,0,14,0"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding ElementName=LyricsDockFontSizeSlider, Path=Value, Mode=OneWay}" />
+                                        <Slider
+                                            x:Name="LyricsDockFontSizeSlider"
+                                            Maximum="96"
+                                            Minimum="12"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="2"
+                                            TickFrequency="2"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.LyricsDockFontSize, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsDesktopFontSize" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E9;}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock
+                                            Margin="0,0,14,0"
+                                            VerticalAlignment="Center"
+                                            Text="{Binding ElementName=LyricsDesktopFontSizeSlider, Path=Value, Mode=OneWay}" />
+                                        <Slider
+                                            x:Name="LyricsDesktopFontSizeSlider"
+                                            Maximum="96"
+                                            Minimum="12"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="2"
+                                            TickFrequency="2"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.LyricsDesktopFontSize, Mode=TwoWay}" />
                                     </StackPanel>
                                 </controls:SettingsCard>
 

README.CN.md

@@ -2,59 +2,118 @@
 
 <a href="https://github.com/jayfunc/BetterLyrics/blob/dev/README.md">_**🌐 Click here to see the English version**_</a>
 
-<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓ 点击查看常见问题（FAQ）**_</a>
+<a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓ 点此查看常见问题（FAQ）**_</a>
 
 <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">
-基于 WinUI 3 构建的流畅动态歌词显示工具
-</h3>
+一个基于 WinUI 3 和 Win2D 构建的动态歌词显示工具 —— 支持本地播放，并可监听多种播放器
+</h4>
 
-## 🎉 本项目已获得少数派推荐！
+## 🎉 本项目已被少数派推荐！
 
-查看文章：[BetterLyrics – 专为 Windows 设计的沉浸式流畅歌词显示工具](https://sspai.com/post/101028)
+查看文章：[BetterLyrics - 一款专为 Windows 打造的沉浸式流畅歌词显示软件](https://sspai.com/post/101028)
 
-## 🔈 反馈交流群
+## 🔈 反馈与交流群
 
-- [QQ](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) (1054700388) | [Discord](https://discord.gg/5yAQPnyCKv) | [Telegram](https://t.me/+svhSLZ7awPsxNGY1)
+- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ 群](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)（群号：1054700388）
+- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
+- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
 
-## 🌟 核心亮点功能
+## 🌟 核心特色
 
-- 🌠 美观的用户界面
-  - 流畅的动画与视觉特效，打造赏心悦目的歌词体验
-- ↔️ 强大的歌词翻译功能
-  - 支持离线机器翻译，涵盖 30 种语言
-  - 自动读取本地歌词文件中的嵌入翻译
-- 🧩 多种歌词来源
+- 🌠 **优雅的用户界面**
+  - 丰富流畅的动画与特效
+- ↔️ **强大的歌词翻译功能**
+  - 支持离线翻译（支持 30 种语言）
+  - 自动读取本地歌词文件中的双语翻译内容
+- 🧩 **多种歌词来源支持**
   - 本地存储
-    - 音乐文件（支持嵌入歌词）
-    - [.lrc](<https://en.wikipedia.org/wiki/LRC_(file_format)>) 歌词文件（兼容标准格式和增强格式）
-    - [.eslrc](https://github.com/ESLyric/release) 格式
-    - [.ttml](https://en.wikipedia.org/wiki/Timed_Text_Markup_Language) 格式
-  - 在线歌词服务
+    - 音乐文件（嵌入式歌词）
+    - [.lrc](https://zh.wikipedia.org/wiki/LRC) 文件（支持标准与增强格式）
+    - [.eslrc](https://github.com/ESLyric/release) 文件
+    - [.ttml](https://zh.wikipedia.org/wiki/Timed_Text_Markup_Language) 文件
+  - 在线歌词源
     - QQ 音乐
     - 网易云音乐
     - 酷狗音乐
     - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
     - [LRCLIB](https://lrclib.net/)
-- 🪟 多种歌词显示模式
-  - 标准模式
-    - 沉浸式歌词体验，搭配丰富动画与动态背景，听歌更享受
-  - 停靠模式
-    - 智能歌词栏固定在屏幕边缘，简洁美观、互不打扰
-  - 桌面模式
-    - 歌词悬浮于其他窗口之上，边听歌边工作两不误
-- 🧠 智能行为支持
-  - 音乐播放器关闭后自动隐藏歌词窗口，干净整洁不打扰
 
-> 本项目仍在开发中，最新版本可能存在 bug 和意外行为。
+- 🎶 **支持多种播放器**
 
-## 应用截图
+  - <details><summary>网易云音乐</summary>
+
+    - 请先安装 [BetterNCM 插件](https://microblock.cc/betterncm)。若安装后出现降级提示，请按提示将网易云降级至 2.10.13；
+    - 然后在插件市场安装 InfLink 插件，安装完成后重启网易云即可！
+
+    </details>
+
+  - <details><summary>酷狗音乐</summary>
+
+    - 请确保酷狗设置中已开启“支持系统播放控制，如锁屏界面控制”
+    - 当前版本无法获取时间轴信息，意味着无法检测进度条的跳转
+
+    </details>
+
+  - <details><summary>Apple Music</summary>
+
+    - 建议在设置中将“时间轴同步容差”调至 600ms 左右（设置 → 高级选项），否则歌词会前后晃动
+
+    </details>
+
+  - <details><summary>foobar2000</summary>
+
+    - 请安装插件：https://github.com/dumbie/foo_mediacontrol
+
+    </details>
+
+  - Spotify  
+  - QQ 音乐  
+  - PotPlayer  
+  - Windows 自带媒体播放器  
+
+  - <details><summary>LX Music</summary>
+
+    - 请在 LX Music 设置中开启“开放 API”
+    - 然后在 BetterLyrics 设置中填写 LX 服务器地址（通常是 http://127.0.0.1:23330）
+
+    </details>
+
+  - <details><summary>MusicBee</summary>
+
+    - 请安装插件：https://github.com/HenryPDT/mb_MediaControl
+
+    </details>
+
+  - <details><summary>iTunes</summary>
+
+    - 请安装插件：https://github.com/thewizrd/iTunes-SMTC
+
+    </details>
+
+  - <details><summary>AIMP</summary>
+
+    - 请安装插件：https://www.aimp.ru/?do=catalog&rec_id=1097
+
+    </details>
+
+- 🪟 **多种展示模式**
+  - **标准模式**：沉浸式动画歌词 + 动态背景
+  - **吸附模式**：屏幕边缘浮动歌词条
+  - **桌面模式**：歌词悬浮在所有窗口之上
+
+- 🧠 **智能行为**
+  - 检测播放器关闭自动隐藏歌词
+
+> 本项目仍在开发中，开发分支可能存在 bug 或异常行为。
+
+## 软件截图
 
 ### 标准模式
 
@@ -68,7 +127,7 @@ BetterLyrics
 
 ![alt text](Screenshots/album-art-only.png)
 
-### 悬浮模式
+### 吸附模式
 
 ![alt text](Screenshots/dock-1.png)
 
@@ -80,95 +139,69 @@ BetterLyrics
 
 ![alt text](Screenshots/desktop-2.png)
 
-## 演示视频
+## 使用演示
 
-观看我们的介绍视频（2025 年 7 月 7 日上传）：[B 站链接](https://www.bilibili.com/video/BV1zjGjzfEXh)
+观看我们于 2025 年 7 月 7 日上传的哔哩哔哩介绍视频：[点击这里](https://www.bilibili.com/video/BV1zjGjzfEXh)
 
-## 已测试的音乐播放器
+## 立即下载试用
 
-- 网易云音乐
-  - 请先安装 [BetterNCM 插件](https://microblock.cc/betterncm) 安装完成后如若弹出降级指引，请根据指引完成网易云音乐的降级操作（降级至 2.10.13）；
-  - 之后请在 PluginMarket 内安装 InfLink 插件，安装完成后请重启网易云音乐。至此，所有预备操作均已完成，尽情享用吧！
-- 酷狗音乐
-  - 请确保酷狗音乐设置项 “支持系统播放控件，如锁屏界面” 已开启
-  - 不会广播时间线信息，这意味着当您在酷狗音乐中更改播放进度时，BetterLyrics 无法检测到此更改。
-- Apple Music
-  - 确保您在设置中将时间线阈值设置为约 600 毫秒（进入"设置"-"高级选项"进行更改），否则歌词会不断前后跳动。
-- foobar2000
-  - 确保您安装了 https://github.com/dumbie/foo_mediacontrol 插件
-- Spotify
-- QQ 音乐
-- PotPlayer
-- 媒体播放器（系统自带）
-- LX 音乐
-  - 请确保您已在 LX 音乐设置页面启用“开放 API”
-  - 然后打开 BetterLyrics，进入设置，点击“高级选项”，输入您的 LX 音乐服务器地址（例如 http://127.0.0.1:23330）即可
-- MusicBee
-  - 请先安装 https://github.com/HenryPDT/mb_MediaControl
-- iTunes
-  - 请先安装 https://github.com/thewizrd/iTunes-SMTC
-- AIMP
-  - 请先安装 https://www.aimp.ru/?do=catalog&rec_id=1097
-
-## 立即下载体验
-
-### Microsoft Store
+### Microsoft Store 推荐安装方式
 
 <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>
 
-**最简单**的获取方式，**无限制**免费试用或购买（免费版与付费版**功能完全相同**）
+**最方便**的获取方式，支持**永久免费试用**与购买（免费版与付费版**无功能差异**）
 
-☕ 如果您觉得本软件好用，请考虑在 **Microsoft Store** 中购买支持开发者 🧧，非常感谢您的支持！🥰
+☕ 如果你觉得本软件对你有帮助，欢迎在 Microsoft Store **支持我一杯奶茶** 🧧🥰
 
-> 稳定版本发布时，Microsoft Store 将永远是第一个收到更新的渠道。
+> 一旦有稳定版发布，Microsoft Store 将是第一更新渠道。
 
-### Google Drive
+### 备用下载方式：Google Drive
 
-或从 Google Drive 获取（请查看[发布页面](https://github.com/jayfunc/BetterLyrics/releases)获取链接）
+你也可以在 [发布页](https://github.com/jayfunc/BetterLyrics/releases) 找到 Google Drive 下载链接
 
-> 请注意您下载的是".zip"文件，安装指南请参考[此文档](How2Install/How2Install.md)。
+> 下载为 `.zip` 压缩包，安装方法请参阅：[安装指南](How2Install/How2Install.md)
 
-## 特别感谢
+## 致谢
 
-- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)
-  - 提供 QQ、网易、酷狗音源的歌词获取、解密和解析
-- [LRCLIB](https://lrclib.net/)
-  - LRCLIB 歌词 API 提供商
-- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)
-  - 用于提取音乐文件中的图片
-- [WinUIEx](https://github.com/dotMorten/WinUIEx)
-  - 提供便捷的 Win32 API 窗口操作方式
-- [TagLib#](https://github.com/mono/taglib-sharp)
-  - 用于读取原始歌词内容
-- [Vanara](https://github.com/dahall/Vanara)
-  - Win32 API 包装器
-- [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)
-- [r2d2rigo/Win2D-Samples](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)
-- [CommunityToolkit - 从入门到精通](https://mvvm.coldwind.top/)
+- [Lyricify-Lyrics-Helper](https://github.com/WXRIW/Lyricify-Lyrics-Helper)  
+  - 提供 QQ、网易、酷狗歌词解析与解密支持  
+- [LRCLIB](https://lrclib.net/)  
+  - 歌词 API 提供方  
+- [Audio Tools Library (ATL) for .NET](https://github.com/Zeugma440/atldotnet)  
+  - 用于提取音乐封面图像  
+- [WinUIEx](https://github.com/dotMorten/WinUIEx)  
+  - 提供窗口相关 Win32 API 简化访问方式  
+- [TagLib#](https://github.com/mono/taglib-sharp)  
+  - 用于读取音频文件中的歌词内容  
+- [Vanara](https://github.com/dahall/Vanara)  
+  - Win32 API 封装库  
+- [StackOverflow - 如何为 WPF 动画 Margin 属性](https://stackoverflow.com/a/21542882/11048731)  
+- [DevWinUI](https://github.com/ghost1372/DevWinUI)  
+- [Bilibili -【WinUI3】SystemBackdropController 讲解](https://www.bilibili.com/video/BV1PY4FevEkS)  
+- [博客园 - .NET App 与 SMTC 控制](https://www.cnblogs.com/TwilightLemon/p/18279496)  
+- [Win2D 中的游戏循环介绍](https://www.cnblogs.com/walterlv/p/10236395.html)  
+- [Win2D 示例 - Iris Blur](https://github.com/r2d2rigo/Win2D-Samples/blob/master/IrisBlurWin2D/IrisBlurWin2D/MainPage.xaml.cs)  
+- [CommunityToolkit 教程](https://mvvm.coldwind.top/)
 
-## 设计灵感来源
+## 灵感来源
 
 - [refined-now-playing-netease](https://github.com/solstice23/refined-now-playing-netease)
 - [Lyricify-App](https://github.com/WXRIW/Lyricify-App)
 - [椒盐音乐 Salt Player](https://moriafly.com/program/salt-player)
 - [MyToolBar](https://github.com/TwilightLemon/MyToolBar)
 
-## ✍️ 帮助我们翻译成您的语言
+## ✍️ 欢迎协助翻译！
 
-找不到您的语言？
-别担心！立即开始翻译，成为贡献者！😆
-点击[链接](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866)，立即通过 Crowdin 将这款应用翻译成您的语言！
+找不到你的语言？
+没关系！快来成为贡献者的一员吧！😆  
+点击此 [链接](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd832d8fcdb6f7e5a198b402502866) 使用 Crowdin 在线翻译！
 
-## Star 历史
+## Star 增长趋势
 
 [![Star History Chart](https://api.star-history.com/svg?repos=jayfunc/BetterLyrics&type=Date)](https://www.star-history.com/#jayfunc/BetterLyrics&Date)
 
-## 欢迎提交问题和拉取请求
+## 欢迎反馈和 PR！
 
-如果您发现 bug，请在 issues 中提交；如果您有任何想法，也欢迎在这里分享。
+发现 bug 请提交到 Issues，如有想法欢迎一起参与开发！

README.md

@@ -3,22 +3,25 @@
 <a href="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md">_**❓ Click here to view frequently asked questions (FAQ)**_</a>
 
 <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="64">
 </div>
 
 <h2 align="center">
 BetterLyrics
 </h2>
 <h4 align="center">
-Your smooth dynamic lyrics display tool built with WinUI 3
+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)
 
 ## 🔈 Feedback and chat group
 
-- [QQ](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) (1054700388) | [Discord](https://discord.gg/5yAQPnyCKv) | [Telegram](https://t.me/+svhSLZ7awPsxNGY1)
+- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\QQ.png" height="20"> QQ](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) (1054700388)
+- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Discord.png" height="12"> Discord](https://discord.gg/5yAQPnyCKv)
+- [<img src="BetterLyrics.WinUI3\BetterLyrics.WinUI3\Assets\Telegram.png" height="16"> Telegram](https://t.me/+svhSLZ7awPsxNGY1)
 
 ## 🌟 Highlighted features
 
@@ -39,9 +42,67 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
     - 酷狗音乐 Kugou Music
     - [amll-ttml-db](https://github.com/Steve-xmh/amll-ttml-db)
     - [LRCLIB](https://lrclib.net/)
+- 🎶 **Multiple Music Players Supported**
+
+  - <details><summary>NetEase Cloud Music</summary>
+
+    - Please install the [BetterNCM plugin](https://microblock.cc/betterncm) first. If a downgrade guide pops up after the installation, please follow the guide to complete the downgrade of NetEase Cloud Music (downgrade to 2.10.13);
+    - After that, please install the InfLink plugin in PluginMarket. After the installation is complete, please restart NetEase Cloud Music. At this point, all preparatory operations have been completed, enjoy it!
+
+    </details>
+
+  - <details><summary>Kugou Music</summary>
+
+    - Please make sure that the Kugou Music setting "Support system playback controls, such as lock screen interface" is turned on
+    - No timeline information broadcasted, which means when you change timeline position in Kugou Music, BetterLyrics has no way to detect this change.
+
+    </details>
+
+  - <details><summary>Apple Music</summary>
+
+    - Make sure you have set timeline threshold to around 600 ms in settings (Go to "Settings" - "Advanced option" to change), otherwise, the lyrics will be moving forward and afterward constantly.
+
+    </details>
+
+  - <details><summary>foobar2000</summary>
+
+    - Make sure you have https://github.com/dumbie/foo_mediacontrol installed with it
+
+    </details>
+
+  - Spotify
+  - QQ Music
+  - PotPlayer
+  - Media Player (System)
+
+  - <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 "Advanced options", 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>
+
 - 🪟 **Multiple Display Modes**
   - **Standard Mode**
-    - Enjoy an immersive listening journey with rich lyrics animations and beautifully dynamic backgrounds 
+    - Enjoy an immersive listening journey with rich lyrics animations and beautifully dynamic backgrounds
   - **Dock Mode**
     - A smart animated lyrics bar docked to your screen edge
   - **Desktop Mode**
@@ -81,32 +142,6 @@ Check out the article: [BetterLyrics – An immersive and smooth lyrics display
 
 Watch our introduction video (uploaded on 7 July 2025) on Bilibili [here](https://www.bilibili.com/video/BV1zjGjzfEXh).
 
-## Tested music player
-
-- NetEase Cloud Music
-  - Please install the [BetterNCM plugin](https://microblock.cc/betterncm) first. If a downgrade guide pops up after the installation, please follow the guide to complete the downgrade of NetEase Cloud Music (downgrade to 2.10.13);
-  - After that, please install the InfLink plugin in PluginMarket. After the installation is complete, please restart NetEase Cloud Music. At this point, all preparatory operations have been completed, enjoy it!
-- Kugou Music
-  - Please make sure that the Kugou Music setting "Support system playback controls, such as lock screen interface" is turned on
-  - No timeline information broadcasted, which means when you change timeline position in Kugou Music, BetterLyrics has no way to detect this change. 
-- Apple Music
-  - Make sure you have set timeline threshold to around 600 ms in settings (Go to "Settings" - "Advanced option" to change), otherwise, the lyrics will be moving forward and afterward constantly.
-- foobar2000
-  - Make sure you have https://github.com/dumbie/foo_mediacontrol installed with it
-- Spotify
-- QQ Music
-- PotPlayer
-- Media Player (System)
-- LX Music
-  - Please make sure you have enabled "Open API" in LX Music settings page
-  - Then open BetterLyrics, go to settings, go to "Advanced options", input your LX Music server address (mostly like http://127.0.0.1:23330) and there you go!
-- MusicBee
-  - Please install https://github.com/HenryPDT/mb_MediaControl before using
-- iTunes
-  - Please install https://github.com/thewizrd/iTunes-SMTC before using
-- AIMP
-  - Please install https://www.aimp.ru/?do=catalog&rec_id=1097 before using
-
 ## Try it now
 
 ### Microsoft Store
@@ -168,4 +203,4 @@ Click the [link](https://crowdin.com/project/betterlyrics/invite?h=d767e4f2dbd83
 
 ## Any issues and PRs are welcomed
 
-If you find a bug please file it in issues or if you have any ideas feel free to share it here.
+If you find a bug please file it in issues or if you have any ideas feel free to share it here.