Merge pull request #55 from jayfunc/dev

v1.0.26.0

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [jayfunc]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: founchoo
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

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

@@ -0,0 +1,20 @@
+on:
+  release:
+    types: [published]
+
+jobs:
+  github-releases-to-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: GitHub Releases to Discord
+        uses: SethCohen/github-releases-to-discord@v1
+        with:
+          webhook_url: ${{ secrets.WEBHOOK_URL }}
+          color: "2105893"
+          username: "GitHub"
+          avatar_url: "https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png"
+          content: "||@everyone||"
+          footer_title: "Changelog"
+          reduce_headings: true

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

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -12,6 +12,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsExpander/SettingsExpander.xaml" />
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
 
@@ -47,6 +48,8 @@
             <converter:IntToCornerRadius x:Key="IntToCornerRadius" />
             <converter:CornerRadiusToDoubleConverter x:Key="CornerRadiusToDoubleConverter" />
             <converter:LyricsSearchProviderToDisplayNameConverter x:Key="LyricsSearchProviderToDisplayNameConverter" />
+            <converter:AlbumArtSearchProviderToDisplayNameConverter x:Key="AlbumArtSearchProviderToDisplayNameConverter" />
+            <converter:SecondsToFormattedTimeConverter x:Key="SecondsToFormattedTimeConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
             <converters:ColorToDisplayNameConverter x:Key="ColorToDisplayNameConverter" />
@@ -64,7 +67,7 @@
             </Style>
             <Style x:Key="TitleBarButtonStyle" TargetType="Button">
                 <Setter Property="VerticalAlignment" Value="Top" />
-                <Setter Property="CornerRadius" Value="0" />
+                <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
                 <Setter Property="Padding" Value="16,9,16,11" />
                 <Setter Property="Margin" Value="0" />
@@ -81,7 +84,7 @@
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="VerticalAlignment" Value="Stretch" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="16,0" />
+                <Setter Property="Padding" Value="16,9,16,11" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostToggleButtonStyle" TargetType="ToggleButton">
@@ -91,11 +94,389 @@
                 <Setter Property="Padding" Value="8" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
+            <Style x:Key="CardGridStyle" TargetType="Grid">
+                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="CornerRadius" Value="6" />
+            </Style>
+
+            <Style x:Key="GhostSliderStyle" TargetType="Slider">
+                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                <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="{ThemeResource TextFillColorPrimaryBrush}" />
+                                        <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="2"
+                                            Fill="{TemplateBinding Background}" />
+                                        <Rectangle
+                                            x:Name="HorizontalDecreaseRect"
+                                            Grid.Row="1"
+                                            Fill="{TemplateBinding Foreground}" />
+                                        <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="2"
+                                            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="2"
+                                            Height="2"
+                                            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="24"
+                                            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="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>
+
+            <StaticResource x:Key="ToggleButtonBackgroundChecked" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ToggleButtonBackgroundCheckedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ToggleButtonBackgroundCheckedPressed" ResourceKey="TextFillColorPrimaryBrush" />
 
             <!--  Dimensions  -->
 
             <!--  Fonts  -->
-            <FontFamily x:Key="IconFontFamily">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
+            <FontFamily x:Key="IconFontFamily">ms-appx:///Assets/Segoe Fluent Icons.ttf#Segoe Fluent Icons</FontFamily>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

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

@@ -16,6 +16,7 @@ using ShadowViewer.Controls;
 using System;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3
@@ -42,7 +43,7 @@ namespace BetterLyrics.WinUI3
             ResourceLoader = new ResourceLoader();
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-            AppInfo.EnsureDirectories();
+            PathHelper.EnsureDirectories();
             ConfigureServices();
 
             _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
@@ -55,20 +56,11 @@ namespace BetterLyrics.WinUI3
 
         protected override void OnLaunched(LaunchActivatedEventArgs args)
         {
-            WindowHelper.OpenOrShowWindow<LyricsWindow>();
+            WindowHelper.OpenWindow<LyricsWindow>();
             var lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
             if (lyricsWindow == null) return;
 
-            string[] commandLineArguments = Environment.GetCommandLineArgs();
-            if (commandLineArguments.Length > 1)
-            {
-                commandLineArguments = commandLineArguments.Skip(1).ToArray();
-                if (commandLineArguments.First() == AppInfo.UnlockWindowTag)
-                {
-                    lyricsWindow.AutoSelectLyricsMode(AutoStartWindowType.DesktopMode, false);
-                    return;
-                }
-            }
+            lyricsWindow.ViewModel.InitLockHotKey();
             lyricsWindow.AutoSelectLyricsMode();
         }
 
@@ -76,7 +68,7 @@ namespace BetterLyrics.WinUI3
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Is(Serilog.Events.LogEventLevel.Verbose)
-                .WriteTo.File(AppInfo.LogFilePattern, rollingInterval: RollingInterval.Day)
+                .WriteTo.File(PathHelper.LogFilePattern, rollingInterval: RollingInterval.Day)
                 .CreateLogger();
 
             // Register services
@@ -90,15 +82,17 @@ namespace BetterLyrics.WinUI3
                     // Services
                     .AddSingleton<ISettingsService, SettingsService>()
                     .AddSingleton<IPlaybackService, PlaybackService>()
-                    .AddSingleton<IMusicSearchService, MusicSearchService>()
+                    .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
+                    .AddSingleton<ILyricsSearchService, LyricsSearchService>()
                     .AddSingleton<ILibWatcherService, LibWatcherService>()
-                    .AddSingleton<ILibreTranslateService, LibreTranslateService>()
+                    .AddSingleton<ITranslateService, TranslateService>()
                     // ViewModels
                     .AddSingleton<LyricsWindowViewModel>()
                     .AddSingleton<SettingsWindowViewModel>()
                     .AddSingleton<SystemTrayViewModel>()
                     .AddSingleton<SettingsPageViewModel>()
                     .AddSingleton<LyricsPageViewModel>()
+                    .AddSingleton<MusicGalleryViewModel>()
                     .AddSingleton<LyricsRendererViewModel>()
                     .BuildServiceProvider()
             );

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

@@ -1,116 +1,142 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <RootNamespace>BetterLyrics.WinUI3</RootNamespace>
-    <Platforms>x86;x64;ARM64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <UseWinUI>true</UseWinUI>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="ViewModels\Lyrics\**" />
-    <Content Remove="ViewModels\Lyrics\**" />
-    <EmbeddedResource Remove="ViewModels\Lyrics\**" />
-    <None Remove="ViewModels\Lyrics\**" />
-    <Page Remove="ViewModels\Lyrics\**" />
-    <PRIResource Remove="ViewModels\Lyrics\**" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="Controls\SystemTray.xaml" />
-    <None Remove="Views\SettingsWindow.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Logo.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="$(ApplicationManifest)" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
-    <PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250513-build.2126" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
-    <PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
-    <PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
-    <PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
-    <PackageReference Include="iTunesSearch" Version="1.0.44" />
-    <PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
-    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="ShadowViewer.Controls.Notification" Version="1.2.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
-    <PackageReference Include="System.Drawing.Common" Version="9.0.6" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.6" />
-    <PackageReference Include="TagLibSharp" Version="2.3.0" />
-    <PackageReference Include="Ude.NetStandard" Version="1.2.0" />
-    <PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.6" />
-    <PackageReference Include="Vanara.PInvoke.Shell32" Version="4.1.6" />
-    <PackageReference Include="Vanara.PInvoke.User32" Version="4.1.6" />
-    <PackageReference Include="WinUIEx" Version="2.6.0" />
-    <PackageReference Include="z440.atl.core" Version="7.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Rendering\InAppLyricsRenderer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Rendering\DesktopLyricsRenderer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <!--Disable Trimming for Specific Packages-->
-  <ItemGroup>
-    <TrimmerRootAssembly Include="TagLibSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Views\SettingsWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Update="Controls\SystemTray.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <!-- Publish Properties -->
-  <PropertyGroup>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
-    <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
-    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>$(DefineConstants)</DefineConstants>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <ApplicationIcon>Logo.ico</ApplicationIcon>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ShouldCreateLogs>True</ShouldCreateLogs>
-    <AdvancedSettingsExpanded>True</AdvancedSettingsExpanded>
-    <UpdateAssemblyVersion>False</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <UpdatePackageVersion>True</UpdatePackageVersion>
-    <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
-    <InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
-    <PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
-    <Version>2025.6.0</Version>
-    <AssemblyVersion>2025.6.18.0110</AssemblyVersion>
-    <FileVersion>2025.6.18.0110</FileVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+		<RootNamespace>BetterLyrics.WinUI3</RootNamespace>
+		<Platforms>x86;x64;ARM64</Platforms>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<Nullable>enable</Nullable>
+		<LangVersion>preview</LangVersion>
+		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+	</PropertyGroup>
+	<ItemGroup>
+		<Compile Remove="ViewModels\Lyrics\**" />
+		<Content Remove="ViewModels\Lyrics\**" />
+		<EmbeddedResource Remove="ViewModels\Lyrics\**" />
+		<None Remove="ViewModels\Lyrics\**" />
+		<Page Remove="ViewModels\Lyrics\**" />
+		<PRIResource Remove="ViewModels\Lyrics\**" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Remove="Assets\Core14.profile.xml" />
+		<None Remove="Assets\Segoe Fluent Icons.ttf" />
+		<None Remove="Controls\SystemTray.xaml" />
+		<None Remove="Views\MusicGalleryPage.xaml" />
+		<None Remove="Views\MusicGalleryWindow.xaml" />
+		<None Remove="Views\SettingsWindow.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="Logo.ico" />
+	</ItemGroup>
+	<ItemGroup>
+		<Manifest Include="$(ApplicationManifest)" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="3v.EvtSource" Version="2.0.0" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.230830" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.OpacityMaskView" Version="0.1.250703-build.2173" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
+		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.5" />
+		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.3.0" />
+		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
+		<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
+		<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
+		<PackageReference Include="NTextCat" Version="0.3.65" />
+		<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
+		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+		<PackageReference Include="ShadowViewer.Controls.Notification" Version="1.2.1" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
+		<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.7" />
+		<PackageReference Include="TagLibSharp" Version="2.3.0" />
+		<PackageReference Include="Ude.NetStandard" Version="1.2.0" />
+		<PackageReference Include="Vanara.PInvoke.CoreAudio" Version="4.1.6" />
+		<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.1.6" />
+		<PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.6" />
+		<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.1.6" />
+		<PackageReference Include="Vanara.PInvoke.User32" Version="4.1.6" />
+		<PackageReference Include="WinUIEx" Version="2.6.0" />
+		<PackageReference Include="z440.atl.core" Version="7.2.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Rendering\InAppLyricsRenderer.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Rendering\DesktopLyricsRenderer.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<!--Disable Trimming for Specific Packages-->
+	<ItemGroup>
+		<TrimmerRootAssembly Include="TagLibSharp" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Content Update="Assets\Segoe Fluent Icons.ttf">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\MusicGalleryWindow.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Views\MusicGalleryPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Views\SettingsWindow.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<ItemGroup>
+		<Page Update="Controls\SystemTray.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
+	</ItemGroup>
+	<!-- Publish Properties -->
+	<PropertyGroup>
+		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+		<PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
+		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+		<SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+	</PropertyGroup>
+	<PropertyGroup>
+		<DefineConstants>$(DefineConstants)</DefineConstants>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<ApplicationIcon>Logo.ico</ApplicationIcon>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<ShouldCreateLogs>True</ShouldCreateLogs>
+		<AdvancedSettingsExpanded>True</AdvancedSettingsExpanded>
+		<UpdateAssemblyVersion>False</UpdateAssemblyVersion>
+		<UpdateAssemblyFileVersion>False</UpdateAssemblyFileVersion>
+		<UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
+		<UpdatePackageVersion>True</UpdatePackageVersion>
+		<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
+		<InheritWinAppVersionFrom>AssemblyVersion</InheritWinAppVersionFrom>
+		<PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
+		<Version>2025.6.0</Version>
+		<AssemblyVersion>2025.6.18.0110</AssemblyVersion>
+		<FileVersion>2025.6.18.0110</FileVersion>
+	</PropertyGroup>
 </Project>

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

@@ -0,0 +1,33 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is AlbumArtSearchProvider provider)
+            {
+                return provider switch
+                {
+                    AlbumArtSearchProvider.Local => App.ResourceLoader!.GetString("AlbumArtSearchLocalProvider"),
+                    AlbumArtSearchProvider.SMTC => App.ResourceLoader!.GetString("AlbumArtSearchSMTCProvider"),
+                    AlbumArtSearchProvider.iTunes => "iTunes",
+                    _ => throw new Exception($"Unknown AlbumArtSearchProvider: {provider}"),
+                };
+            }
+            throw new ArgumentException("Value must be of type AlbumArtSearchProvider", nameof(value));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public class SecondsToFormattedTimeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is double seconds)
+            {
+                return TimeSpan.FromSeconds(seconds).ToString(@"mm\:ss");
+            }
+            else if (value is int secondsInt)
+            {
+                return TimeSpan.FromSeconds(secondsInt).ToString(@"mm\:ss");
+            }
+            return value?.ToString() ?? "";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum AlbumArtSearchProvider
+    {
+        Local,
+        SMTC,
+        iTunes,
+    }
+}

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

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum DockPlacement
+    {
+        Top,
+        Bottom
+    }
+
+    public static class DockPlacementExtensions
+    {
+        public static WindowPixelSampleMode ToWindowPixelSampleMode(this DockPlacement placement)
+        {
+            return placement switch
+            {
+                DockPlacement.Top => WindowPixelSampleMode.BelowWindow,
+                DockPlacement.Bottom => WindowPixelSampleMode.AboveWindow,
+                _ => throw new ArgumentOutOfRangeException(nameof(placement), placement, null)
+            };
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LineRenderingType.cs

@@ -4,7 +4,8 @@ namespace BetterLyrics.WinUI3.Enums
 {
     public enum LineRenderingType
     {
-        UntilCurrentChar,
-        CurrentCharOnly,
+        CurrentChar,
+        LineStartToCurrentChar,
+        CurrentLine
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsDisplayType.cs

@@ -7,6 +7,5 @@ namespace BetterLyrics.WinUI3.Enums
         AlbumArtOnly,
         LyricsOnly,
         SplitView,
-        PlaceholderOnly,
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/LyricsFormat.cs

@@ -19,8 +19,11 @@ namespace BetterLyrics.WinUI3.Enums
             if (string.IsNullOrWhiteSpace(content))
                 return null;
 
-            // TTML
-            if (content.StartsWith("<?xml") && System.Text.RegularExpressions.Regex.IsMatch(content, @"<tt(:\w+)?\b"))
+            // TTML: 检查 <tt ... xmlns="http://www.w3.org/ns/ttml"
+            if (System.Text.RegularExpressions.Regex.IsMatch(
+                    content,
+                    @"<tt\b[^>]*\bxmlns\s*=\s*[""']http://www\.w3\.org/ns/ttml[""']",
+                    System.Text.RegularExpressions.RegexOptions.IgnoreCase))
             {
                 return LyricsFormat.Ttml;
             }

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

@@ -23,11 +23,11 @@ namespace BetterLyrics.WinUI3.Enums
         {
             return provider switch
             {
-                LyricsSearchProvider.LrcLib => AppInfo.LrcLibLyricsCacheDirectory,
-                LyricsSearchProvider.QQ => AppInfo.QQLyricsCacheDirectory,
-                LyricsSearchProvider.Netease => AppInfo.NeteaseLyricsCacheDirectory,
-                LyricsSearchProvider.Kugou => AppInfo.KugouLyricsCacheDirectory,
-                LyricsSearchProvider.AmllTtmlDb => AppInfo.AmllTtmlDbLyricsCacheDirectory,
+                LyricsSearchProvider.LrcLib => PathHelper.LrcLibLyricsCacheDirectory,
+                LyricsSearchProvider.QQ => PathHelper.QQLyricsCacheDirectory,
+                LyricsSearchProvider.Netease => PathHelper.NeteaseLyricsCacheDirectory,
+                LyricsSearchProvider.Kugou => PathHelper.KugouLyricsCacheDirectory,
+                LyricsSearchProvider.AmllTtmlDb => PathHelper.AmllTtmlDbLyricsCacheDirectory,
                 _ => throw new System.ArgumentOutOfRangeException(nameof(provider)),
             };
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/MusicSearchMatchMode.cs

@@ -1,10 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Enums
-{
-    public enum MusicSearchMatchMode
-    {
-        TitleAndArtist,
-        TitleArtistAlbumAndDuration,
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/WindowPixelSampleMode.cs

@@ -1,8 +1,9 @@
 namespace BetterLyrics.WinUI3.Enums
 {
-    public enum WindowColorSampleMode
+    public enum WindowPixelSampleMode
     {
         BelowWindow,
+        AboveWindow,
         WindowArea,
         WindowEdge,
     }

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

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Graphics.Imaging;
+using Windows.UI;
+
+namespace BetterLyrics.WinUI3.Events
+{
+    public class AlbumArtChangedEventArgs(SoftwareBitmap? albumArtSwBitmap, Color? albumArtAccentColor) : EventArgs
+    {
+        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = albumArtSwBitmap;
+        public Color? AlbumArtAccentColor { get; set; } = albumArtAccentColor;
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/AppInfo.cs

@@ -1,115 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    using BetterLyrics.WinUI3.Models;
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
-    using System.Threading.Tasks;
-    using Windows.ApplicationModel;
-    using Windows.Storage;
-    using Windows.Storage.FileProperties;
-
-    public static class AppInfo
-    {
-        public const string AppAuthor = "Zhe Fang";
-        public const string AppDisplayName = "Better Lyrics";
-        public const string AppName = "BetterLyrics";
-        public static string AppVersion
-        {
-            get
-            {
-                var version = Package.Current.Id.Version;
-                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
-            }
-        }
-
-        public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
-
-        public static string CacheFolder => ApplicationData.Current.LocalCacheFolder.Path;
-
-
-        public const string UnlockWindowTag = "UnlockWindow";
-
-        public static string AmllTtmlDbIndexPath => Path.Combine(CacheFolder, "amll-ttml-db-index.json");
-
-        public static string AssetsFolder => Path.Combine(Package.Current.InstalledPath, "Assets");
-        public static string LogDirectory => Path.Combine(CacheFolder, "logs");
-        public static string LogFilePattern => Path.Combine(LogDirectory, "log-.txt");
-
-        public static string LrcLibLyricsCacheDirectory => Path.Combine(CacheFolder, "lrclib-lyrics");
-        public static string NeteaseLyricsCacheDirectory => Path.Combine(CacheFolder, "netease-lyrics");
-        public static string QQLyricsCacheDirectory => Path.Combine(CacheFolder, "qq-lyrics");
-        public static string KugouLyricsCacheDirectory => Path.Combine(CacheFolder, "kugou-lyrics");
-        public static string AmllTtmlDbLyricsCacheDirectory => Path.Combine(CacheFolder, "amll-ttml-db-lyrics");
-
-        public static string iTunesAlbumArtCacheDirectory => Path.Combine(CacheFolder, "itunes-album-art");
-
-
-        private static string LocalFolder => ApplicationData.Current.LocalFolder.Path;
-
-        public static void EnsureDirectories()
-        {
-            Directory.CreateDirectory(LocalFolder);
-            Directory.CreateDirectory(LogDirectory);
-
-            Directory.CreateDirectory(LrcLibLyricsCacheDirectory);
-            Directory.CreateDirectory(QQLyricsCacheDirectory);
-            Directory.CreateDirectory(KugouLyricsCacheDirectory);
-            Directory.CreateDirectory(NeteaseLyricsCacheDirectory);
-            Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
-
-            Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
-        }
-
-        public static async Task<DateTime> GetBuildDate()
-        {
-            var assembly = Assembly.GetExecutingAssembly();
-            var filePath = assembly.Location;
-            if (!File.Exists(filePath))
-                return DateTime.MinValue;
-
-            StorageFile file = await StorageFile.GetFileFromPathAsync(filePath);
-            // 获取文件基本属性
-            BasicProperties props = await file.GetBasicPropertiesAsync();
-            // 返回修改日期
-            return props.DateModified.DateTime;
-        }
-
-        public static List<LanguageInfo> GetAllTranslationLanguagesInfo() =>
-        [
-            new LanguageInfo("ar", "العربية"),
-            new LanguageInfo("az", "Azərbaycan dili"),
-            new LanguageInfo("zh", "中文"),
-            new LanguageInfo("cs", "Čeština"),
-            new LanguageInfo("da", "Dansk"),
-            new LanguageInfo("nl", "Nederlands"),
-            new LanguageInfo("en", "English"),
-            new LanguageInfo("eo", "Esperanto"),
-            new LanguageInfo("fi", "Suomi"),
-            new LanguageInfo("fr", "Français"),
-            new LanguageInfo("de", "Deutsch"),
-            new LanguageInfo("el", "Ελληνικά"),
-            new LanguageInfo("he", "עברית"),
-            new LanguageInfo("hi", "हिन्दी"),
-            new LanguageInfo("hu", "Magyar"),
-            new LanguageInfo("id", "Bahasa Indonesia"),
-            new LanguageInfo("ga", "Gaeilge"),
-            new LanguageInfo("it", "Italiano"),
-            new LanguageInfo("ja", "日本語"),
-            new LanguageInfo("ko", "한국어"),
-            new LanguageInfo("fa", "فارسی"),
-            new LanguageInfo("pl", "Polski"),
-            new LanguageInfo("pt", "Português"),
-            new LanguageInfo("ru", "Русский"),
-            new LanguageInfo("sk", "Slovenčina"),
-            new LanguageInfo("es", "Español"),
-            new LanguageInfo("sv", "Svenska"),
-            new LanguageInfo("tr", "Türkçe"),
-            new LanguageInfo("uk", "Українська"),
-            new LanguageInfo("vi", "Tiếng Việt"),
-        ];
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/CollectionHelper.cs

@@ -1,15 +1,43 @@
-// 2025/6/23 by Zhe Fang
-
+using ATL;
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Helper
 {
     public static class CollectionHelper
     {
-        public static T? SafeGet<T>(this IList<T> list, int index)
+        public static ObservableCollection<GroupInfoList> GetGroupedByTitleAsync(this ICollection<Track> tracks)
         {
-            if (list == null || index < 0 || index >= list.Count) return default;
-            return list[index];
+            // Grab Contact objects from pre-existing list (list is returned from function GetContactsAsync())
+            var query = from item in tracks
+
+                            // Group the items returned from the query, sort and select the ones you want to keep
+                        group item by item.Title.Substring(0, 1).ToUpper() into g
+                        orderby g.Key
+
+                        // GroupInfoList is a simple custom class that has an IEnumerable type attribute, and
+                        // a key attribute. The IGrouping-typed variable g now holds the Contact objects,
+                        // and these objects will be used to create a new GroupInfoList object.
+                        select new GroupInfoList(g) { Key = g.Key };
+
+            return new ObservableCollection<GroupInfoList>(query);
         }
+
+        public static void AddRange<T>(this ICollection<T> collection, IEnumerable<T> items)
+        {
+            if (collection == null) throw new ArgumentNullException(nameof(collection));
+            if (items == null) throw new ArgumentNullException(nameof(items));
+            foreach (var item in items)
+            {
+                collection.Add(item);
+            }
+        }
+
     }
 }

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

@@ -1,10 +1,17 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
+using BetterLyrics.WinUI3.Enums;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using Vanara.PInvoke;
 using Windows.UI;
 
+using Color = Windows.UI.Color;
+
 namespace BetterLyrics.WinUI3.Helper
 {
     public static class ColorHelper
@@ -98,5 +105,147 @@ namespace BetterLyrics.WinUI3.Helper
 
             return CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(h, s, brightness);
         }
+
+        public static System.Drawing.Color GetAccentColor(IntPtr myHwnd, WindowPixelSampleMode mode)
+        {
+            if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return System.Drawing.Color.Transparent;
+
+            switch (mode)
+            {
+                case WindowPixelSampleMode.BelowWindow:
+                    {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
+                        int sampleHeight = 1;
+                        int sampleY = myRect.Bottom + 1;
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
+                    }
+                case WindowPixelSampleMode.AboveWindow:
+                    {
+                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
+                        int sampleHeight = 1;
+                        int sampleY = myRect.Top - 1;
+                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
+                    }
+                case WindowPixelSampleMode.WindowArea:
+                    {
+                        int width = myRect.Right - myRect.Left;
+                        int height = myRect.Bottom - myRect.Top;
+                        if (width <= 0 || height <= 0)
+                            return System.Drawing.Color.Transparent;
+                        // 采集窗口区域的平均色
+                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top, width, height);
+                    }
+                case WindowPixelSampleMode.WindowEdge:
+                    {
+                        int width = myRect.Right - myRect.Left;
+                        int height = myRect.Bottom - myRect.Top;
+                        if (width <= 0 || height <= 0)
+                            return System.Drawing.Color.Transparent;
+
+                        var edgeThickness = new Thickness(36, 0, 36, 0);
+                        List<System.Drawing.Color> edgeColors = [];
+
+                        // Top edge
+                        if (edgeThickness.Top > 0 && edgeThickness.Top < height)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Left,
+                                    myRect.Top,
+                                    width,
+                                    (int)edgeThickness.Top
+                                )
+                            );
+                        // Bottom edge
+                        if (edgeThickness.Bottom > 0 && edgeThickness.Bottom < height)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Left,
+                                    myRect.Bottom - (int)edgeThickness.Bottom,
+                                    width,
+                                    (int)edgeThickness.Bottom
+                                )
+                            );
+                        // Left edge
+                        if (edgeThickness.Left > 0 && edgeThickness.Left < width)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Left,
+                                    myRect.Top + (int)edgeThickness.Top,
+                                    (int)edgeThickness.Left,
+                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
+                                )
+                            );
+                        // Right edge
+                        if (edgeThickness.Right > 0 && edgeThickness.Right < width)
+                            edgeColors.Add(
+                                GetAverageColorFromScreenRegion(
+                                    myRect.Right - (int)edgeThickness.Right,
+                                    myRect.Top + (int)edgeThickness.Top,
+                                    (int)edgeThickness.Right,
+                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
+                                )
+                            );
+
+                        // 合并四边平均色
+                        if (edgeColors.Count == 0)
+                            return System.Drawing.Color.Transparent;
+                        long r = 0,
+                            g = 0,
+                            b = 0;
+                        foreach (var c in edgeColors)
+                        {
+                            r += c.R;
+                            g += c.G;
+                            b += c.B;
+                        }
+                        return System.Drawing.Color.FromArgb(
+                            255,
+                            (int)(r / edgeColors.Count),
+                            (int)(g / edgeColors.Count),
+                            (int)(b / edgeColors.Count)
+                        );
+                    }
+                default:
+                    return System.Drawing.Color.Transparent;
+            }
+        }
+
+        private static System.Drawing.Color GetAverageColorFromScreenRegion(int x, int y, int width, int height)
+        {
+            using Bitmap bmp = new(width, height, PixelFormat.Format32bppArgb);
+            using Graphics gDest = Graphics.FromImage(bmp);
+
+            IntPtr hdcDest = gDest.GetHdc();
+            IntPtr hdcSrc = (nint)User32.GetDC(IntPtr.Zero); // Entire screen
+
+            Gdi32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, Gdi32.RasterOperationMode.SRCCOPY);
+
+            gDest.ReleaseHdc(hdcDest);
+            User32.ReleaseDC(IntPtr.Zero, hdcSrc);
+
+            return ComputeAverageColor(bmp);
+        }
+
+        private static System.Drawing.Color ComputeAverageColor(Bitmap bmp)
+        {
+            long r = 0, g = 0, b = 0;
+            int count = 0;
+
+            for (int y = 0; y < bmp.Height; y++)
+            {
+                for (int x = 0; x < bmp.Width; x++)
+                {
+                    System.Drawing.Color pixel = bmp.GetPixel(x, y);
+                    r += pixel.R;
+                    g += pixel.G;
+                    b += pixel.B;
+                    count++;
+                }
+            }
+
+            if (count == 0) return System.Drawing.Color.Transparent;
+            return System.Drawing.Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
+        }
+
     }
 }

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

@@ -1,9 +1,12 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Vanara.PInvoke;
 using WinRT.Interop;
@@ -15,7 +18,6 @@ namespace BetterLyrics.WinUI3.Helper
     {
         private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
 
-        private static readonly Dictionary<IntPtr, bool> _clickThroughStates = [];
         private static readonly Dictionary<IntPtr, bool> _originalTopmostStates = [];
         private static readonly Dictionary<IntPtr, (double X, double Y, double Width, double Height)> _originalWindowBounds = [];
         private static readonly Dictionary<IntPtr, WindowStyle> _originalWindowStyles = [];
@@ -47,13 +49,6 @@ namespace BetterLyrics.WinUI3.Helper
                 _originalWindowBounds.Remove(hwnd);
             }
 
-            // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
-            if (_originalWindowStyles.TryGetValue(hwnd, out var style))
-            {
-                window.SetWindowStyle(style);
-                _originalWindowStyles.Remove(hwnd);
-            }
-
             window.SetIsShownInSwitchers(true);
         }
 
@@ -78,15 +73,19 @@ namespace BetterLyrics.WinUI3.Helper
             int targetX = _settingsService.DesktopWindowLeft;
             int targetY = _settingsService.DesktopWindowTop;
 
+            if (targetWidth <= 0 || targetHeight <= 0 || targetX < 0 || targetY < 0)
+            {
+                targetWidth = 1200;
+                targetHeight = 600;
+                targetX = 200;
+                targetY = 200;
+            }
+
             // <20><><EFBFBD>ô<EFBFBD><C3B4>ڴ<EFBFBD>С<EFBFBD><D0A1>λ<EFBFBD><CEBB>
             window.AppWindow.MoveAndResize(
                 new Windows.Graphics.RectInt32(targetX, targetY, targetWidth, targetHeight)
             );
 
-            // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
-            if (!_originalWindowStyles.ContainsKey(hwnd))
-                _originalWindowStyles[hwnd] = window.GetWindowStyle();
-
             // <20><><EFBFBD><EFBFBD>ԭTopMost״̬
             if (!_originalTopmostStates.ContainsKey(hwnd))
                 _originalTopmostStates[hwnd] = window.GetIsAlwaysOnTop();
@@ -97,48 +96,30 @@ namespace BetterLyrics.WinUI3.Helper
             window.SetIsShownInSwitchers(false);
         }
 
-        public static void Lock(Window window)
-        {
-            window.SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
-
-            // <20><><EFBFBD><EFBFBD><EFBFBD>ޱ߿<DEB1><DFBF><EFBFBD>͸<EFBFBD><CDB8>
-            window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
-            window.ExtendsContentIntoTitleBar = false;
-
-            SetClickThrough(window, true);
-        }
-
         public static void SetClickThrough(Window window, bool enable)
         {
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
             int exStyle = User32.GetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE);
+
             if (enable)
             {
+                // <20><><EFBFBD><EFBFBD>ԭ<EFBFBD><D4AD>ʽ
+                if (!_originalWindowStyles.ContainsKey(hwnd))
+                    _originalWindowStyles[hwnd] = window.GetWindowStyle();
+
+                window.ToggleWindowStyle(true, WindowStyle.Popup | WindowStyle.Visible);
                 User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle | (int)User32.WindowStylesEx.WS_EX_TRANSPARENT | (int)User32.WindowStylesEx.WS_EX_LAYERED);
-                _clickThroughStates[hwnd] = true;
             }
             else
             {
                 User32.SetWindowLong(hwnd, User32.WindowLongFlags.GWL_EXSTYLE, exStyle & ~(int)User32.WindowStylesEx.WS_EX_TRANSPARENT);
-                _clickThroughStates[hwnd] = false;
+                // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ
+                if (_originalWindowStyles.TryGetValue(hwnd, out var style))
+                {
+                    window.SetWindowStyle(style);
+                    _originalWindowStyles.Remove(hwnd);
+                }
             }
         }
-
-        public static void Unlock(Window window)
-        {
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
-
-            // <20>ָ<EFBFBD><D6B8><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƴ<EFBFBD><C6B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD>ֻ<EFBFBD><D6BB><EFBFBD><EFBFBD> Disable ʱ<><CAB1><EFBFBD>Ƴ<EFBFBD><C6B3><EFBFBD>
-            if (_originalWindowStyles.TryGetValue(hwnd, out var style))
-            {
-                window.SetWindowStyle(style);
-            }
-            window.ExtendsContentIntoTitleBar = true;
-
-            SetClickThrough(window, false);
-
-            // To recover the system backdrop, we need to reopen the window
-            WindowHelper.RestartApp(AppInfo.UnlockWindowTag);
-        }
     }
 }

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

@@ -1,4 +1,6 @@
-using Microsoft.UI.Xaml;
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -20,15 +22,21 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static void Disable(Window window)
         {
+            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+
+            if (!_registered.Contains(hwnd)) return;
+
             window.SetIsShownInSwitchers(true);
             window.ExtendsContentIntoTitleBar = true;
             window.SetIsAlwaysOnTop(false);
 
-            IntPtr hwnd = WindowNative.GetWindowHandle(window);
+            UnregisterAppBar(hwnd);
 
             window.SetWindowStyle(_originalWindowStyle[hwnd]);
             _originalWindowStyle.Remove(hwnd);
 
+            window.ExtendsContentIntoTitleBar = true;
+
             if (_originalPositions.TryGetValue(hwnd, out var rect))
             {
                 User32.SetWindowPos(
@@ -42,14 +50,12 @@ namespace BetterLyrics.WinUI3.Helper
                 );
                 _originalPositions.Remove(hwnd);
             }
-
-            UnregisterAppBar(hwnd);
         }
 
-        public static void Enable(Window window, int appBarHeight)
+        public static void Enable(Window window, int appBarHeight, DockPlacement dockPlacement)
         {
             window.SetIsShownInSwitchers(false);
-            window.ExtendsContentIntoTitleBar = false;
+            //window.ExtendsContentIntoTitleBar = false;
             window.SetIsAlwaysOnTop(true);
 
             IntPtr hwnd = WindowNative.GetWindowHandle(window);
@@ -58,7 +64,6 @@ namespace BetterLyrics.WinUI3.Helper
             {
                 _originalWindowStyle[hwnd] = window.GetWindowStyle();
             }
-            window.SetWindowStyle(WindowStyle.Popup | WindowStyle.Visible);
 
             if (!_originalPositions.ContainsKey(hwnd))
             {
@@ -68,40 +73,52 @@ namespace BetterLyrics.WinUI3.Helper
                 }
             }
 
-            RegisterAppBar(hwnd, appBarHeight);
+            RegisterAppBar(hwnd, appBarHeight, dockPlacement);
 
             int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
             int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
+            int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - appBarHeight;
+
             User32.SetWindowPos(
                 hwnd,
                 IntPtr.Zero,
                 0,
-                0,
+                y,
                 screenWidth,
                 appBarHeight,
-                User32.SetWindowPosFlags.SWP_SHOWWINDOW
+                User32.SetWindowPosFlags.SWP_HIDEWINDOW
             );
+            window.ExtendsContentIntoTitleBar = false;
+            window.ToggleWindowStyle(true, WindowStyle.Popup);
+            window.Show();
         }
 
-        private static void RegisterAppBar(IntPtr hwnd, int height)
+        private static void RegisterAppBar(IntPtr hwnd, int height, DockPlacement dockPlacement)
         {
             if (_registered.Contains(hwnd)) return;
 
+            var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+            int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
+            int top = dockPlacement == DockPlacement.Top ? 0 : screenHeight - height;
+            int bottom = dockPlacement == DockPlacement.Top ? height : screenHeight;
+
             Shell32.APPBARDATA abd = new()
             {
                 cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
                 hWnd = hwnd,
-                uEdge = Shell32.ABE.ABE_TOP,
+                uEdge = uEdge,
                 rc = new RECT
                 {
                     Left = 0,
-                    Top = 0,
+                    Top = top,
                     Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
-                    Bottom = height,
+                    Bottom = bottom,
                 },
             };
 
+            // Ref: https://github.com/TwilightLemon/AppBarTest/blob/master/AppBarCreator.cs
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_NEW, ref abd);
+            Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
 
             _registered.Add(hwnd);
@@ -119,40 +136,56 @@ namespace BetterLyrics.WinUI3.Helper
             };
 
             Shell32.SHAppBarMessage(Shell32.ABM.ABM_REMOVE, ref abd);
+
             _registered.Remove(hwnd);
         }
 
-        public static void UpdateAppBarHeight(IntPtr hwnd, int newHeight)
+        private static void RefreshWorkArea()
         {
-            if (!_registered.Contains(hwnd))
-                return;
+            User32.SendMessage(HWND.HWND_BROADCAST, User32.WindowMessage.WM_SETTINGCHANGE, IntPtr.Zero, IntPtr.Zero);
+        }
 
-            Shell32.APPBARDATA abd = new()
+        public static void UpdateAppBarHeight(IntPtr hwnd, int newHeight, DockPlacement dockPlacement)
+        {
+            App.DispatcherQueueTimer?.Debounce(() =>
             {
-                cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
-                hWnd = hwnd,
-                uEdge = Shell32.ABE.ABE_TOP,
-                rc = new RECT
+                if (!_registered.Contains(hwnd))
+                    return;
+
+                var uEdge = dockPlacement == DockPlacement.Top ? Shell32.ABE.ABE_TOP : Shell32.ABE.ABE_BOTTOM;
+                int screenHeight = User32.GetSystemMetrics(User32.SystemMetric.SM_CYSCREEN);
+                int top = dockPlacement == DockPlacement.Top ? 0 : screenHeight - newHeight;
+                int bottom = dockPlacement == DockPlacement.Top ? newHeight : screenHeight;
+
+                Shell32.APPBARDATA abd = new()
                 {
-                    Left = 0,
-                    Top = 0,
-                    Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
-                    Bottom = newHeight,
-                },
-            };
+                    cbSize = (uint)Marshal.SizeOf<Shell32.APPBARDATA>(),
+                    hWnd = hwnd,
+                    uEdge = uEdge,
+                    rc = new RECT
+                    {
+                        Left = 0,
+                        Top = top,
+                        Right = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
+                        Bottom = bottom,
+                    },
+                };
 
-            Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_QUERYPOS, ref abd);
+                Shell32.SHAppBarMessage(Shell32.ABM.ABM_SETPOS, ref abd);
 
-            // 同步窗口实际高度
-            User32.SetWindowPos(
-                hwnd,
-                IntPtr.Zero,
-                0,
-                0,
-                User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
-                newHeight,
-                User32.SetWindowPosFlags.SWP_SHOWWINDOW
-            );
+                // 同步窗口实际高度和位置
+                int y = dockPlacement == DockPlacement.Top ? 0 : screenHeight - newHeight;
+                User32.SetWindowPos(
+                    hwnd,
+                    IntPtr.Zero,
+                    0,
+                    y,
+                    User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN),
+                    newHeight,
+                    newHeight == 0 ? User32.SetWindowPosFlags.SWP_HIDEWINDOW : User32.SetWindowPosFlags.SWP_SHOWWINDOW
+                );
+            }, TimeSpan.FromMilliseconds(100));
         }
     }
 }

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

@@ -1,5 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Enums;
+using System;
 using System.IO;
 using System.Text;
 using Ude;
@@ -21,5 +23,60 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return Encoding.GetEncoding(encoding);
         }
+
+        public static string SanitizeFileName(string fileName, char replacement = '_')
+        {
+            var invalidChars = Path.GetInvalidFileNameChars();
+            var sb = new StringBuilder(fileName.Length);
+            foreach (var c in fileName)
+            {
+                sb.Append(Array.IndexOf(invalidChars, c) >= 0 ? replacement : c);
+            }
+            return sb.ToString();
+        }
+
+        public static string? ReadLyricsCache(string title, string artist, LyricsFormat format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
+            if (File.Exists(cacheFilePath))
+            {
+                return File.ReadAllText(cacheFilePath);
+            }
+            return null;
+        }
+
+        public static byte[]? ReadAlbumArtCache(string album, string artist, string format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {album}{format}"));
+            if (File.Exists(cacheFilePath))
+            {
+                return File.ReadAllBytes(cacheFilePath);
+            }
+            return null;
+        }
+
+        public static void WriteLyricsCache(string title, string artist, string lyrics, LyricsFormat format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
+            File.WriteAllText(cacheFilePath, lyrics);
+        }
+
+        public static void WriteAlbumArtCache(string album, string artist, byte[] img, string format, string cacheFolderPath)
+        {
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {album}{format}"));
+            File.WriteAllBytes(cacheFilePath, img);
+        }
+
+        public static bool IsSwitchableNormalizedMatch(string fileName, string q1, string q2)
+        {
+            var normFileName = StringHelper.Normalize(fileName.Normalize());
+            var normQ1 = StringHelper.Normalize(q1);
+            var normQ2 = StringHelper.Normalize(q2);
+
+            // 常见两种顺序
+            return normFileName == normQ1 + normQ2
+                || normFileName == normQ2 + normQ1;
+        }
+
     }
 }

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

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

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

@@ -4,37 +4,35 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Vanara.PInvoke;
 using Windows.System;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    public class ForegroundWindowWatcherHelper
+    public class ForegroundWindowWatcher
     {
         private readonly User32.WinEventProc _winEventDelegate;
         private readonly List<User32.HWINEVENTHOOK> _hooks = new();
         private HWND _currentForeground = HWND.NULL;
         private readonly IntPtr _selfHwnd;
-        private readonly DispatcherTimer _pollingTimer;
-        private DateTime _lastEventTime = DateTime.MinValue;
-        private const int ThrottleIntervalMs = 1000;
+        private readonly ThrottleHelper _winEventProcThrottle = new(TimeSpan.FromSeconds(1));
 
         public delegate void WindowChangedHandler(HWND hwnd);
         private readonly WindowChangedHandler _onWindowChanged;
 
-        public ForegroundWindowWatcherHelper(IntPtr selfHwnd, WindowChangedHandler onWindowChanged)
+        private readonly DispatcherTimer _timer;
+
+        public ForegroundWindowWatcher(IntPtr selfHwnd, WindowChangedHandler onWindowChanged)
         {
             _selfHwnd = selfHwnd;
             _onWindowChanged = onWindowChanged;
             _winEventDelegate = new User32.WinEventProc(WinEventProc);
 
-            _pollingTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(200) };
-            _pollingTimer.Tick += (_, _) =>
-            {
-                if (_currentForeground != IntPtr.Zero && _currentForeground != _selfHwnd)
-                    _onWindowChanged?.Invoke(_currentForeground);
-            };
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromSeconds(1);
+            _timer.Tick += Timer_Tick;
         }
 
         public void Start()
@@ -65,7 +63,7 @@ namespace BetterLyrics.WinUI3.Helper
                 )
             );
 
-            _pollingTimer.Start();
+            _timer.Start();
         }
 
         public void Stop()
@@ -74,7 +72,16 @@ namespace BetterLyrics.WinUI3.Helper
                 User32.UnhookWinEvent(hook);
 
             _hooks.Clear();
-            _pollingTimer.Stop();
+
+            _timer.Stop();
+        }
+
+        private void Timer_Tick(object? sender, object e)
+        {
+            if (_currentForeground != HWND.NULL)
+            {
+                _onWindowChanged?.Invoke(_currentForeground);
+            }
         }
 
         private void WinEventProc(
@@ -87,15 +94,9 @@ namespace BetterLyrics.WinUI3.Helper
             uint dwmsEventTime
         )
         {
-            if (hwnd == IntPtr.Zero || hwnd == _selfHwnd)
+            if (hwnd == IntPtr.Zero)
                 return;
 
-            var now = DateTime.Now;
-            if ((now - _lastEventTime).TotalMilliseconds < ThrottleIntervalMs)
-                return;
-
-            _lastEventTime = now;
-
             if (eventType == User32.EventConstants.EVENT_SYSTEM_FOREGROUND)
             {
                 _currentForeground = hwnd;

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

@@ -0,0 +1,46 @@
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Vanara.PInvoke;
+using Windows.System;
+using WinRT.Interop;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class GlobalHotKeyHelper
+    {
+        private static Dictionary<int, Action> _hotKeyActions = [];
+        private static int _nextId = 0;
+
+        public static void RegisterHotKey(Window window, User32.HotKeyModifiers modifiers, uint key, Action action)
+        {
+            HWND hwnd = WindowNative.GetWindowHandle(window);
+            int id = _nextId++;
+            User32.RegisterHotKey(hwnd, id, modifiers, key);
+            _hotKeyActions[id] = action;
+        }
+
+        public static void UnregisterAllHotKeys(Window window)
+        {
+            HWND hwnd = WindowNative.GetWindowHandle(window);
+            foreach (var id in _hotKeyActions.Keys.ToList())
+            {
+                User32.UnregisterHotKey(hwnd, id);
+                _hotKeyActions.Remove(id);
+            }
+        }
+
+        public static bool TryInvokeAction(int id)
+        {
+            if (_hotKeyActions.TryGetValue(id, out var action))
+            {
+                action?.Invoke();
+                return true;
+            }
+            return false;
+        }
+    }
+}

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

@@ -1,5 +1,14 @@
 // 2025/6/23 by Zhe Fang
 
+using CommunityToolkit.WinUI.Helpers;
+using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Text;
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Media.Imaging;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -7,10 +16,6 @@ using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
-using Microsoft.Graphics.Canvas;
-using Microsoft.Graphics.Canvas.Text;
-using Microsoft.UI;
-using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Graphics.Imaging;
 using Windows.Storage.Streams;
 using Windows.UI;
@@ -19,7 +24,7 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class ImageHelper
     {
-        public const int AccentColorCount = 3;
+        private const int _accentColorCount = 1;
 
         public static async Task<InMemoryRandomAccessStream> ByteArrayToStream(byte[] bytes)
         {
@@ -30,62 +35,44 @@ namespace BetterLyrics.WinUI3.Helper
             return stream;
         }
 
-        public static async Task<byte[]> CreateTextPlaceholderBytesAsync(string text, int width, int height)
+        public static RandomAccessStreamReference ByteArrayToRandomAccessStreamReference(byte[] bytes)
+        {
+            var stream = new InMemoryRandomAccessStream();
+            var writer = new DataWriter(stream);
+            writer.WriteBytes(bytes);
+            writer.StoreAsync().GetAwaiter().GetResult();
+            writer.FlushAsync().GetAwaiter().GetResult();
+            writer.DetachStream();
+            return RandomAccessStreamReference.CreateFromStream(stream);
+        }
+
+        public static async Task<byte[]> CreateTextPlaceholderBytesAsync(int width, int height)
         {
             var device = CanvasDevice.GetSharedDevice();
             var renderTarget = new CanvasRenderTarget(device, width, height, 96);
 
-            // 居中绘制文字
+            // 随机生成渐变色
+            Windows.UI.Color RandomColor()
+            {
+                var rand = new Random(Guid.NewGuid().GetHashCode());
+                double h = rand.NextDouble() * 360;
+                double s = 0.35 + rand.NextDouble() * 0.3; // 0.35~0.65，适中饱和度
+                double l = 0.5 + rand.NextDouble() * 0.3;  // 0.5~0.8，明亮
+                return HslToColor(h, s, l);
+            }
+
+            Windows.UI.Color color1 = RandomColor();
+            Windows.UI.Color color2 = RandomColor();
+
             using (var ds = renderTarget.CreateDrawingSession())
             {
-                // 背景色
-                ds.Clear(Colors.LightGray);
-
-                // 文字格式
-                var format = new CanvasTextFormat
+                // 绘制线性渐变背景
+                var gradientBrush = new Microsoft.Graphics.Canvas.Brushes.CanvasLinearGradientBrush(ds, color1, color2)
                 {
-                    FontSize = Math.Min(width, height) / 6f,
-                    FontWeight = Microsoft.UI.Text.FontWeights.SemiBold,
-                    HorizontalAlignment = CanvasHorizontalAlignment.Center,
-                    VerticalAlignment = CanvasVerticalAlignment.Center,
-                    WordWrapping = CanvasWordWrapping.Wrap,
-                    TrimmingGranularity = CanvasTextTrimmingGranularity.Character,
-                    Options = CanvasDrawTextOptions.Default,
+                    StartPoint = new System.Numerics.Vector2(0, 0),
+                    EndPoint = new System.Numerics.Vector2(width, height)
                 };
-
-                // 设定边距
-                float margin = Math.Min(width, height) / 12f;
-                float availableWidth = width - 2 * margin;
-                float availableHeight = height - 2 * margin;
-
-                // 计算合适的字体大小以适应内容区域
-                float fontSize = format.FontSize;
-                float minFontSize = 8f;
-                float maxFontSize = format.FontSize;
-                CanvasTextLayout layout;
-                do
-                {
-                    format.FontSize = fontSize;
-                    layout = new CanvasTextLayout(
-                        ds,
-                        text,
-                        format,
-                        availableWidth,
-                        availableHeight
-                    );
-                    if (
-                        layout.LayoutBounds.Width <= availableWidth
-                        && layout.LayoutBounds.Height <= availableHeight
-                    )
-                        break;
-                    fontSize -= 1f;
-                } while (fontSize >= minFontSize);
-
-                // 居中绘制文字（在内容区域内居中）
-                var bounds = layout.LayoutBounds;
-                var x = margin + (availableWidth - (float)bounds.Width) / 2f - (float)bounds.X;
-                var y = margin + (availableHeight - (float)bounds.Height) / 2f - (float)bounds.Y;
-                ds.DrawTextLayout(layout, new Vector2(x, y), Colors.DarkGray);
+                ds.FillRectangle(0, 0, width, height, gradientBrush);
             }
 
             // 保存为 PNG 并转为 byte[]
@@ -100,6 +87,31 @@ namespace BetterLyrics.WinUI3.Helper
                 }
                 return buffer;
             }
+
+            // HSL转Color
+            static Windows.UI.Color HslToColor(double h, double s, double l)
+            {
+                h = h / 360.0;
+                double r = l, g = l, b = l;
+                if (s != 0)
+                {
+                    double q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+                    double p = 2 * l - q;
+                    r = HueToRgb(p, q, h + 1.0 / 3.0);
+                    g = HueToRgb(p, q, h);
+                    b = HueToRgb(p, q, h - 1.0 / 3.0);
+                }
+                return Windows.UI.Color.FromArgb(255, (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
+            }
+            static double HueToRgb(double p, double q, double t)
+            {
+                if (t < 0) t += 1;
+                if (t > 1) t -= 1;
+                if (t < 1.0 / 6.0) return p + (q - p) * 6 * t;
+                if (t < 1.0 / 2.0) return q;
+                if (t < 2.0 / 3.0) return p + (q - p) * (2.0 / 3.0 - t) * 6;
+                return p;
+            }
         }
 
         public static List<Windows.UI.Color> GetAccentColorsFromByte(byte[] bytes)
@@ -127,7 +139,7 @@ namespace BetterLyrics.WinUI3.Helper
             // 按出现次数排序，取前 AccentColorCount 个
             var topColors = colorCount
                 .OrderByDescending(kv => kv.Value)
-                .Take(AccentColorCount)
+                .Take(_accentColorCount)
                 .Select(kv => kv.Key)
                 .ToList();
 
@@ -137,39 +149,40 @@ namespace BetterLyrics.WinUI3.Helper
                 .ToList();
         }
 
+        //public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
+        //{
+        //    var stream = new InMemoryRandomAccessStream();
+        //    await stream.WriteAsync(imageBytes.AsBuffer());
+        //    stream.Seek(0);
 
-        public static async Task<BitmapImage> GetBitmapImageFromBytesAsync(byte[] imageBytes)
-        {
-            var stream = new InMemoryRandomAccessStream();
-            await stream.WriteAsync(imageBytes.AsBuffer());
-            stream.Seek(0);
+        //    var bitmapImage = new BitmapImage();
+        //    await bitmapImage.SetSourceAsync(stream);
 
-            var bitmapImage = new BitmapImage();
-            await bitmapImage.SetSourceAsync(stream);
+        //    return bitmapImage;
+        //}
 
-            return bitmapImage;
-        }
+        //public static async Task<BitmapDecoder> GetDecoderFromByte(byte[] bytes) =>
+        //    await BitmapDecoder.CreateAsync(await ByteArrayToStream(bytes));
 
-        public static async Task<BitmapDecoder> GetDecoderFromByte(byte[] bytes) =>
-            await BitmapDecoder.CreateAsync(await ByteArrayToStream(bytes));
+        //public static async Task<InMemoryRandomAccessStream> GetStreamFromBytesAsync(byte[] imageBytes)
+        //{
+        //    if (imageBytes == null || imageBytes.Length == 0)
+        //        return null;
 
-        public static async Task<InMemoryRandomAccessStream> GetStreamFromBytesAsync(byte[] imageBytes)
-        {
-            if (imageBytes == null || imageBytes.Length == 0)
-                return null;
+        //    InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
+        //    await stream.WriteAsync(imageBytes.AsBuffer());
 
-            InMemoryRandomAccessStream stream = new InMemoryRandomAccessStream();
-            await stream.WriteAsync(imageBytes.AsBuffer());
-
-            return stream;
-        }
+        //    return stream;
+        //}
 
         public static async Task<byte[]> ToByteArrayAsync(IRandomAccessStreamReference streamRef)
         {
             using IRandomAccessStream stream = await streamRef.OpenReadAsync();
-            using var memoryStream = new MemoryStream();
-            await stream.AsStreamForRead().CopyToAsync(memoryStream);
-            return memoryStream.ToArray();
+            using var reader = new DataReader(stream);
+            await reader.LoadAsync((uint)stream.Size);
+            byte[] buffer = new byte[stream.Size];
+            reader.ReadBytes(buffer);
+            return buffer;
         }
 
         public static float GetAverageLuminance(CanvasBitmap bitmap)
@@ -188,5 +201,35 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return (float)(sum / (pixels.Length / 4));
         }
+
+        public static byte[] MakeSquareWithThemeColor(byte[] imageBytes)
+        {
+            using var image = Image.Load<Rgba32>(imageBytes);
+
+            if (image.Width == image.Height)
+            {
+                // 已经是正方形，直接返回
+                return imageBytes;
+            }
+
+            int size = Math.Max(image.Width, image.Height);
+
+            var themeColor = Rgba32.ParseHex(GetAccentColorsFromByte(imageBytes).FirstOrDefault().ToHex());
+
+            // 新建正方形画布
+            using var square = new Image<Rgba32>(size, size, themeColor);
+
+            // 计算居中位置
+            int offsetX = (size - image.Width) / 2;
+            int offsetY = (size - image.Height) / 2;
+
+            // 绘制原图到正方形画布
+            square.Mutate(ctx => ctx.DrawImage(image, new Point(offsetX, offsetY), 1f));
+
+            // 保存为 PNG 字节流
+            using var ms = new MemoryStream();
+            square.Save(ms, new PngEncoder());
+            return ms.ToArray();
+        }
     }
 }

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

@@ -0,0 +1,128 @@
+using BetterLyrics.WinUI3.Helper;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Lyricify.Lyrics.Helpers.General;
+using NTextCat;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Windows.Globalization;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public class LanguageHelper
+    {
+        private static readonly RankedLanguageIdentifierFactory _factory = new();
+        private static readonly RankedLanguageIdentifier _identifier;
+        private static readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
+        public static List<Models.LanguageInfo> SupportedTargetLanguages =>
+        [
+            new Models.LanguageInfo("ar", "العربية"),
+            new Models.LanguageInfo("az", "Azərbaycan dili"),
+            new Models.LanguageInfo("zh-Hans", "简体中文"),
+            new Models.LanguageInfo("zh-Hant", "繁體中文"),
+            new Models.LanguageInfo("cs", "Čeština"),
+            new Models.LanguageInfo("da", "Dansk"),
+            new Models.LanguageInfo("nl", "Nederlands"),
+            new Models.LanguageInfo("en", "English"),
+            new Models.LanguageInfo("eo", "Esperanto"),
+            new Models.LanguageInfo("fi", "Suomi"),
+            new Models.LanguageInfo("fr", "Français"),
+            new Models.LanguageInfo("de", "Deutsch"),
+            new Models.LanguageInfo("el", "Ελληνικά"),
+            new Models.LanguageInfo("he", "עברית"),
+            new Models.LanguageInfo("hi", "हिन्दी"),
+            new Models.LanguageInfo("hu", "Magyar"),
+            new Models.LanguageInfo("id", "Bahasa Indonesia"),
+            new Models.LanguageInfo("ga", "Gaeilge"),
+            new Models.LanguageInfo("it", "Italiano"),
+            new Models.LanguageInfo("ja", "日本語"),
+            new Models.LanguageInfo("ko", "한국어"),
+            new Models.LanguageInfo("fa", "فارسی"),
+            new Models.LanguageInfo("pl", "Polski"),
+            new Models.LanguageInfo("pt", "Português"),
+            new Models.LanguageInfo("ru", "Русский"),
+            new Models.LanguageInfo("sk", "Slovenčina"),
+            new Models.LanguageInfo("es", "Español"),
+            new Models.LanguageInfo("sv", "Svenska"),
+            new Models.LanguageInfo("tr", "Türkçe"),
+            new Models.LanguageInfo("uk", "Українська"),
+            new Models.LanguageInfo("vi", "Tiếng Việt"),
+        ];
+
+        static LanguageHelper()
+        {
+            _identifier = _factory.Load(PathHelper.LanguageProfilePath);
+        }
+
+        private static string? ThreeLetterToTwoLetter(string? threeLetterCode)
+        {
+            if (threeLetterCode == null) return null;
+
+            foreach (var ci in CultureInfo.GetCultures(CultureTypes.AllCultures))
+            {
+                if (string.Equals(ci.ThreeLetterISOLanguageName, threeLetterCode, StringComparison.OrdinalIgnoreCase))
+                {
+                    return ci.TwoLetterISOLanguageName;
+                }
+            }
+            return null;
+        }
+
+        public static string? DetectLanguageCode(string? text)
+        {
+            if (text == null) return null;
+
+            string? code = ThreeLetterToTwoLetter(_identifier.Identify(text).FirstOrDefault()?.Item1.Iso639_2T);
+            if (code != null && code == "zh")
+            {
+                if (ChineseConverter.ConvertToTraditionalChinese(text) == text)
+                {
+                    return "zh-Hant";
+                }
+                else
+                {
+                    return "zh-Hans";
+                }
+            }
+            return code;
+        }
+
+        public static bool IsCJK(string text)
+        {
+            return DetectLanguageCode(text)?.Substring(0, 2) switch
+            {
+                "zh" or "ja" or "ko" => true,
+                _ => false
+            };
+        }
+
+        public static string ConvertToCountryCode(string? languageCode)
+        {
+            if (languageCode == null) return "us";
+
+            return languageCode switch
+            {
+                "zh" => "cn",
+                "zh-Hans" => "cn",
+                "zh-Hant" => "tw",
+                "ja" => "jp",
+                "ko" => "kr",
+                _ => "us"
+            };
+        }
+
+        public static string GetUserTargetLanguageCode()
+        {
+            return SupportedTargetLanguages[_settingsService.SelectedTargetLanguageIndex].Code;
+        }
+
+        public static int GetDefaultTargetLanguageIndex()
+        {
+            int found = SupportedTargetLanguages.FindIndex(x => ApplicationLanguages.Languages.FirstOrDefault()?.Contains(x.Code) == true);
+            if (found == -1) found = 7; // 默认使用英语
+            return found;
+        }
+    }
+}

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

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

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

@@ -2,6 +2,7 @@
 
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services;
 using Lyricify.Lyrics.Models;
 using System;
 using System.Collections.Generic;
@@ -9,29 +10,21 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using Windows.Globalization.Fonts;
+using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;
 
 namespace BetterLyrics.WinUI3.Helper
 {
     public class LyricsParser
     {
-        private List<List<LyricsLine>> _multiLangLyricsLines = [];
+        private List<LyricsData> _lyricsDataArr = [];
 
-        public List<List<LyricsLine>> Parse(string? raw, int durationMs)
+        public List<LyricsData> Parse(string? raw, int? durationMs)
         {
-            _multiLangLyricsLines = [];
+            durationMs ??= (int)TimeSpan.FromMinutes(99).TotalMilliseconds;
+            _lyricsDataArr = [];
             if (raw == null)
             {
-                _multiLangLyricsLines.Add(
-                    [
-                        new LyricsLine
-                        {
-                            StartMs = 0,
-                            EndMs = durationMs,
-                            OriginalText = App.ResourceLoader!.GetString("LyricsNotFound"),
-                            CharTimings = [],
-                        },
-                    ]
-                );
+                _lyricsDataArr.Add(LyricsData.GetNotfoundPlaceholder(durationMs.Value));
             }
             else
             {
@@ -42,10 +35,10 @@ namespace BetterLyrics.WinUI3.Helper
                         ParseLrc(raw);
                         break;
                     case LyricsFormat.Qrc:
-                        ParseUsingLyricify(Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines);
+                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.QrcParser.Parse(raw).Lines);
                         break;
                     case LyricsFormat.Krc:
-                        ParseUsingLyricify(Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines);
+                        ParseQQNeteaseKugou(Lyricify.Lyrics.Parsers.KrcParser.Parse(raw).Lines);
                         break;
                     case LyricsFormat.Ttml:
                         ParseTtml(raw);
@@ -54,8 +47,8 @@ namespace BetterLyrics.WinUI3.Helper
                         break;
                 }
             }
-            PostProcessLyricsLines(durationMs);
-            return _multiLangLyricsLines;
+            _lyricsDataArr.Add(new LyricsData()); // 为机翻预留
+            return _lyricsDataArr;
         }
 
         private void ParseLrc(string raw)
@@ -119,9 +112,8 @@ namespace BetterLyrics.WinUI3.Helper
             int languageCount = grouped.Max(g => g.Count());
 
             // 初始化每种语言的歌词列表
-            _multiLangLyricsLines.Clear();
-            for (int i = 0; i < languageCount; i++)
-                _multiLangLyricsLines.Add(new List<LyricsLine>());
+            _lyricsDataArr.Clear();
+            for (int i = 0; i < languageCount; i++) _lyricsDataArr.Add(new LyricsData());
 
             // 遍历每个时间分组
             foreach (var group in grouped)
@@ -135,9 +127,8 @@ namespace BetterLyrics.WinUI3.Helper
                     var line = new LyricsLine
                     {
                         StartMs = start,
-                        EndMs = 0, // 稍后统一修正
                         OriginalText = text,
-                        CharTimings = [],
+                        LyricsChars = [],
                     };
                     if (syllables != null && syllables.Count > 0)
                     {
@@ -146,11 +137,10 @@ namespace BetterLyrics.WinUI3.Helper
                         {
                             var (charStart, charText) = syllables[j];
                             int startIndex = currentIndex;
-                            line.CharTimings.Add(
-                                new CharTiming
+                            line.LyricsChars.Add(
+                                new LyricsChar
                                 {
                                     StartMs = charStart,
-                                    EndMs = 0, // Fixed later
                                     Text = charText ?? "",
                                     StartIndex = startIndex,
                                 }
@@ -158,7 +148,7 @@ namespace BetterLyrics.WinUI3.Helper
                             currentIndex += charText?.Length ?? 0;
                         }
                     }
-                    _multiLangLyricsLines[langIdx].Add(line);
+                    _lyricsDataArr[langIdx].LyricsLines.Add(line);
                 }
             }
         }
@@ -167,7 +157,8 @@ namespace BetterLyrics.WinUI3.Helper
         {
             try
             {
-                List<LyricsLine> singleLangLyricsLine = [];
+                List<LyricsLine> originalLines = [];
+                List<LyricsLine> translationLines = [];
                 var xdoc = XDocument.Parse(raw);
                 var body = xdoc.Descendants().FirstOrDefault(e => e.Name.LocalName == "body");
                 if (body == null) return;
@@ -180,49 +171,92 @@ namespace BetterLyrics.WinUI3.Helper
                     int pStartMs = ParseTtmlTime(pBegin);
                     int pEndMs = ParseTtmlTime(pEnd);
 
-                    // 处理分词分时
-                    var spans = p.Elements().Where(s => s.Name.LocalName == "span").ToList();
+                    // 只获取一级span，且排除ttm:role="x-bg"的span
+                    var spans = p.Elements()
+                        .Where(s => s.Name.LocalName == "span" &&
+                                    s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-bg")
+                        .ToList();
 
-                    string text = string.Concat(spans.Select(s => s.Value));
-                    var charTimings = new List<CharTiming>();
+                    // 原文和翻译分离
+                    var originalTextSpans = spans
+                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value != "x-translation")
+                        .ToList();
+                    var translationTextSpans = spans
+                        .Where(s => s.Attribute(XName.Get("role", "http://www.w3.org/ns/ttml#metadata"))?.Value == "x-translation")
+                        .ToList();
 
-                    int startIndex = 0;
-
-                    for (int i = 0; i < spans.Count; i++)
+                    // 原文（非 CJK 语言添加空格）
+                    string originalText = string.Concat(originalTextSpans.Select(s => s.Value));
+                    if (!LanguageHelper.IsCJK(originalText))
+                    {
+                        foreach (var span in originalTextSpans)
+                        {
+                            span.Value += " ";
+                        }
+                        originalText = string.Concat(originalTextSpans.Select(s => s.Value));
+                    }
+
+                    var originalCharTimings = new List<LyricsChar>();
+                    int originalStartIndex = 0;
+                    foreach (var span in originalTextSpans)
                     {
-                        var span = spans[i];
                         string? sBegin = span.Attribute("begin")?.Value;
                         string? sEnd = span.Attribute("end")?.Value;
                         int sStartMs = ParseTtmlTime(sBegin);
                         int sEndMs = ParseTtmlTime(sEnd);
-
-                        if (sStartMs == 0 && sEndMs == 0)
-                            continue;
-
-                        if (sEndMs == 0)
-                            sEndMs =
-                                (i + 1 < spans.Count)
-                                    ? ParseTtmlTime(spans[i + 1].Attribute("begin")?.Value)
-                                    : pEndMs;
-
-                        charTimings.Add(new CharTiming { StartMs = sStartMs, EndMs = 0, StartIndex = startIndex, Text = span.Value });
-                        startIndex += span.Value.Length;
+                        originalCharTimings.Add(new LyricsChar
+                        {
+                            StartMs = sStartMs,
+                            EndMs = sEndMs,
+                            StartIndex = originalStartIndex,
+                            Text = span.Value
+                        });
+                        originalStartIndex += span.Value.Length;
                     }
+                    if (originalTextSpans.Count == 0)
+                        originalText = p.Value;
 
-                    if (spans.Count == 0)
-                        text = p.Value;
+                    originalLines.Add(new LyricsLine
+                    {
+                        StartMs = pStartMs,
+                        EndMs = pEndMs,
+                        OriginalText = originalText,
+                        LyricsChars = originalCharTimings,
+                    });
 
-                    singleLangLyricsLine.Add(
-                        new LyricsLine
+                    // 翻译
+                    string translationText = string.Concat(translationTextSpans.Select(s => s.Value));
+                    var translationCharTimings = new List<LyricsChar>();
+                    int translationStartIndex = 0;
+                    foreach (var span in translationTextSpans)
+                    {
+                        string? sBegin = span.Attribute("begin")?.Value;
+                        string? sEnd = span.Attribute("end")?.Value;
+                        int sStartMs = ParseTtmlTime(sBegin);
+                        int sEndMs = ParseTtmlTime(sEnd);
+                        translationCharTimings.Add(new LyricsChar
+                        {
+                            StartMs = sStartMs,
+                            EndMs = sEndMs,
+                            StartIndex = translationStartIndex,
+                            Text = span.Value
+                        });
+                        translationStartIndex += span.Value.Length;
+                    }
+                    if (translationTextSpans.Count > 0)
+                    {
+                        translationLines.Add(new LyricsLine
                         {
                             StartMs = pStartMs,
-                            EndMs = 0,
-                            OriginalText = text,
-                            CharTimings = charTimings,
-                        }
-                    );
+                            EndMs = pEndMs,
+                            OriginalText = translationText,
+                            LyricsChars = translationCharTimings,
+                        });
+                    }
                 }
-                _multiLangLyricsLines.Add(singleLangLyricsLine);
+                _lyricsDataArr.Add(new LyricsData(originalLines));
+                if (translationLines.Count > 0)
+                    _lyricsDataArr.Add(new LyricsData(translationLines));
             }
             catch
             {
@@ -230,7 +264,7 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        private int ParseTtmlTime(string? t)
+        private static int ParseTtmlTime(string? t)
         {
             if (string.IsNullOrWhiteSpace(t))
                 return 0;
@@ -291,7 +325,7 @@ namespace BetterLyrics.WinUI3.Helper
             return 0;
         }
 
-        private void ParseUsingLyricify(List<ILineInfo>? lines)
+        private void ParseQQNeteaseKugou(List<ILineInfo>? lines)
         {
             lines = lines?.Where(x => x.Text != string.Empty).ToList();
             List<LyricsLine> lyricsLines = [];
@@ -305,9 +339,9 @@ namespace BetterLyrics.WinUI3.Helper
                     var lineWrite = new LyricsLine
                     {
                         StartMs = lineRead.StartTime ?? 0,
-                        EndMs = 0,
+                        EndMs = lineRead.EndTime ?? 0,
                         OriginalText = lineRead.Text,
-                        CharTimings = [],
+                        LyricsChars = [],
                     };
 
                     var syllables = (lineRead as SyllableLineInfo)?.Syllables;
@@ -321,22 +355,14 @@ namespace BetterLyrics.WinUI3.Helper
                         )
                         {
                             var syllable = syllables[syllableIndex];
-                            var charTiming = new CharTiming
+                            var charTiming = new LyricsChar
                             {
                                 StartMs = syllable.StartTime,
-                                EndMs = 0,
+                                EndMs = syllable.EndTime,
                                 Text = syllable.Text,
                                 StartIndex = startIndex,
                             };
-                            if (syllableIndex + 1 < syllables.Count)
-                            {
-                                charTiming.EndMs = syllables[syllableIndex + 1].StartTime;
-                            }
-                            else
-                            {
-                                charTiming.EndMs = lineWrite.EndMs;
-                            }
-                            lineWrite.CharTimings.Add(charTiming);
+                            lineWrite.LyricsChars.Add(charTiming);
                             startIndex += syllable.Text.Length;
                         }
                     }
@@ -345,56 +371,7 @@ namespace BetterLyrics.WinUI3.Helper
                 }
             }
 
-            _multiLangLyricsLines.Add(lyricsLines);
-        }
-
-        private void PostProcessLyricsLines(int durationMs)
-        {
-            for (int langIdx = 0; langIdx < _multiLangLyricsLines.Count; langIdx++)
-            {
-                var linesInSingleLang = _multiLangLyricsLines[langIdx];
-                for (int i = 0; i < linesInSingleLang.Count; i++)
-                {
-                    if (i + 1 < linesInSingleLang.Count)
-                    {
-                        linesInSingleLang[i].EndMs = linesInSingleLang[i + 1].StartMs;
-                    }
-                    else
-                    {
-                        linesInSingleLang[i].EndMs = durationMs;
-                    }
-
-                    // 修正 CharTimings 的 EndMs
-                    var timings = linesInSingleLang[i].CharTimings;
-                    if (timings.Count > 0)
-                    {
-                        for (int j = 0; j < timings.Count; j++)
-                        {
-                            if (j + 1 < timings.Count)
-                            {
-                                timings[j].EndMs = timings[j + 1].StartMs;
-                            }
-                            else
-                            {
-                                timings[j].EndMs = linesInSingleLang[i].EndMs;
-                            }
-                        }
-                    }
-                }
-                if (linesInSingleLang.Count > 0 && linesInSingleLang[0].StartMs > 0)
-                {
-                    linesInSingleLang.Insert(
-                        0,
-                        new LyricsLine
-                        {
-                            StartMs = 0,
-                            EndMs = linesInSingleLang[0].StartMs,
-                            OriginalText = "● ● ●",
-                            CharTimings = [],
-                        }
-                    );
-                }
-            }
+            _lyricsDataArr.Add(new LyricsData(lyricsLines));
         }
     }
 }

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

@@ -0,0 +1,47 @@
+// 2025/6/23 by Zhe Fang
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    using BetterLyrics.WinUI3.Models;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Reflection;
+    using System.Threading.Tasks;
+    using Windows.ApplicationModel;
+    using Windows.Storage;
+    using Windows.Storage.FileProperties;
+
+    public static class MetadataHelper
+    {
+        public const string AppAuthor = "Zhe Fang";
+        public const string AppDisplayName = "Better Lyrics";
+        public const string AppName = "BetterLyrics";
+        public static string AppVersion
+        {
+            get
+            {
+                var version = Package.Current.Id.Version;
+                return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
+            }
+        }
+
+        public const string GithubUrl = "https://github.com/jayfunc/BetterLyrics";
+        public const string QQGroupUrl = "https://qun.qq.com/universal-share/share?ac=1&authKey=4Q%2BYTq3wZldYpF5SbS5c19ECFsiYoLZFAIcBNNzYpBUtiEjaZ8sZ%2F%2BnFN0qw3lad&busi_data=eyJncm91cENvZGUiOiIxMDU0NzAwMzg4IiwidG9rZW4iOiJiVnhqemVYN0N5QVc3b1ZkR24wWmZOTUtvUkJoWm1JRWlaWW5iZnlBcXJtZUtGc2FFTHNlUlFZMi9iRm03cWF5IiwidWluIjoiMTM5NTczOTY2MCJ9&data=39UmAihyH_o6CZaOs7nk2mO_lz2ruODoDou6pxxh7utcxP4WF5sbDBDOPvZ_Wqfzeey4441anegsLYQJxkrBAA&svctype=4&tempid=h5_group_info";
+        public const string DiscordUrl = "https://discord.gg/5yAQPnyCKv";
+
+        public static async Task<DateTime> GetBuildDate()
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            var filePath = assembly.Location;
+            if (!File.Exists(filePath))
+                return DateTime.MinValue;
+
+            StorageFile file = await StorageFile.GetFileFromPathAsync(filePath);
+            // 获取文件基本属性
+            BasicProperties props = await file.GetBasicPropertiesAsync();
+            // 返回修改日期
+            return props.DateModified.DateTime;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/NetHelper.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class NetHelper
+    {
+        public static async Task<bool> CheckConnectivity(string url)
+        {
+            try
+            {
+                using var client = new System.Net.Http.HttpClient();
+                // Try to reach a reliable endpoint
+                var res = await client.GetAsync(url);
+                return res.IsSuccessStatusCode;
+            }
+            catch
+            {
+                return false; // If any exception occurs, assume no connectivity
+            }
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using Windows.Storage;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class PathHelper
+    {
+        private static string LocalFolder => ApplicationData.Current.LocalFolder.Path;
+        public static string CacheFolder => ApplicationData.Current.LocalCacheFolder.Path;
+        public static string AssetsFolder => Path.Combine(Package.Current.InstalledPath, "Assets");
+
+        public static string LanguageProfilePath => Path.Combine(AssetsFolder, "Core14.profile.xml");
+
+        public static string LogDirectory => Path.Combine(CacheFolder, "logs");
+        public static string LogFilePattern => Path.Combine(LogDirectory, "log-.txt");
+
+        public static string LyricsCacheDirectory => Path.Combine(CacheFolder, "lyrics");
+
+        public static string LrcLibLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "lrclib");
+        public static string NeteaseLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "netease");
+        public static string QQLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "qq");
+        public static string KugouLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "kugou");
+        public static string AmllTtmlDbLyricsCacheDirectory => Path.Combine(LyricsCacheDirectory, "amll-ttml-db");
+        public static string AmllTtmlDbIndexPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-index.json");
+        public static string AmllTtmlDbLastUpdatedPath => Path.Combine(LyricsCacheDirectory, "amll-ttml-db-last-updated.txt");
+
+        public static string TranslationCacheDirectory => Path.Combine(CacheFolder, "translations");
+
+        public static string QQTranslationCacheDirectory => Path.Combine(TranslationCacheDirectory, "qq");
+
+        public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
+
+        public static string iTunesAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "itunes");
+
+        public static void EnsureDirectories()
+        {
+            Directory.CreateDirectory(LogDirectory);
+
+            Directory.CreateDirectory(LrcLibLyricsCacheDirectory);
+            Directory.CreateDirectory(QQLyricsCacheDirectory);
+            Directory.CreateDirectory(KugouLyricsCacheDirectory);
+            Directory.CreateDirectory(NeteaseLyricsCacheDirectory);
+            Directory.CreateDirectory(AmllTtmlDbLyricsCacheDirectory);
+
+            Directory.CreateDirectory(QQTranslationCacheDirectory);
+
+            Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StringHelper.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class StringHelper
+    {
+        // 去除空格、括号、下划线、横杠、点、大小写等
+        public static string Normalize(string s) =>
+            new string(s
+                .Where(c => char.IsLetterOrDigit(c))
+                .ToArray())
+                .ToLowerInvariant();
+        public static string NewLine = "\n";
+    }
+}

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

@@ -0,0 +1,74 @@
+using Microsoft.UI.Dispatching;
+using System;
+using Vanara.Extensions;
+using Vanara.PInvoke;
+using static Vanara.PInvoke.CoreAudio;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class SystemVolumeHelper
+    {
+        private readonly static IMMDeviceEnumerator _deviceEnumerator = new();
+        private static IAudioEndpointVolume? _endpointVolume = null;
+        private static VolumeCallbackImpl? _callbackImpl;
+        private static int _masterVolume = 0;
+        private static DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
+        public static event Action<int>? VolumeChanged;
+
+        static SystemVolumeHelper()
+        {
+            var device = _deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia);
+            if (device != null)
+            {
+                device.Activate(typeof(IAudioEndpointVolume).GUID, 0, null, out var obj);
+                if (obj is IAudioEndpointVolume endpointVolume)
+                {
+                    _endpointVolume = endpointVolume;
+                    _callbackImpl = new VolumeCallbackImpl();
+                    _endpointVolume.RegisterControlChangeNotify(_callbackImpl);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取当前系统主音量（0~100）。
+        /// </summary>
+        public static int GetMasterVolume()
+        {
+            if (_endpointVolume != null)
+            {
+                float level = _endpointVolume.GetMasterVolumeLevelScalar();
+                _masterVolume = (int)(level * 100);
+            }
+
+            return _masterVolume;
+        }
+
+        /// <summary>
+        /// 设置当前系统主音量（0~100）。
+        /// </summary>
+        public static void SetMasterVolume(int volume)
+        {
+            if (_masterVolume == volume) return;
+
+            _masterVolume = volume;
+            _endpointVolume?.SetMasterVolumeLevelScalar(_masterVolume / 100f, Guid.Empty);
+        }
+
+        // 内部回调实现
+        private class VolumeCallbackImpl : IAudioEndpointVolumeCallback
+        {
+            HRESULT IAudioEndpointVolumeCallback.OnNotify(nint pNotify)
+            {
+                var data = pNotify.ToStructure<AUDIO_VOLUME_NOTIFICATION_DATA>();
+                _masterVolume = (int)(data.fMasterVolume * 100);
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    VolumeChanged?.Invoke(_masterVolume);
+                });
+                return HRESULT.S_OK;
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ThrottleHelper.cs

@@ -0,0 +1,37 @@
+using System;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class ThrottleHelper
+    {
+        private DateTime _lastTriggerTime = DateTime.MinValue;
+        private readonly TimeSpan _interval;
+
+        public ThrottleHelper(TimeSpan interval)
+        {
+            _interval = interval;
+        }
+
+        /// <summary>
+        /// 判断是否可以触发（距离上次触发已超过设定间隔），如果可以则更新时间戳并返回 true，否则返回 false。
+        /// </summary>
+        public bool CanTrigger()
+        {
+            var now = DateTime.Now;
+            if ((now - _lastTriggerTime) >= _interval)
+            {
+                _lastTriggerTime = now;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 重置触发时间
+        /// </summary>
+        public void Reset()
+        {
+            _lastTriggerTime = DateTime.MinValue;
+        }
+    }
+}

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

@@ -6,13 +6,6 @@ using BetterLyrics.WinUI3.Enums;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    public class AnimationHelper
-    {
-        public const int DebounceDefaultDuration = 200;
-        public const int StackedNotificationsShowingDuration = 3900;
-        public const int StoryboardDefaultDuration = 200;
-    }
-
     public class ValueTransition<T>
         where T : struct
     {
@@ -52,11 +45,18 @@ namespace BetterLyrics.WinUI3.Helper
             }
             else
             {
-                _easingType = EasingType.SmoothStep;
+                _easingType = EasingType.Linear;
                 _interpolator = GetInterpolatorByEasingType(_easingType.Value);
             }
         }
 
+        public void SetDuration(float seconds)
+        {
+            if (seconds <= 0)
+                throw new ArgumentOutOfRangeException(nameof(seconds), "Duration must be positive.");
+            _durationSeconds = seconds;
+        }
+
         private void JumpTo(T value)
         {
             _currentValue = value;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WindowColorHelper.cs

@@ -1,148 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
-using BetterLyrics.WinUI3.Enums;
-using Microsoft.UI.Xaml;
-using Vanara.PInvoke;
-
-namespace BetterLyrics.WinUI3.Helper
-{
-    public static class WindowColorHelper
-    {
-        public static Color GetDominantColor(IntPtr myHwnd, WindowColorSampleMode mode)
-        {
-            if (!User32.GetWindowRect(myHwnd, out RECT myRect)) return Color.Transparent;
-
-            switch (mode)
-            {
-                case WindowColorSampleMode.BelowWindow:
-                    {
-                        int screenWidth = User32.GetSystemMetrics(User32.SystemMetric.SM_CXSCREEN);
-                        int sampleHeight = 1;
-                        int sampleY = myRect.Bottom + 1;
-                        return GetAverageColorFromScreenRegion(0, sampleY, screenWidth, sampleHeight);
-                    }
-                case WindowColorSampleMode.WindowArea:
-                    {
-                        int width = myRect.Right - myRect.Left;
-                        int height = myRect.Bottom - myRect.Top;
-                        if (width <= 0 || height <= 0)
-                            return Color.Transparent;
-                        // 采集窗口区域的平均色
-                        return GetAverageColorFromScreenRegion(myRect.Left, myRect.Top, width, height);
-                    }
-                case WindowColorSampleMode.WindowEdge:
-                    {
-                        int width = myRect.Right - myRect.Left;
-                        int height = myRect.Bottom - myRect.Top;
-                        if (width <= 0 || height <= 0)
-                            return Color.Transparent;
-
-                        var edgeThickness = new Thickness(36, 0, 36, 0);
-                        List<Color> edgeColors = [];
-
-                        // Top edge
-                        if (edgeThickness.Top > 0 && edgeThickness.Top < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top,
-                                    width,
-                                    (int)edgeThickness.Top
-                                )
-                            );
-                        // Bottom edge
-                        if (edgeThickness.Bottom > 0 && edgeThickness.Bottom < height)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Bottom - (int)edgeThickness.Bottom,
-                                    width,
-                                    (int)edgeThickness.Bottom
-                                )
-                            );
-                        // Left edge
-                        if (edgeThickness.Left > 0 && edgeThickness.Left < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Left,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Left,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
-                        // Right edge
-                        if (edgeThickness.Right > 0 && edgeThickness.Right < width)
-                            edgeColors.Add(
-                                GetAverageColorFromScreenRegion(
-                                    myRect.Right - (int)edgeThickness.Right,
-                                    myRect.Top + (int)edgeThickness.Top,
-                                    (int)edgeThickness.Right,
-                                    height - (int)edgeThickness.Top - (int)edgeThickness.Bottom
-                                )
-                            );
-
-                        // 合并四边平均色
-                        if (edgeColors.Count == 0)
-                            return Color.Transparent;
-                        long r = 0,
-                            g = 0,
-                            b = 0;
-                        foreach (var c in edgeColors)
-                        {
-                            r += c.R;
-                            g += c.G;
-                            b += c.B;
-                        }
-                        return Color.FromArgb(
-                            255,
-                            (int)(r / edgeColors.Count),
-                            (int)(g / edgeColors.Count),
-                            (int)(b / edgeColors.Count)
-                        );
-                    }
-                default:
-                    return Color.Transparent;
-            }
-        }
-
-        private static Color GetAverageColorFromScreenRegion(int x, int y, int width, int height)
-        {
-            using Bitmap bmp = new(width, height, PixelFormat.Format32bppArgb);
-            using Graphics gDest = Graphics.FromImage(bmp);
-
-            IntPtr hdcDest = gDest.GetHdc();
-            IntPtr hdcSrc = (nint)User32.GetDC(IntPtr.Zero); // Entire screen
-
-            Gdi32.BitBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, Gdi32.RasterOperationMode.SRCCOPY);
-
-            gDest.ReleaseHdc(hdcDest);
-            User32.ReleaseDC(IntPtr.Zero, hdcSrc);
-
-            return ComputeAverageColor(bmp);
-        }
-
-        private static Color ComputeAverageColor(Bitmap bmp)
-        {
-            long r = 0, g = 0, b = 0;
-            int count = 0;
-
-            for (int y = 0; y < bmp.Height; y++)
-            {
-                for (int x = 0; x < bmp.Width; x++)
-                {
-                    Color pixel = bmp.GetPixel(x, y);
-                    r += pixel.R;
-                    g += pixel.G;
-                    b += pixel.B;
-                    count++;
-                }
-            }
-
-            if (count == 0) return Color.Transparent;
-            return Color.FromArgb((int)(r / count), (int)(g / count), (int)(b / count));
-        }
-    }
-}

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

@@ -1,10 +1,11 @@
 // 2025/6/23 by Zhe Fang
 
-using System;
-using System.Collections.Generic;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Views;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
 using Windows.ApplicationModel.Core;
 using WinRT.Interop;
 using WinUIEx;
@@ -25,17 +26,6 @@ namespace BetterLyrics.WinUI3.Helper
             }
         }
 
-        public static void ExitAllWindows()
-        {
-            while (_activeWindows.Count > 0)
-            {
-                var window = _activeWindows[0];
-                ((Window)window).Close();
-                _activeWindows.Remove(window);
-            }
-            App.Current.Exit();
-        }
-
         public static T? GetWindowByWindowType<T>()
         {
             foreach (var window in _activeWindows)
@@ -47,32 +37,32 @@ namespace BetterLyrics.WinUI3.Helper
             }
             return default;
         }
-        public static void OpenOrShowWindow<T>()
+        public static void OpenWindow<T>()
         {
             var window = _activeWindows.Find(w => w is T);
-            if (window != null)
+            if (window == null)
             {
-                var castedWindow = (Window)window;
-                castedWindow.Restore();
-            }
-            else
-            {
-                object newWindow;
                 if (typeof(T) == typeof(LyricsWindow))
                 {
-                    newWindow = new LyricsWindow();
+                    window = new LyricsWindow();
+                    ((LyricsWindow)window).SystemBackdrop = SystemBackdropHelper.CreateSystemBackdrop(BackdropType.Transparent);
                 }
                 else if (typeof(T) == typeof(SettingsWindow))
                 {
-                    newWindow = new SettingsWindow();
+                    window = new SettingsWindow();
+                }
+                else if (typeof(T) == typeof(MusicGalleryWindow))
+                {
+                    window = new MusicGalleryWindow();
                 }
                 else
                 {
                     throw new ArgumentException("Unsupported window type", nameof(T));
                 }
-                ((Window)newWindow).Activate();
-                TrackWindow(newWindow);
+                TrackWindow(window);
             }
+            var castedWindow = (Window)window;
+            castedWindow.Restore();
         }
 
         public static void RestartApp(string args = "")
@@ -98,7 +88,19 @@ namespace BetterLyrics.WinUI3.Helper
         private static void TrackWindow(object window)
         {
             if (!_activeWindows.Contains(window))
+            {
                 _activeWindows.Add(window);
+                var castedWindow = (Window)window;
+                castedWindow.Closed += WindowHelper_Closed;
+            }
+        }
+
+        private static void WindowHelper_Closed(object sender, WindowEventArgs args)
+        {
+            if (_activeWindows.Contains(sender))
+            {
+                _activeWindows.Remove(sender);
+            }
         }
     }
 }

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

@@ -0,0 +1,24 @@
+// 2025/6/23 by Zhe Fang
+
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class AlbumArtSearchProviderInfo : ObservableObject
+    {
+        [ObservableProperty]
+        public partial bool IsEnabled { get; set; }
+
+        [ObservableProperty]
+        public partial AlbumArtSearchProvider Provider { get; set; }
+
+        public AlbumArtSearchProviderInfo() { }
+
+        public AlbumArtSearchProviderInfo(AlbumArtSearchProvider provider, bool isEnabled)
+        {
+            Provider = provider;
+            IsEnabled = isEnabled;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/DetectLanguageResult.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class DetectLanguageResult
-    {
-        [JsonPropertyName("confidence")]
-        public double Confidence { get; set; }
-
-        [JsonPropertyName("language")]
-        public string Language { get; set; }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/GroupInfoList.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class GroupInfoList(IEnumerable<object> items) : List<object>(items)
+    {
+        public required object Key { get; set; }
+
+        public override string ToString()
+        {
+            return "Group " + Key.ToString();
+        }
+    }
+}

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

@@ -4,7 +4,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public partial class LocalLyricsFolder : ObservableObject
+    public partial class LocalMediaFolder : ObservableObject
     {
         [ObservableProperty]
         public partial bool IsEnabled { get; set; }
@@ -12,9 +12,9 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty]
         public partial string Path { get; set; }
 
-        public LocalLyricsFolder() { }
+        public LocalMediaFolder() { }
 
-        public LocalLyricsFolder(string path, bool isEnabled)
+        public LocalMediaFolder(string path, bool isEnabled)
         {
             Path = path;
             IsEnabled = isEnabled;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsChar.cs

@@ -1,10 +1,12 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Helper;
+
 namespace BetterLyrics.WinUI3.Models
 {
-    public class CharTiming
+    public class LyricsChar
     {
-        public int EndMs { get; set; }
+        public int? EndMs { get; set; }
         public int StartIndex { get; set; }
         public int StartMs { get; set; }
         public string Text { get; set; } = string.Empty;

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

@@ -0,0 +1,137 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services;
+using Lyricify.Lyrics.Helpers.General;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using StringHelper = BetterLyrics.WinUI3.Helper.StringHelper;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class LyricsData
+    {
+        public List<LyricsLine> LyricsLines { get; set; }
+        public string? LanguageCode => LanguageHelper.DetectLanguageCode(WrappedOriginalText);
+        public string WrappedOriginalText => string.Join(StringHelper.NewLine, LyricsLines.Select(line => line.OriginalText));
+
+        public LyricsData()
+        {
+            LyricsLines = [];
+        }
+
+        public LyricsData(List<LyricsLine> lyricsLines)
+        {
+            LyricsLines = lyricsLines;
+        }
+
+        public void SetDisplayedTextAlongWith(LyricsData translationData)
+        {
+            int i = 0;
+            foreach (var line in LyricsLines)
+            {
+                if (i >= translationData.LyricsLines.Count)
+                {
+                    line.DisplayedText = line.OriginalText; // No translation available, keep original text
+                }
+                else
+                {
+                    if (translationData.LanguageCode?.Substring(0, 2) == "zh")
+                    {
+                        string tmp = "";
+                        if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hant")
+                        {
+                            tmp = ChineseConverter.ConvertToTraditionalChinese(translationData.LyricsLines[i].OriginalText);
+                        }
+                        else if (LanguageHelper.GetUserTargetLanguageCode() == "zh-Hans")
+                        {
+                            tmp = ChineseConverter.ConvertToSimplifiedChinese(translationData.LyricsLines[i].OriginalText);
+                        }
+                        line.DisplayedText = $"{line.OriginalText}\n{tmp}";
+                    }
+                    else
+                    {
+                        line.DisplayedText = $"{line.OriginalText}\n{translationData.LyricsLines[i].OriginalText}";
+                    }
+                }
+                i++;
+            }
+        }
+
+        public void SetDisplayedTextAlongWith(string translation)
+        {
+            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
+            int i = 0;
+            foreach (var line in LyricsLines)
+            {
+                if (i >= translationArr.Count)
+                {
+                    line.DisplayedText = line.OriginalText; // No translation available, keep original text
+                }
+                else
+                {
+                    line.DisplayedText = $"{line.OriginalText}{StringHelper.NewLine}{translationArr[i]}";
+                }
+                i++;
+            }
+        }
+
+        public void SetDisplayedTextInOriginalText()
+        {
+            foreach (var line in LyricsLines)
+            {
+                line.DisplayedText = line.OriginalText;
+            }
+        }
+
+        public LyricsData CreateLyricsDataFrom(string translation)
+        {
+            var result = new LyricsData(LyricsLines.Select(line => new LyricsLine
+            {
+                StartMs = line.StartMs,
+                EndMs = line.EndMs,
+            }).ToList());
+            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
+            int i = 0;
+            foreach (var line in result.LyricsLines)
+            {
+                if (i >= translationArr.Count)
+                {
+                    break;
+                }
+                else
+                {
+                    line.OriginalText = translationArr[i];
+                }
+                i++;
+            }
+            return result;
+        }
+
+        public static LyricsData GetNotfoundPlaceholder(int durationMs)
+        {
+            return new LyricsData([new LyricsLine
+            {
+                StartMs = 0,
+                EndMs = durationMs,
+                OriginalText = App.ResourceLoader!.GetString("LyricsNotFound"),
+                LyricsChars = [],
+            }]);
+        }
+
+        public static LyricsData GetLoadingPlaceholder()
+        {
+            return new LyricsData([
+                new LyricsLine
+                {
+                    StartMs = 0,
+                    EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
+                    OriginalText = "● ● ●",
+                    DisplayedText = "● ● ●",
+                    LyricsChars = [],
+                },
+            ]);
+        }
+    }
+}

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

@@ -21,10 +21,10 @@ namespace BetterLyrics.WinUI3.Models
         public Vector2 CenterPosition { get; set; }
         public Vector2 Position { get; set; }
 
-        public List<CharTiming> CharTimings { get; set; } = [];
+        public List<LyricsChar> LyricsChars { get; set; } = [];
 
-        public int DurationMs => EndMs - StartMs;
-        public int EndMs { get; set; }
+        public int? DurationMs => EndMs - StartMs;
+        public int? EndMs { get; set; }
         public int StartMs { get; set; }
 
         public string DisplayedText { get; set; } = "";

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchProviderInfo.cs

@@ -5,17 +5,17 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public partial class MediaSourceProviderInfo : ObservableObject
+    public partial class LyricsSearchProviderInfo : ObservableObject
     {
         [ObservableProperty]
         public partial bool IsEnabled { get; set; }
 
         [ObservableProperty]
-        public partial string Provider { get; set; }
+        public partial LyricsSearchProvider Provider { get; set; }
 
-        public MediaSourceProviderInfo() { }
+        public LyricsSearchProviderInfo() { }
 
-        public MediaSourceProviderInfo(string provider, bool isEnabled)
+        public LyricsSearchProviderInfo(LyricsSearchProvider provider, bool isEnabled)
         {
             Provider = provider;
             IsEnabled = isEnabled;

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

@@ -5,17 +5,17 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public partial class LyricsSearchProviderInfo : ObservableObject
+    public partial class MediaSourceProviderInfo : ObservableObject
     {
         [ObservableProperty]
         public partial bool IsEnabled { get; set; }
 
         [ObservableProperty]
-        public partial LyricsSearchProvider Provider { get; set; }
+        public partial string Provider { get; set; }
 
-        public LyricsSearchProviderInfo() { }
+        public MediaSourceProviderInfo() { }
 
-        public LyricsSearchProviderInfo(LyricsSearchProvider provider, bool isEnabled)
+        public MediaSourceProviderInfo(string provider, bool isEnabled)
         {
             Provider = provider;
             IsEnabled = isEnabled;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Notification.cs

@@ -1,35 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class Notification : ObservableObject
-    {
-        [ObservableProperty]
-        public partial bool IsForeverDismissable { get; set; }
-
-        [ObservableProperty]
-        public partial string? Message { get; set; }
-
-        [ObservableProperty]
-        public partial string? RelatedSettingsKeyName { get; set; }
-
-        [ObservableProperty]
-        public partial InfoBarSeverity Severity { get; set; }
-
-        [ObservableProperty]
-        public partial Visibility Visibility { get; set; }
-
-        public Notification(string? message = null, InfoBarSeverity severity = InfoBarSeverity.Informational, bool isForeverDismissable = false, string? relatedSettingsKeyName = null)
-        {
-            Message = message;
-            Severity = severity;
-            IsForeverDismissable = isForeverDismissable;
-            Visibility = IsForeverDismissable ? Visibility.Visible : Visibility.Collapsed;
-            RelatedSettingsKeyName = relatedSettingsKeyName;
-        }
-    }
-}

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

@@ -11,13 +11,12 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty]
         public partial string? Album { get; set; }
 
-        public SoftwareBitmap? AlbumArtSwBitmap { get; set; } = null;
-
-        public Color? AlbumArtAccentColor { get; set; } = null;
-
         [ObservableProperty]
         public partial string Artist { get; set; }
 
+        [ObservableProperty]
+        public partial int? Duration { get; set; }
+
         [ObservableProperty]
         public partial double? DurationMs { get; set; }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class TrimmedTrack
+    {
+        public string Title { get; set; }
+        public string Artist { get; set; }
+        public string Album { get; set; }
+        public int? Year { get; set; }
+        public string Genre { get; set; }
+        public string FilePath { get; set; }
+        public int Duration { get; set; }
+        public byte[]? AlbumArt { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Serialization/SourceGenerationContext.cs

@@ -8,11 +8,11 @@ using BetterLyrics.WinUI3.Models;
 namespace BetterLyrics.WinUI3.Serialization
 {
 
+    [JsonSerializable(typeof(List<AlbumArtSearchProviderInfo>))]
     [JsonSerializable(typeof(List<LyricsSearchProviderInfo>))]
     [JsonSerializable(typeof(List<MediaSourceProviderInfo>))]
-    [JsonSerializable(typeof(List<LocalLyricsFolder>))]
+    [JsonSerializable(typeof(List<LocalMediaFolder>))]
     [JsonSerializable(typeof(List<string>))]
-    [JsonSerializable(typeof(List<DetectLanguageResult>))]
     [JsonSerializable(typeof(TranslateResponse))]
     [JsonSerializable(typeof(JsonElement))]
     [JsonSourceGenerationOptions(WriteIndented = true)]

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService.cs

@@ -0,0 +1,141 @@
+using ATL;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public class AlbumArtSearchService : IAlbumArtSearchService
+    {
+        private readonly HttpClient _iTunesHttpClinet;
+
+        private readonly ISettingsService _settingsService;
+        private readonly ILogger _logger;
+
+        public AlbumArtSearchService(ISettingsService settingsService)
+        {
+            _settingsService = settingsService;
+            _logger = Ioc.Default.GetRequiredService<ILogger<AlbumArtSearchService>>();
+            _iTunesHttpClinet = new();
+        }
+
+        public async Task<byte[]?> SearchAsync(string title, string artist, string album, byte[]? bytesFromSMTC = null)
+        {
+            byte[]? result = null;
+
+            foreach (var provider in _settingsService.AlbumArtSearchProvidersInfo)
+            {
+                if (!provider.IsEnabled)
+                {
+                    continue;
+                }
+
+                switch (provider.Provider)
+                {
+                    case AlbumArtSearchProvider.Local:
+                        result = SearchFile(artist, album);
+                        break;
+                    case AlbumArtSearchProvider.SMTC:
+                        result = bytesFromSMTC;
+                        break;
+                    case AlbumArtSearchProvider.iTunes:
+                        foreach (string countryCode in new List<string>() { "us", "cn", "jp", "kr" })
+                        {
+                            result = await SearchiTunesAsync(artist, album, title, countryCode);
+                            if (result != null) break;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                if (result != null) return result;
+            }
+            return null;
+        }
+
+        private byte[]? SearchFile(string artist, string album)
+        {
+            foreach (var folder in _settingsService.LocalMediaFolders)
+            {
+                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                {
+                    foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
+                    {
+                        if (FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), album, artist))
+                        {
+                            Track track = new(file);
+                            var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
+                            if (bytes != null)
+                            {
+                                return bytes;
+                            }
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        private async Task<byte[]?> SearchiTunesAsync(string artist, string album, string title, string countryCode)
+        {
+            // Source: https://gist.github.com/mcworkaholic/82fbf203e3f1043bbe534b5b2974c0ce
+            try
+            {
+                string format = ".jpg";
+                var cachedAlbumArt = FileHelper.ReadAlbumArtCache(artist, album, format, PathHelper.iTunesAlbumArtCacheDirectory);
+
+                if (cachedAlbumArt != null)
+                {
+                    return cachedAlbumArt;
+                }
+
+                // Build the iTunes API URL
+                string url = $"https://itunes.apple.com/search?term=" + WebUtility.UrlEncode($"{artist} {album}").Replace("%20", "+") + "&country=" + countryCode + "&entity=album&media=music&limit=1";
+
+                // Make a request to the API
+                HttpResponseMessage response = await _iTunesHttpClinet.GetAsync(url);
+                response.EnsureSuccessStatusCode();
+                string responseBody = await response.Content.ReadAsStringAsync();
+
+                // Parse the JSON response
+                var data = JsonSerializer.Deserialize(responseBody, Serialization.SourceGenerationContext.Default.JsonElement);
+
+                if (data.TryGetProperty("results", out var results) && results.ValueKind == JsonValueKind.Array && results.GetArrayLength() > 0)
+                {
+                    // Get the first result
+                    var result = results[0];
+                    if (result.TryGetProperty("artworkUrl100", out var artworkUrlProp))
+                    {
+                        string artworkUrl = artworkUrlProp.GetString()?.Replace("100x100bb.jpg", "1200x1200bb.jpg") ?? string.Empty;
+                        var fetched = await _iTunesHttpClinet.GetByteArrayAsync(artworkUrl);
+
+                        if (fetched != null && fetched.Length > 0)
+                        {
+                            // Write to cache
+                            FileHelper.WriteAlbumArtCache(artist, album, fetched, format, PathHelper.iTunesAlbumArtCacheDirectory);
+                            return fetched;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error searching iTunes album art for {Artist} - {Album}", artist, album);
+            }
+            return null;
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IAlbumArtSearchService.cs

@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    public interface ILibreTranslateService
+    public interface IAlbumArtSearchService
     {
-        Task<string> TranslateAsync(string text, CancellationToken? token);
+        Task<byte[]?> SearchAsync(string title, string artist, string album, byte[]? bytesFromSMTC = null);
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/ILibWatcherService.cs

@@ -14,6 +14,6 @@ namespace BetterLyrics.WinUI3.Services
     {
         event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
 
-        public void UpdateWatchers(List<LocalLyricsFolder> folders);
+        public void UpdateWatchers(List<LocalMediaFolder> folders);
     }
 }

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

@@ -0,0 +1,14 @@
+// 2025/6/23 by Zhe Fang
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using BetterLyrics.WinUI3.Enums;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public interface ILyricsSearchService
+    {
+        Task<(string?, LyricsSearchProvider?)> SearchAsync(string title, string artist, string album, double durationMs, CancellationToken token);
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IMusicSearchService.cs

@@ -1,22 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using BetterLyrics.WinUI3.Enums;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public interface IMusicSearchService
-    {
-        Task <byte[]?> SearchAlbumArtAsync(string title, string artist, string album);
-
-        Task<string?> SearchLyricsAsync(
-            string title,
-            string artist,
-            string album,
-            double durationMs,
-            CancellationToken token
-        );
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/IPlaybackService.cs

@@ -1,6 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using System;
+using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
 
@@ -9,11 +10,18 @@ namespace BetterLyrics.WinUI3.Services
     public interface IPlaybackService
     {
         event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
-
         event EventHandler<PositionChangedEventArgs>? PositionChanged;
-
         event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
-
+        event EventHandler<AlbumArtChangedEventArgs>? AlbumArtChangedChanged;
         event EventHandler<MediaSourceProvidersInfoEventArgs>? MediaSourceProvidersInfoChanged;
+
+        Task PlayAsync();
+        Task PauseAsync();
+        Task PreviousAsync();
+        Task NextAsync();
+        Task ChangePosition(double seconds);
+
+        bool IsPlaying { get; }
+        SongInfo? SongInfo { get; }
     }
 }

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

@@ -3,10 +3,8 @@
 using System.Collections.Generic;
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Models;
-using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Windows.UI;
-using Windows.UI.Text;
 
 namespace BetterLyrics.WinUI3.Services
 {
@@ -39,9 +37,11 @@ namespace BetterLyrics.WinUI3.Services
 
         string LibreTranslateServer { get; set; }
         int SelectedTargetLanguageIndex { get; set; }
+        bool ResetPositionOffsetOnSongChanged { get; set; }
+        int PositionOffset { get; set; }
         // Lyrics lib
 
-        List<LocalLyricsFolder> LocalLyricsFolders { get; set; }
+        List<LocalMediaFolder> LocalMediaFolders { get; set; }
 
         // Lyrics style and effetc
 
@@ -54,6 +54,8 @@ namespace BetterLyrics.WinUI3.Services
         Color LyricsCustomFgFontColor { get; set; }
         Color LyricsCustomStrokeFontColor { get; set; }
 
+        int LyricsBgFontOpacity { get; set; }
+
         LyricsFontColorType LyricsBgFontColorType { get; set; }
         LyricsFontColorType LyricsFgFontColorType { get; set; }
         LyricsFontColorType LyricsStrokeFontColorType { get; set; }
@@ -67,19 +69,37 @@ namespace BetterLyrics.WinUI3.Services
         LyricsFontWeight LyricsFontWeight { get; set; }
 
         LineRenderingType LyricsGlowEffectScope { get; set; }
+        LineRenderingType LyricsHighlightScope { get; set; }
+
+        bool IsLyricsFloatAnimationEnabled { get; set; }
 
         float LyricsLineSpacingFactor { get; set; }
 
         List<LyricsSearchProviderInfo> LyricsSearchProvidersInfo { get; set; }
-
+        List<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo { get; set; }
         List<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; }
 
+        EasingType LyricsScrollEasingType { get; set; }
+        int LyricsScrollDuration { get; set; }
+
         int LyricsVerticalEdgeOpacity { get; set; }
 
         bool IgnoreFullscreenWindow { get; set; }
 
         bool IsTranslationEnabled { get; set; }
+        bool ShowTranslationOnly { get; set; }
 
-        LyricsDisplayType PreferredDisplayType { get; set; }
+        LyricsDisplayType DisplayType { get; set; }
+
+        int TimelineSyncThreshold { get; set; }
+        int LockHotKeyIndex { get; set; }
+        bool IsImmersiveMode { get; set; }
+        string LXMusicServer { get; set; }
+        DockPlacement DockPlacement { get; set; }
+        bool HideWindowWhenNotPlaying { get; set; }
+        int DockWindowHeight { get; set; }
+        int SelectedFontFamilyIndex { get; set; }
+        string LyricsFontFamily { get; set; }
+        bool IsDragEverywhereEnabled { get; set; }
     }
 }

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

@@ -0,0 +1,17 @@
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public interface ITranslateService
+    {
+        Task<string> TranslateTextAsync(string text, string targetLangCode, CancellationToken? token);
+
+        int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr);
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService.cs

@@ -6,19 +6,18 @@ using System.IO;
 using System.Linq;
 using BetterLyrics.WinUI3.Events;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.ViewModels;
+using Microsoft.UI.Dispatching;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    public class LibWatcherService : IDisposable, ILibWatcherService
+    public class LibWatcherService : BaseViewModel, IDisposable, ILibWatcherService
     {
-        private readonly ISettingsService _settingsService;
-
         private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
 
-        public LibWatcherService(ISettingsService settingsService)
+        public LibWatcherService(ISettingsService settingsService) : base(settingsService)
         {
-            _settingsService = settingsService;
-            UpdateWatchers(_settingsService.LocalLyricsFolders);
+            UpdateWatchers(_settingsService.LocalMediaFolders);
         }
 
         public event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
@@ -32,7 +31,7 @@ namespace BetterLyrics.WinUI3.Services
             _watchers.Clear();
         }
 
-        public void UpdateWatchers(List<LocalLyricsFolder> folders)
+        public void UpdateWatchers(List<LocalMediaFolder> folders)
         {
             // 移除不再监听的
             foreach (var key in _watchers.Keys.ToList())
@@ -69,16 +68,13 @@ namespace BetterLyrics.WinUI3.Services
 
         private void OnChanged(string folder, FileSystemEventArgs e)
         {
-            App.DispatcherQueue!.TryEnqueue(
-                Microsoft.UI.Dispatching.DispatcherQueuePriority.High,
-                () =>
-                {
-                    MusicLibraryFilesChanged?.Invoke(
-                        this,
-                        new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
-                    );
-                }
-            );
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                MusicLibraryFilesChanged?.Invoke(
+                    this,
+                    new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
+                );
+            });
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibreTranslateService.cs

@@ -1,78 +0,0 @@
-using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public class LibreTranslateService : ILibreTranslateService
-    {
-        private readonly ISettingsService _settingsService;
-
-        private readonly HttpClient _httpClient;
-
-        public LibreTranslateService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            _httpClient = new HttpClient();
-        }
-
-        public async Task<string> TranslateAsync(string text, CancellationToken? token)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                throw new ArgumentException("Text and target language must be provided.");
-            }
-
-            string targetLangCode = AppInfo.GetAllTranslationLanguagesInfo()[_settingsService.SelectedTargetLanguageIndex].Code;
-
-            string originalLangCode = await DetectLanguageCode(text);
-            token?.ThrowIfCancellationRequested();
-
-            if (string.IsNullOrWhiteSpace(originalLangCode) || originalLangCode == targetLangCode)
-            {
-                return text; // No translation needed
-            }
-
-            var url = $"{_settingsService.LibreTranslateServer}/translate";
-            var response = await _httpClient.PostAsync(url, new FormUrlEncodedContent(
-            [
-                new("q", text),
-                new("source", originalLangCode),
-                new("target", targetLangCode),
-            ]));
-            token?.ThrowIfCancellationRequested();
-
-            response.EnsureSuccessStatusCode();
-            var json = await response.Content.ReadAsStringAsync();
-            token?.ThrowIfCancellationRequested();
-
-            var result = System.Text.Json.JsonSerializer.Deserialize(json, SourceGenerationContext.Default.TranslateResponse);
-            return result?.TranslatedText ?? string.Empty;
-        }
-
-        private async Task<string> DetectLanguageCode(string text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                throw new ArgumentException("Text must be provided.");
-            }
-            var url = $"{_settingsService.LibreTranslateServer}/detect";
-            var response = await _httpClient.PostAsync(url, new FormUrlEncodedContent(
-            [
-                new("q", text),
-            ]));
-            response.EnsureSuccessStatusCode();
-            var json = await response.Content.ReadAsStringAsync();
-            var resultList = System.Text.Json.JsonSerializer.Deserialize(json, SourceGenerationContext.Default.ListDetectLanguageResult);
-            return resultList?.OrderByDescending(x => x.Confidence).FirstOrDefault()?.Language ?? string.Empty;
-        }
-    }
-}

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

@@ -0,0 +1,367 @@
+// 2025/6/23 by Zhe Fang
+
+using ATL;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Lyricify.Lyrics.Providers.Web.Kugou;
+using Lyricify.Lyrics.Searchers;
+using Microsoft.Extensions.Logging;
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.Storage;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public class LyricsSearchService : ILyricsSearchService
+    {
+        private readonly HttpClient _amllTtmlDbHttpClient;
+        private readonly HttpClient _lrcLibHttpClient;
+
+        private readonly ISettingsService _settingsService;
+        private readonly ILogger _logger;
+
+        public LyricsSearchService(ISettingsService settingsService)
+        {
+            _settingsService = settingsService;
+            _logger = Ioc.Default.GetRequiredService<ILogger<LyricsSearchService>>();
+
+            _lrcLibHttpClient = new();
+            _lrcLibHttpClient.DefaultRequestHeaders.Add(
+                "User-Agent",
+                $"{MetadataHelper.AppName} {MetadataHelper.AppVersion} ({MetadataHelper.GithubUrl})"
+            );
+            _amllTtmlDbHttpClient = new();
+        }
+
+        private static bool IsAmllTtmlDbIndexInvalid()
+        {
+            bool existed = File.Exists(PathHelper.AmllTtmlDbIndexPath);
+
+            if (!existed)
+            {
+                return true;
+            }
+            else
+            {
+                long currentTs = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+                string lastUpdatedStr = File.ReadAllText(PathHelper.AmllTtmlDbLastUpdatedPath);
+                long lastUpdated = Convert.ToInt64(lastUpdatedStr);
+                return currentTs - lastUpdated > 1 * 24 * 60 * 60;
+            }
+        }
+
+        public async Task<bool> DownloadAmllTtmlDbIndexAsync()
+        {
+            const string url = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/metadata/raw-lyrics-index.jsonl";
+            try
+            {
+                using var response = await _amllTtmlDbHttpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
+                if (!response.IsSuccessStatusCode) return false;
+
+                await using var stream = await response.Content.ReadAsStreamAsync();
+                await using var fs = new FileStream(
+                    PathHelper.AmllTtmlDbIndexPath,
+                    FileMode.Create,
+                    FileAccess.Write,
+                    FileShare.None
+                );
+                await stream.CopyToAsync(fs);
+
+                long currentTs = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+                File.WriteAllText(PathHelper.AmllTtmlDbLastUpdatedPath, currentTs.ToString());
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public async Task<(string?, LyricsSearchProvider?)> SearchAsync(string title, string artist, string album, double durationMs, CancellationToken token)
+        {
+            _logger.LogInformation("Searching img for: {Title} - {Artist} (Album: {Album}, Duration: {DurationMs}ms)", title, artist, album, durationMs);
+
+            try
+            {
+                foreach (var provider in _settingsService.LyricsSearchProvidersInfo)
+                {
+                    if (!provider.IsEnabled)
+                    {
+                        continue;
+                    }
+
+                    string? cachedLyrics;
+                    LyricsFormat lyricsFormat = provider.Provider.GetLyricsFormat();
+
+                    // Check cache first
+                    if (provider.Provider.IsRemote())
+                    {
+                        cachedLyrics = FileHelper.ReadLyricsCache(title, artist, lyricsFormat, provider.Provider.GetCacheDirectory());
+                        if (!string.IsNullOrWhiteSpace(cachedLyrics))
+                        {
+                            return (cachedLyrics, provider.Provider);
+                        }
+                    }
+
+                    string? searchedLyrics = null;
+
+                    if (provider.Provider.IsLocal())
+                    {
+                        if (provider.Provider == LyricsSearchProvider.LocalMusicFile)
+                        {
+                            searchedLyrics = SearchEmbedded(title, artist);
+                        }
+                        else
+                        {
+                            searchedLyrics = await SearchFile(title, artist, lyricsFormat);
+                        }
+                    }
+                    else
+                    {
+                        switch (provider.Provider)
+                        {
+                            case LyricsSearchProvider.LrcLib:
+                                searchedLyrics = await SearchLrcLibAsync(title, artist, album, (int)(durationMs / 1000));
+                                break;
+                            case LyricsSearchProvider.QQ:
+                                searchedLyrics = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.QQMusic);
+                                break;
+                            case LyricsSearchProvider.Kugou:
+                                searchedLyrics = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.Kugou);
+                                break;
+                            case LyricsSearchProvider.Netease:
+                                searchedLyrics = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, Searchers.Netease);
+                                break;
+                            case LyricsSearchProvider.AmllTtmlDb:
+                                searchedLyrics = await SearchAmllTtmlDbAsync(title, artist);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    token.ThrowIfCancellationRequested();
+
+                    if (!string.IsNullOrWhiteSpace(searchedLyrics))
+                    {
+                        if (provider.Provider.IsRemote())
+                        {
+                            FileHelper.WriteLyricsCache(title, artist, searchedLyrics, lyricsFormat, provider.Provider.GetCacheDirectory());
+                        }
+
+                        return (searchedLyrics, provider.Provider);
+                    }
+                }
+            }
+            catch (Exception) { }
+
+            return (null, null);
+        }
+
+        private async Task<string?> SearchFile(string title, string artist, LyricsFormat format)
+        {
+            foreach (var folder in _settingsService.LocalMediaFolders)
+            {
+                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                {
+                    foreach (var file in Directory.GetFiles(folder.Path, $"*{format.ToFileExtension()}", SearchOption.AllDirectories))
+                    {
+                        if (FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), title, artist))
+                        {
+                            string? raw = await File.ReadAllTextAsync(file, FileHelper.GetEncoding(file));
+                            if (raw != null)
+                            {
+                                return raw;
+                            }
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        private string? SearchEmbedded(string title, string artist)
+        {
+            foreach (var folder in _settingsService.LocalMediaFolders)
+            {
+                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                {
+                    foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
+                    {
+                        if (FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), title, artist))
+                        {
+                            try
+                            {
+                                var plain = TagLib.File.Create(file).Tag.Lyrics;
+                                if (plain != null && plain != string.Empty)
+                                {
+                                    return plain;
+                                }
+                            }
+                            catch (Exception) { }
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private async Task<string?> SearchAmllTtmlDbAsync(string title, string artist)
+        {
+            if (IsAmllTtmlDbIndexInvalid())
+            {
+                var downloadOk = await DownloadAmllTtmlDbIndexAsync();
+                if (!downloadOk)
+                    return null;
+            }
+
+            string? rawLyricFile = null;
+            await foreach (var line in File.ReadLinesAsync(PathHelper.AmllTtmlDbIndexPath))
+            {
+                if (string.IsNullOrWhiteSpace(line))
+                    continue;
+                try
+                {
+                    using var doc = JsonDocument.Parse(line);
+                    var root = doc.RootElement;
+                    if (!root.TryGetProperty("metadata", out var metadataArr))
+                        continue;
+                    string? musicName = null;
+                    string? artists = null;
+                    foreach (var meta in metadataArr.EnumerateArray())
+                    {
+                        if (meta.GetArrayLength() != 2)
+                            continue;
+                        var key = meta[0].GetString();
+                        var valueArr = meta[1];
+                        if (key == "musicName" && valueArr.GetArrayLength() > 0)
+                            musicName = valueArr[0].GetString();
+                        if (key == "artists" && valueArr.GetArrayLength() > 0)
+                            artists = valueArr[0].GetString();
+                    }
+                    if (musicName == null || artists == null)
+                        continue;
+
+                    if (FileHelper.IsSwitchableNormalizedMatch($"{artists} - {musicName}", title, artist))
+                    {
+                        if (root.TryGetProperty("rawLyricFile", out var rawLyricFileProp))
+                        {
+                            rawLyricFile = rawLyricFileProp.GetString();
+                            break;
+                        }
+                    }
+                }
+                catch { }
+            }
+
+            if (string.IsNullOrWhiteSpace(rawLyricFile))
+                return null;
+
+            // 下载歌词内容
+            var url = $"https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/raw-lyrics/{rawLyricFile}";
+            try
+            {
+                var response = await _amllTtmlDbHttpClient.GetAsync(url);
+                if (!response.IsSuccessStatusCode)
+                    return null;
+                return await response.Content.ReadAsStringAsync();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private async Task<string?> SearchLrcLibAsync(string title, string artist, string album, int duration)
+        {
+            // Build API query URL
+            var url =
+                $"https://lrclib.net/api/search?" +
+                $"track_name={Uri.EscapeDataString(title)}&" +
+                $"artist_name={Uri.EscapeDataString(artist)}&" +
+                $"&album_name={Uri.EscapeDataString(album)}" +
+                $"&durationMs={Uri.EscapeDataString(duration.ToString())}";
+
+            var response = await _lrcLibHttpClient.GetAsync(url);
+            if (!response.IsSuccessStatusCode)
+                return null;
+
+            var json = await response.Content.ReadAsStringAsync();
+
+            var jArr = JsonSerializer.Deserialize(
+                json,
+                Serialization.SourceGenerationContext.Default.JsonElement
+            );
+            if (jArr.ValueKind == JsonValueKind.Array && jArr.GetArrayLength() > 0)
+            {
+                var first = jArr[0];
+                var syncedLyrics = first.GetProperty("syncedLyrics").GetString();
+                var result = string.IsNullOrWhiteSpace(syncedLyrics) ? null : syncedLyrics;
+                if (!string.IsNullOrWhiteSpace(result))
+                {
+                    return result;
+                }
+            }
+
+            return null;
+        }
+
+        private static async Task<string?> SearchQQNeteaseKugouAsync(string title, string artist, string album, int durationMs, Searchers searchers)
+        {
+            var result = await SearchersHelper.GetSearcher(searchers).SearchForResult(
+                new Lyricify.Lyrics.Models.TrackMultiArtistMetadata()
+                {
+                    DurationMs = durationMs,
+                    Album = album,
+                    Artists = [artist],
+                    Title = title,
+                }
+            );
+
+            if (result is QQMusicSearchResult qqResult)
+            {
+                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.QQMusicApi.GetLyricsAsync(qqResult.Id);
+                var original = response?.Lyrics;
+                var translated = response?.Trans;
+                if (!string.IsNullOrEmpty(translated))
+                {
+                    FileHelper.WriteLyricsCache(
+                        title,
+                        artist,
+                        translated,
+                        LyricsFormat.Lrc,
+                        PathHelper.QQTranslationCacheDirectory
+                    );
+                }
+                return original;
+            }
+            else if (result is NeteaseSearchResult neteaseResult)
+            {
+                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.NeteaseApi.GetLyric(neteaseResult.Id);
+                return response?.Lrc.Lyric;
+            }
+            else if (result is KugouSearchResult kugouResult)
+            {
+                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.KugouApi.GetSearchLyrics(hash: kugouResult.Hash);
+                if (response?.Candidates.FirstOrDefault() is SearchLyricsResponse.Candidate candidate)
+                {
+                    return Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyrics(
+                        candidate.Id,
+                        candidate.AccessKey
+                    );
+                }
+            }
+
+            return null;
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MusicSearchService.cs

@@ -1,517 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using ATL;
-using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using iTunesSearch.Library;
-using Lyricify.Lyrics.Providers.Web.Kugou;
-using Lyricify.Lyrics.Searchers;
-using Microsoft.Extensions.Logging;
-using System;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace BetterLyrics.WinUI3.Services
-{
-    public class MusicSearchService : IMusicSearchService
-    {
-        private readonly HttpClient _amllTtmlDbHttpClient;
-        private readonly HttpClient _lrcLibHttpClient;
-        private readonly HttpClient _iTunesHttpClinet;
-
-        private readonly ISettingsService _settingsService;
-        private readonly ILogger _logger;
-
-        public MusicSearchService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            _logger = Ioc.Default.GetRequiredService<ILogger<MusicSearchService>>();
-
-            _lrcLibHttpClient = new();
-            _lrcLibHttpClient.DefaultRequestHeaders.Add(
-                "User-Agent",
-                $"{AppInfo.AppName} {AppInfo.AppVersion} ({AppInfo.GithubUrl})"
-            );
-            _amllTtmlDbHttpClient = new();
-            _iTunesHttpClinet = new();
-        }
-
-        public async Task<bool> DownloadAmllTtmlDbIndexAsync()
-        {
-            const string url = "https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/metadata/raw-img-index.jsonl";
-            try
-            {
-                using var response = await _amllTtmlDbHttpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
-                if (!response.IsSuccessStatusCode) return false;
-
-                await using var stream = await response.Content.ReadAsStreamAsync();
-                await using var fs = new FileStream(
-                    AppInfo.AmllTtmlDbIndexPath,
-                    FileMode.Create,
-                    FileAccess.Write,
-                    FileShare.None
-                );
-                await stream.CopyToAsync(fs);
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static string GuessCountryCode(string album, string artist)
-        {
-            string s = album + artist;
-            if (s.Any(c => c >= 0x4e00 && c <= 0x9fff)) // 中文
-                return "cn";
-            if (s.Any(c => (c >= 0x3040 && c <= 0x30ff) || (c >= 0x31f0 && c <= 0x31ff))) // 日文
-                return "jp";
-            if (s.Any(c => c >= 0xac00 && c <= 0xd7af)) // 韩文
-                return "kr";
-            if (s.Any(c => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))) // 英文
-                return "us";
-            // 其他情况
-            return "us";
-        }
-
-        public async Task<byte[]?> SearchAlbumArtAsync(string title, string artist, string album)
-        {
-            foreach (var folder in _settingsService.LocalLyricsFolders)
-            {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
-                {
-                    foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
-                    {
-                        if (MusicMatch(Path.GetFileNameWithoutExtension(file), title, artist))
-                        {
-                            Track track = new(file);
-                            var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
-                            if (bytes != null)
-                            {
-                                return bytes;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return await SearchiTunesAlbumArtAsync(artist, album);
-        }
-
-        private async Task<byte[]?> SearchiTunesAlbumArtAsync(string artist, string album)
-        {
-            // Source: https://gist.github.com/mcworkaholic/82fbf203e3f1043bbe534b5b2974c0ce
-            try
-            {
-                string format = ".jpg";
-                var cachedAlbumArt = ReadAlbumArtCache(artist, album, format, AppInfo.iTunesAlbumArtCacheDirectory);
-
-                if (cachedAlbumArt != null)
-                {
-                    return cachedAlbumArt;
-                }
-
-                // Build the iTunes API URL
-                string url = $"https://itunes.apple.com/search?term=" + artist + "+" + album + "&country=" + GuessCountryCode(album, artist) + "&entity=album";
-                url.Replace(" ", "-");
-                // Make a request to the API
-
-                HttpResponseMessage response = await _iTunesHttpClinet.GetAsync(url);
-                response.EnsureSuccessStatusCode();
-                string responseBody = await response.Content.ReadAsStringAsync();
-
-                // Parse the JSON response
-                var data = JsonSerializer.Deserialize(responseBody, Serialization.SourceGenerationContext.Default.JsonElement);
-
-                if (data.TryGetProperty("results", out var results) && results.ValueKind == JsonValueKind.Array && results.GetArrayLength() > 0)
-                {
-                    // Get the first result
-                    var result = results[0];
-                    if (result.TryGetProperty("artworkUrl100", out var artworkUrlProp))
-                    {
-                        string artworkUrl = artworkUrlProp.GetString()?.Replace("100x100bb.jpg", "1200x1200bb.jpg") ?? string.Empty;
-                        var fetched = await _iTunesHttpClinet.GetByteArrayAsync(artworkUrl);
-
-                        if (fetched != null && fetched.Length > 0)
-                        {
-                            // Write to cache
-                            WriteAlbumArtCache(artist, album, fetched, format, AppInfo.iTunesAlbumArtCacheDirectory);
-                            return fetched;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error searching iTunes album art for {Artist} - {Album}", artist, album);
-            }
-            return null;
-        }
-
-        public async Task<string?> SearchLyricsAsync(string title, string artist, string album, double durationMs, CancellationToken token)
-        {
-            _logger.LogInformation("Searching img for: {Title} - {Artist} (Album: {Album}, Duration: {DurationMs}ms)", title, artist, album, durationMs);
-
-            foreach (var provider in _settingsService.LyricsSearchProvidersInfo)
-            {
-                if (!provider.IsEnabled)
-                {
-                    continue;
-                }
-
-                string? cachedLyrics;
-                LyricsFormat lyricsFormat = provider.Provider.GetLyricsFormat();
-
-                // Check cache first
-                if (provider.Provider.IsRemote())
-                {
-                    cachedLyrics = ReadLyricsCache(title, artist, lyricsFormat, provider.Provider.GetCacheDirectory());
-                    if (!string.IsNullOrWhiteSpace(cachedLyrics))
-                    {
-                        return cachedLyrics;
-                    }
-                }
-
-                string? searchedLyrics = null;
-
-                if (provider.Provider.IsLocal())
-                {
-                    if (provider.Provider == LyricsSearchProvider.LocalMusicFile)
-                    {
-                        searchedLyrics = LocalLyricsSearchInMusicFiles(title, artist);
-                    }
-                    else
-                    {
-                        searchedLyrics = await LocalLyricsSearchInLyricsFiles(title, artist, lyricsFormat);
-                    }
-                }
-                else
-                {
-                    switch (provider.Provider)
-                    {
-                        case LyricsSearchProvider.LrcLib:
-                            searchedLyrics = await SearchLrcLibAsync(title, artist, album, (int)(durationMs / 1000));
-                            break;
-                        case LyricsSearchProvider.QQ:
-                            searchedLyrics = await SearchUsingLyricifyAsync(title, artist, album, (int)durationMs, Searchers.QQMusic);
-                            break;
-                        case LyricsSearchProvider.Kugou:
-                            searchedLyrics = await SearchUsingLyricifyAsync(title, artist, album, (int)durationMs, Searchers.Kugou);
-                            break;
-                        case LyricsSearchProvider.Netease:
-                            searchedLyrics = await SearchUsingLyricifyAsync(title, artist, album, (int)durationMs, Searchers.Netease);
-                            break;
-                        case LyricsSearchProvider.AmllTtmlDb:
-                            searchedLyrics = await SearchAmllTtmlDbAsync(title, artist);
-                            break;
-                        default:
-                            break;
-                    }
-                }
-
-                token.ThrowIfCancellationRequested();
-
-                if (!string.IsNullOrWhiteSpace(searchedLyrics))
-                {
-                    if (provider.Provider.IsRemote())
-                    {
-                        WriteLyricsCache(title, artist, searchedLyrics, lyricsFormat, provider.Provider.GetCacheDirectory());
-                    }
-
-                    return searchedLyrics;
-                }
-            }
-
-            return null;
-        }
-
-        private static bool MusicMatch(string fileName, string title, string artist)
-        {
-            var normFileName = Normalize(fileName);
-            var normTitle = Normalize(title);
-            var normArtist = Normalize(artist);
-
-            // 常见两种顺序
-            return normFileName == normTitle + normArtist
-                || normFileName == normArtist + normTitle;
-        }
-
-        // 预处理：去除空格、括号、下划线、横杠、点、大小写等
-        static string Normalize(string s) =>
-            new string(s
-                .Where(c => char.IsLetterOrDigit(c))
-                .ToArray())
-                .ToLowerInvariant();
-
-        private static string SanitizeFileName(string fileName, char replacement = '_')
-        {
-            var invalidChars = Path.GetInvalidFileNameChars();
-            var sb = new StringBuilder(fileName.Length);
-            foreach (var c in fileName)
-            {
-                sb.Append(Array.IndexOf(invalidChars, c) >= 0 ? replacement : c);
-            }
-            return sb.ToString();
-        }
-
-        private async Task<string?> LocalLyricsSearchInLyricsFiles(string title, string artist, LyricsFormat format)
-        {
-            foreach (var folder in _settingsService.LocalLyricsFolders)
-            {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
-                {
-                    foreach (var file in Directory.GetFiles(folder.Path, $"*{format.ToFileExtension()}", SearchOption.AllDirectories))
-                    {
-                        if (MusicMatch(Path.GetFileNameWithoutExtension(file), title, artist))
-                        {
-                            string? raw = await File.ReadAllTextAsync(file, FileHelper.GetEncoding(file));
-                            if (raw != null)
-                            {
-                                return raw;
-                            }
-                        }
-                    }
-                }
-            }
-            return null;
-        }
-
-        private string? LocalLyricsSearchInMusicFiles(string title, string artist)
-        {
-            foreach (var folder in _settingsService.LocalLyricsFolders)
-            {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
-                {
-                    foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
-                    {
-                        if (MusicMatch(Path.GetFileNameWithoutExtension(file), title, artist))
-                        {
-                            try
-                            {
-                                var plain = TagLib.File.Create(file).Tag.Lyrics;
-                                if (plain != null && plain != string.Empty)
-                                {
-                                    return plain;
-                                }
-                            }
-                            catch (Exception) { }
-                        }
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private string? ReadLyricsCache(string title, string artist, LyricsFormat format, string cacheFolderPath)
-        {
-            var safeArtist = SanitizeFileName(artist);
-            var safeTitle = SanitizeFileName(title);
-            var cacheFilePath = Path.Combine(cacheFolderPath, $"{safeArtist} - {safeTitle}{format.ToFileExtension()}");
-            if (File.Exists(cacheFilePath))
-            {
-                return File.ReadAllText(cacheFilePath);
-            }
-            return null;
-        }
-
-        private byte[]? ReadAlbumArtCache(string album, string artist, string format, string cacheFolderPath)
-        {
-            var safeArtist = SanitizeFileName(artist);
-            var safeAlbum = SanitizeFileName(album);
-            var cacheFilePath = Path.Combine(cacheFolderPath, $"{safeArtist} - {safeAlbum}{format}");
-            if (File.Exists(cacheFilePath))
-            {
-                return File.ReadAllBytes(cacheFilePath);
-            }
-            return null;
-        }
-
-        private async Task<string?> SearchAmllTtmlDbAsync(string title, string artist)
-        {
-            // 检索本地 JSONL 索引文件，查找 rawLyricFile
-            if (!File.Exists(AppInfo.AmllTtmlDbIndexPath))
-            {
-                var downloadOk = await DownloadAmllTtmlDbIndexAsync();
-                if (!downloadOk || !File.Exists(AppInfo.AmllTtmlDbIndexPath))
-                    return null;
-            }
-
-            string? rawLyricFile = null;
-            await foreach (var line in File.ReadLinesAsync(AppInfo.AmllTtmlDbIndexPath))
-            {
-                if (string.IsNullOrWhiteSpace(line))
-                    continue;
-                try
-                {
-                    using var doc = JsonDocument.Parse(line);
-                    var root = doc.RootElement;
-                    if (!root.TryGetProperty("metadata", out var metadataArr))
-                        continue;
-                    string? musicName = null;
-                    string? artists = null;
-                    foreach (var meta in metadataArr.EnumerateArray())
-                    {
-                        if (meta.GetArrayLength() != 2)
-                            continue;
-                        var key = meta[0].GetString();
-                        var valueArr = meta[1];
-                        if (key == "musicName" && valueArr.GetArrayLength() > 0)
-                            musicName = valueArr[0].GetString();
-                        if (key == "artists" && valueArr.GetArrayLength() > 0)
-                            artists = valueArr[0].GetString();
-                    }
-                    if (musicName == null || artists == null)
-                        continue;
-
-                    if (MusicMatch($"{artists} - {musicName}", title, artist))
-                    {
-                        if (root.TryGetProperty("rawLyricFile", out var rawLyricFileProp))
-                        {
-                            rawLyricFile = rawLyricFileProp.GetString();
-                            break;
-                        }
-                    }
-                }
-                catch { }
-            }
-
-            if (string.IsNullOrWhiteSpace(rawLyricFile))
-                return null;
-
-            // 下载歌词内容
-            var url = $"https://raw.githubusercontent.com/Steve-xmh/amll-ttml-db/refs/heads/main/raw-img/{rawLyricFile}";
-            try
-            {
-                var response = await _amllTtmlDbHttpClient.GetAsync(url);
-                if (!response.IsSuccessStatusCode)
-                    return null;
-                return await response.Content.ReadAsStringAsync();
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        private async Task<string?> SearchLrcLibAsync(string title, string artist, string album, int duration)
-        {
-            // Build API query URL
-            var url =
-                $"https://lrclib.net/api/search?" +
-                $"track_name={Uri.EscapeDataString(title)}&" +
-                $"artist_name={Uri.EscapeDataString(artist)}&" +
-                $"&album_name={Uri.EscapeDataString(album)}" +
-                $"&durationMs={Uri.EscapeDataString(duration.ToString())}";
-
-            var response = await _lrcLibHttpClient.GetAsync(url);
-            if (!response.IsSuccessStatusCode)
-                return null;
-
-            var json = await response.Content.ReadAsStringAsync();
-
-            var jArr = JsonSerializer.Deserialize(
-                json,
-                Serialization.SourceGenerationContext.Default.JsonElement
-            );
-            if (jArr.ValueKind == JsonValueKind.Array && jArr.GetArrayLength() > 0)
-            {
-                var first = jArr[0];
-                var syncedLyrics = first.GetProperty("syncedLyrics").GetString();
-                var result = string.IsNullOrWhiteSpace(syncedLyrics) ? null : syncedLyrics;
-                if (!string.IsNullOrWhiteSpace(result))
-                {
-                    return result;
-                }
-            }
-
-            return null;
-        }
-
-        private async Task<string?> SearchUsingLyricifyAsync(
-            string title,
-            string artist,
-            string album,
-            int durationMs,
-            Searchers searchers
-        )
-        {
-            var result = await SearchersHelper.GetSearcher(searchers).SearchForResult(
-                new Lyricify.Lyrics.Models.TrackMultiArtistMetadata()
-                {
-                    DurationMs = durationMs,
-                    Album = album,
-                    Artists = [artist],
-                    Title = title,
-                }
-            );
-
-            if (result is QQMusicSearchResult qqResult)
-            {
-                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.QQMusicApi.GetLyricsAsync(qqResult.Id);
-                var original = response?.Lyrics;
-                return original;
-            }
-            else if (result is NeteaseSearchResult neteaseResult)
-            {
-                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.NeteaseApi.GetLyric(neteaseResult.Id);
-                return response?.Lrc.Lyric;
-            }
-            else if (result is KugouSearchResult kugouResult)
-            {
-                var response = await Lyricify.Lyrics.Helpers.ProviderHelper.KugouApi.GetSearchLyrics(hash: kugouResult.Hash);
-                if (response?.Candidates.FirstOrDefault() is SearchLyricsResponse.Candidate candidate)
-                {
-                    return Lyricify.Lyrics.Decrypter.Krc.Helper.GetLyrics(
-                        candidate.Id,
-                        candidate.AccessKey
-                    );
-                }
-            }
-
-            return null;
-        }
-
-        private void WriteLyricsCache(
-            string title,
-            string artist,
-            string lyrics,
-            LyricsFormat format,
-            string cacheFolderPath
-        )
-        {
-            var safeArtist = SanitizeFileName(artist);
-            var safeTitle = SanitizeFileName(title);
-            var cacheFilePath = Path.Combine(
-                cacheFolderPath,
-                $"{safeArtist} - {safeTitle}{format.ToFileExtension()}"
-            );
-            File.WriteAllText(cacheFilePath, lyrics);
-        }
-
-        private void WriteAlbumArtCache(
-            string album,
-            string artist,
-            byte[] img,
-            string format,
-            string cacheFolderPath
-        )
-        {
-            var safeArtist = SanitizeFileName(artist);
-            var safeAlbum = SanitizeFileName(album);
-            var cacheFilePath = Path.Combine(
-                cacheFolderPath,
-                $"{safeArtist} - {safeAlbum}{format}"
-            );
-            File.WriteAllBytes(cacheFilePath, img);
-        }
-    }
-}

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

@@ -7,46 +7,69 @@ using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using EvtSource;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Text.Json;
 using System.Threading;
+using System.Threading.Tasks;
 using Windows.Graphics.Imaging;
 using Windows.Media.Control;
 using Windows.Storage.Streams;
+using Windows.UI.Shell;
 using WindowsMediaController;
+using static WindowsMediaController.MediaManager;
 
 namespace BetterLyrics.WinUI3.Services
 {
-    public partial class PlaybackService : BaseViewModel, IPlaybackService, IRecipient<PropertyChangedMessage<ObservableCollection<MediaSourceProviderInfo>>>
+    public partial class PlaybackService : BaseViewModel, IPlaybackService,
+        IRecipient<PropertyChangedMessage<ObservableCollection<MediaSourceProviderInfo>>>,
+        IRecipient<PropertyChangedMessage<ObservableCollection<AlbumArtSearchProviderInfo>>>
     {
-        private readonly IMusicSearchService _musicSearchService;
+        private readonly IAlbumArtSearchService _albumArtSearchService;
         private readonly ILogger<PlaybackService> _logger;
 
+        private readonly string _lxMusicId = "cn.toside.music.desktop";
+
+        private bool _cachedIsPlaying = false;
+
+        private EventSourceReader? _sse = null;
+
         private readonly MediaManager _mediaManager = new();
+        private MediaManager.MediaSession? _focusedSession = null;
 
-        private CancellationTokenSource? _mediaPropsCts;
+        private readonly LatestOnlyTaskRunner _albumArtRefreshRunner = new();
+        private readonly LatestOnlyTaskRunner _onAnyMediaPropertyChangedRunner = new();
 
+        private SongInfo? _cachedSongInfo;
         private List<MediaSourceProviderInfo> _mediaSourceProvidersInfo;
+        private byte[]? _SMTCAlbumArtBytes = null;
 
         public event EventHandler<IsPlayingChangedEventArgs>? IsPlayingChanged;
         public event EventHandler<PositionChangedEventArgs>? PositionChanged;
         public event EventHandler<SongInfoChangedEventArgs>? SongInfoChanged;
+        public event EventHandler<AlbumArtChangedEventArgs>? AlbumArtChangedChanged;
         public event EventHandler<MediaSourceProvidersInfoEventArgs>? MediaSourceProvidersInfoChanged;
 
-        public PlaybackService(ISettingsService settingsService, IMusicSearchService musicSearchService) : base(settingsService)
+        public PlaybackService(ISettingsService settingsService, IAlbumArtSearchService albumArtSearchService) : base(settingsService)
         {
-            _musicSearchService = musicSearchService;
+            _albumArtSearchService = albumArtSearchService;
             _logger = Ioc.Default.GetRequiredService<ILogger<PlaybackService>>();
 
             _mediaSourceProvidersInfo = _settingsService.MediaSourceProvidersInfo;
             InitMediaManager();
         }
 
+        public bool IsPlaying => _cachedIsPlaying;
+        public SongInfo? SongInfo => _cachedSongInfo;
+
         private bool IsMediaSourceEnabled(string id)
         {
             return _mediaSourceProvidersInfo.FirstOrDefault(s => s.Provider == id)?.IsEnabled ?? true;
@@ -54,8 +77,6 @@ namespace BetterLyrics.WinUI3.Services
 
         private void InitMediaManager()
         {
-            _mediaManager.Start();
-
             _mediaManager.OnAnySessionOpened += MediaManager_OnAnySessionOpened;
             _mediaManager.OnAnySessionClosed += MediaManager_OnAnySessionClosed;
             _mediaManager.OnFocusedSessionChanged += MediaManager_OnFocusedSessionChanged;
@@ -63,144 +84,118 @@ namespace BetterLyrics.WinUI3.Services
             _mediaManager.OnAnyPlaybackStateChanged += MediaManager_OnAnyPlaybackStateChanged;
             _mediaManager.OnAnyTimelinePropertyChanged += MediaManager_OnAnyTimelinePropertyChanged;
 
-            MediaManager_OnFocusedSessionChanged(_mediaManager.GetFocusedSession());
+            _mediaManager.Start();
+            Task.Run(() =>
+            {
+                MediaManager_OnFocusedSessionChanged(null);
+            });
         }
 
-        private void MediaManager_OnFocusedSessionChanged(MediaManager.MediaSession mediaSession)
+        private void MediaManager_OnFocusedSessionChanged(MediaManager.MediaSession? mediaSession)
         {
-            if (mediaSession == null || !IsMediaSourceEnabled(mediaSession.ControlSession.SourceAppUserModelId))
+            if (!_mediaManager.IsStarted) return;
+
+            _focusedSession = mediaSession ?? _mediaManager.GetFocusedSession();
+
+            if (_focusedSession == null || !IsMediaSourceEnabled(_focusedSession.Id))
             {
                 SendNullMessages();
             }
             else
             {
-                _dispatcherQueue.TryEnqueue(async () =>
-                {
-                    try
-                    {
-                        var props = await mediaSession.ControlSession.TryGetMediaPropertiesAsync();
-                        MediaManager_OnAnyMediaPropertyChanged(mediaSession, props);
-                        MediaManager_OnAnyPlaybackStateChanged(mediaSession, mediaSession.ControlSession.GetPlaybackInfo());
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex, "TryGetMediaPropertiesAsync failed");
-                        SendNullMessages();
-                    }
-                });
+                SendFocusedMessagesAsync().ConfigureAwait(false);
             }
         }
 
         private void MediaManager_OnAnyTimelinePropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionTimelineProperties timelineProperties)
         {
-            if (!IsMediaSourceEnabled(mediaSession.ControlSession.SourceAppUserModelId) || mediaSession != _mediaManager.GetFocusedSession()) return;
+            if (!_mediaManager.IsStarted) return;
+            if (!IsMediaSourceEnabled(mediaSession.Id) || mediaSession != _focusedSession) return;
 
-            _dispatcherQueue.TryEnqueue(
-                DispatcherQueuePriority.High,
-                () =>
-                {
-                    PositionChanged?.Invoke(this, new PositionChangedEventArgs(timelineProperties.Position));
-                }
-            );
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                PositionChanged?.Invoke(this, new PositionChangedEventArgs(timelineProperties.Position));
+            });
         }
 
         private void MediaManager_OnAnyPlaybackStateChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionPlaybackInfo playbackInfo)
         {
+            if (!_mediaManager.IsStarted) return;
             RecordMediaSourceProviderInfo(mediaSession);
-            if (!IsMediaSourceEnabled(mediaSession.ControlSession.SourceAppUserModelId) || mediaSession != _mediaManager.GetFocusedSession()) return;
+            if (!IsMediaSourceEnabled(mediaSession.Id) || mediaSession != _focusedSession) return;
 
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-                () =>
-                {
-                    IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(playbackInfo.PlaybackStatus switch
-                    {
-                        GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing => true,
-                        _ => false,
-                    }));
-                }
-            );
+            _cachedIsPlaying = playbackInfo.PlaybackStatus switch
+            {
+                GlobalSystemMediaTransportControlsSessionPlaybackStatus.Playing => true,
+                _ => false,
+            };
+
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(_cachedIsPlaying));
+            });
         }
 
-        private async void MediaManager_OnAnyMediaPropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionMediaProperties mediaProperties)
+        private void MediaManager_OnAnyMediaPropertyChanged(MediaManager.MediaSession mediaSession, GlobalSystemMediaTransportControlsSessionMediaProperties mediaProperties)
         {
-            _logger.LogInformation("Media properties changed: Title: {Title}, Artist: {Artist}, Album: {Album}",
-                mediaProperties.Title, mediaProperties.Artist, mediaProperties.AlbumTitle);
+            if (!_mediaManager.IsStarted) return;
+            string id = mediaSession.Id;
 
             RecordMediaSourceProviderInfo(mediaSession);
-            string id = mediaSession.ControlSession.SourceAppUserModelId;
-            if (!IsMediaSourceEnabled(id) || mediaSession != _mediaManager.GetFocusedSession()) return;
+            if (!IsMediaSourceEnabled(id) || mediaSession != _focusedSession) return;
 
-            _mediaPropsCts?.Cancel();
-            var cts = new CancellationTokenSource();
-            _mediaPropsCts = cts;
-            var token = cts.Token;
-
-            try
+            _cachedSongInfo = new SongInfo
             {
-                SongInfo? songInfo;
+                Title = mediaProperties.Title,
+                Artist = mediaProperties.Artist,
+                Album = mediaProperties.AlbumTitle,
+                DurationMs = mediaSession.ControlSession.GetTimelineProperties().EndTime.TotalMilliseconds,
+                SourceAppUserModelId = id,
+            };
 
-                token.ThrowIfCancellationRequested();
+            _cachedSongInfo.Duration = (int)(_cachedSongInfo.DurationMs / 1000f);
 
-                songInfo = new SongInfo
+            _onAnyMediaPropertyChangedRunner.RunAsync(async token =>
+            {
+                _logger.LogInformation("Media properties changed: Title: {Title}, Artist: {Artist}, Album: {Album}",
+                    mediaProperties.Title, mediaProperties.Artist, mediaProperties.AlbumTitle);
+
+                if (id == _lxMusicId)
                 {
-                    Title = mediaProperties.Title,
-                    Artist = mediaProperties.Artist,
-                    Album = mediaProperties.AlbumTitle,
-                    DurationMs = mediaSession.ControlSession.GetTimelineProperties().EndTime.TotalMilliseconds,
-                    SourceAppUserModelId = id,
-                };
-
-                byte[]? bytes;
-
-                bytes = await _musicSearchService.SearchAlbumArtAsync(
-                    songInfo.Title,
-                    songInfo.Artist,
-                    songInfo.Album
-                );
-                token.ThrowIfCancellationRequested();
-
-                if (bytes == null)
+                    StartSSE();
+                }
+                else
                 {
-                    if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
-                    {
-                        bytes = await ImageHelper.ToByteArrayAsync(streamReference);
-                        token.ThrowIfCancellationRequested();
-                    }
-                    else
-                    {
-                        bytes = await ImageHelper.CreateTextPlaceholderBytesAsync($"{songInfo.Artist} - {songInfo.Title}", 400, 400);
-                        token.ThrowIfCancellationRequested();
-                    }
+                    StopSSE();
                 }
 
-                using var stream = new InMemoryRandomAccessStream();
-                await stream.WriteAsync(bytes.AsBuffer());
-                token.ThrowIfCancellationRequested();
+                if (mediaProperties.Thumbnail is IRandomAccessStreamReference streamReference)
+                {
+                    _SMTCAlbumArtBytes = await ImageHelper.ToByteArrayAsync(streamReference);
+                }
+                else
+                {
+                    _SMTCAlbumArtBytes = null;
+                }
 
-                var decoder = await BitmapDecoder.CreateAsync(stream);
-                token.ThrowIfCancellationRequested();
-
-                songInfo.AlbumArtSwBitmap?.Dispose();
-                songInfo.AlbumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba8, BitmapAlphaMode.Premultiplied);
-                token.ThrowIfCancellationRequested();
-
-                songInfo.AlbumArtAccentColor = ImageHelper.GetAccentColorsFromByte(bytes).FirstOrDefault();
+                await _albumArtRefreshRunner.RunAsync(async tokne =>
+                {
+                    await UpdateAlbumArtRelated(tokne);
+                });
 
                 if (!token.IsCancellationRequested)
                 {
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-                    () =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
-                        SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(songInfo));
+                        SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(_cachedSongInfo));
                     });
                 }
-            }
-            catch (OperationCanceledException) { }
-            catch (Exception) { }
+            }).ConfigureAwait(false);
         }
 
         private void MediaManager_OnAnySessionClosed(MediaManager.MediaSession mediaSession)
         {
+            if (!_mediaManager.IsStarted) return;
             if (_mediaManager.CurrentMediaSessions.Count == 0)
             {
                 SendNullMessages();
@@ -209,12 +204,16 @@ namespace BetterLyrics.WinUI3.Services
 
         private void MediaManager_OnAnySessionOpened(MediaManager.MediaSession mediaSession)
         {
+            if (!_mediaManager.IsStarted) return;
             RecordMediaSourceProviderInfo(mediaSession);
+            _focusedSession = _mediaManager.GetFocusedSession();
+            SendFocusedMessagesAsync().ConfigureAwait(false);
         }
 
         private void RecordMediaSourceProviderInfo(MediaManager.MediaSession mediaSession)
         {
-            var id = mediaSession?.ControlSession?.SourceAppUserModelId;
+            if (!_mediaManager.IsStarted) return;
+            var id = mediaSession?.Id;
             if (string.IsNullOrEmpty(id)) return;
 
             var found = _mediaSourceProvidersInfo.FirstOrDefault(x => x.Provider == id);
@@ -222,8 +221,7 @@ namespace BetterLyrics.WinUI3.Services
             {
                 _mediaSourceProvidersInfo.Add(new MediaSourceProviderInfo(id, true));
                 _settingsService.MediaSourceProvidersInfo = _mediaSourceProvidersInfo;
-                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-                () =>
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                 {
                     MediaSourceProvidersInfoChanged?.Invoke(this, new MediaSourceProvidersInfoEventArgs(_mediaSourceProvidersInfo));
                 });
@@ -232,15 +230,145 @@ namespace BetterLyrics.WinUI3.Services
 
         private void SendNullMessages()
         {
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.High,
-            () =>
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
             {
-                SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(null));
-                IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(false));
+                _cachedSongInfo = null;
+                _cachedIsPlaying = false;
+                SongInfoChanged?.Invoke(this, new SongInfoChangedEventArgs(_cachedSongInfo));
+                IsPlayingChanged?.Invoke(this, new IsPlayingChangedEventArgs(_cachedIsPlaying));
                 PositionChanged?.Invoke(this, new PositionChangedEventArgs(TimeSpan.Zero));
             });
         }
 
+        private async Task SendFocusedMessagesAsync()
+        {
+            if (_focusedSession == null) return;
+
+            var mediaProps = await _focusedSession.ControlSession.TryGetMediaPropertiesAsync();
+            MediaManager_OnAnyMediaPropertyChanged(_focusedSession, mediaProps);
+            MediaManager_OnAnyPlaybackStateChanged(_focusedSession, _focusedSession.ControlSession.GetPlaybackInfo());
+            MediaManager_OnAnyTimelinePropertyChanged(_focusedSession, _focusedSession.ControlSession.GetTimelineProperties());
+        }
+
+        private async Task UpdateAlbumArtRelated(CancellationToken token)
+        {
+            if (_cachedSongInfo == null)
+            {
+                _logger.LogWarning("Cached song info is null, cannot update album art.");
+                return;
+            }
+
+            byte[]? bytes = await _albumArtSearchService.SearchAsync(
+                _cachedSongInfo.Title,
+                _cachedSongInfo.Artist,
+                _cachedSongInfo?.Album ?? string.Empty,
+                _SMTCAlbumArtBytes
+            );
+            token.ThrowIfCancellationRequested();
+
+            if (bytes == null)
+            {
+                bytes = await ImageHelper.CreateTextPlaceholderBytesAsync(400, 400);
+                token.ThrowIfCancellationRequested();
+            }
+
+            bytes = ImageHelper.MakeSquareWithThemeColor(bytes);
+
+            using var stream = new InMemoryRandomAccessStream();
+            await stream.WriteAsync(bytes.AsBuffer());
+            token.ThrowIfCancellationRequested();
+
+            var decoder = await BitmapDecoder.CreateAsync(stream);
+            token.ThrowIfCancellationRequested();
+
+            var _albumArtSwBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Rgba8, BitmapAlphaMode.Premultiplied);
+            token.ThrowIfCancellationRequested();
+
+            var _albumArtAccentColor = ImageHelper.GetAccentColorsFromByte(bytes).FirstOrDefault();
+
+            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+            {
+                AlbumArtChangedChanged?.Invoke(this, new AlbumArtChangedEventArgs(_albumArtSwBitmap, _albumArtAccentColor));
+            });
+        }
+
+        private void StartSSE()
+        {
+            try
+            {
+                _sse = new EventSourceReader(new Uri($"{_settingsService.LXMusicServer}/subscribe-player-status?filter=progress")).Start();
+                _sse.MessageReceived += Sse_MessageReceived;
+                _sse.Disconnected += Sse_Disconnected;
+            }
+            catch (Exception)
+            {
+                _logger.LogError("Failed to start SSE connection for LX Music.");
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    App.Current.LyricsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("FailToStartLXMusicServer"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
+                });
+                StopSSE();
+            }
+        }
+
+        private void StopSSE()
+        {
+            if (_sse != null)
+            {
+                _sse.MessageReceived -= Sse_MessageReceived;
+                _sse.Disconnected -= Sse_Disconnected;
+                _sse.Dispose();
+                _sse = null;
+            }
+        }
+
+        private void Sse_Disconnected(object sender, DisconnectEventArgs e)
+        {
+            Task.Run(async () =>
+            {
+                await Task.Delay(e.ReconnectDelay);
+                if (_sse != null && !_sse.IsDisposed) _sse.Start();
+            });
+        }
+
+        private void Sse_MessageReceived(object sender, EventSourceMessageEventArgs e)
+        {
+            var data = JsonSerializer.Deserialize(e.Message, Serialization.SourceGenerationContext.Default.JsonElement);
+
+            if (data.TryGetDouble(out double positionSeconds))
+            {
+                if (_cachedSongInfo?.SourceAppUserModelId == _lxMusicId)
+                {
+                    PositionChanged?.Invoke(this, new PositionChangedEventArgs(TimeSpan.FromSeconds(positionSeconds)));
+                }
+            }
+        }
+
+        public async Task PlayAsync()
+        {
+            await _focusedSession?.ControlSession.TryPlayAsync();
+        }
+
+        public async Task PauseAsync()
+        {
+            await _focusedSession?.ControlSession.TryPauseAsync();
+        }
+
+        public async Task PreviousAsync()
+        {
+            await _focusedSession?.ControlSession.TrySkipPreviousAsync();
+        }
+
+        public async Task NextAsync()
+        {
+            await _focusedSession?.ControlSession.TrySkipNextAsync();
+        }
+
+        public async Task ChangePosition(double seconds)
+        {
+            await _focusedSession?.ControlSession.TryChangePlaybackPositionAsync(TimeSpan.FromSeconds(seconds).Ticks);
+        }
+
         public void Receive(PropertyChangedMessage<ObservableCollection<MediaSourceProviderInfo>> message)
         {
             if (message.Sender is SettingsPageViewModel)
@@ -253,5 +381,21 @@ namespace BetterLyrics.WinUI3.Services
                 }
             }
         }
+
+        public async void Receive(PropertyChangedMessage<ObservableCollection<AlbumArtSearchProviderInfo>> message)
+        {
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.AlbumArtSearchProvidersInfo))
+                {
+                    // Album art search providers info changed, re-fetch album art
+                    _logger.LogInformation("Album art search providers info changed, refreshing album art.");
+                    await _albumArtRefreshRunner.RunAsync(async tokne =>
+                    {
+                        await UpdateAlbumArtRelated(tokne);
+                    });
+                }
+            }
+        }
     }
 }

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

@@ -41,6 +41,7 @@ namespace BetterLyrics.WinUI3.Services
         private const string StandardWindowHeightKey = "StandardWindowHeight";
 
         private const string AutoLockOnDesktopModeKey = "AutoLockOnDesktopMode";
+        private const string IsImmersiveModeKey = "IsImmersiveMode";
 
         private const string IsDynamicCoverOverlayEnabledKey = "IsDynamicCoverOverlayEnabled";
         private const string IsFanLyricsEnabledKey = "IsFanLyricsEnabled";
@@ -62,22 +63,46 @@ namespace BetterLyrics.WinUI3.Services
         private const string LyricsFontSizeKey = "LyricsFontSize";
         private const string LyricsFontWeightKey = "LyricsFontWeightKey";
         private const string LyricsGlowEffectScopeKey = "LyricsGlowEffectScope";
+        private const string LyricsHighlightSopeKey = "LyricsHighlightSope";
         private const string LyricsLineSpacingFactorKey = "LyricsLineSpacingFactor";
         private const string LyricsSearchProvidersInfoKey = "LyricsSearchProvidersInfo";
+        private const string AlbumArtSearchProvidersInfoKey = "AlbumArtSearchProvidersInfo";
         private const string LyricsVerticalEdgeOpacityKey = "LyricsVerticalEdgeOpacity";
 
         private const string MediaSourceProvidersInfoKey = "MediaSourceProvidersInfo";
 
         private const string IsTranslationEnabledKey = "IsTranslationEnabled";
+        private const string ShowTranslationOnlyKey = "ShowTranslationOnly";
         private const string LibreTranslateServerKey = "LibreTranslateServer";
         private const string SelectedTargetLanguageIndexKey = "SelectedTargetLanguageIndex";
 
+        private const string LXMusicServerKey = "LXMusicServer";
+
         private const string LyricsBackgroundThemeKey = "LyricsBackgroundTheme";
-
         private const string IgnoreFullscreenWindowKey = "IgnoreFullscreenWindow";
-
         private const string PreferredDisplayTypeKey = "PreferredDisplayTypeKey";
 
+        private const string LyricsScrollEasingTypeKey = "LyricsScrollEasingType";
+        private const string LyricsScrollDurationKey = "LyricsScrollDuration";
+
+        public const string TimelineSyncThresholdKey = "TimelineSyncThreshold";
+
+        private const string IsLyricsFloatAnimationEnabledKey = "IsLyricsFloatAnimationEnabled";
+
+        private const string ResetPositionOffsetOnSongChangedKey = "ResetPositionOffsetOnSongChanged";
+
+        private const string PositionOffsetKey = "PositionOffset";
+
+        private const string LockHotKeyIndexKey = "LockHotKeyIndex";
+        private const string DockPlacementKey = "DockPlacement";
+        private const string LyricsBgFontOpacityKey = "LyricsBgFontOpacity";
+        private const string HideWindowWhenNotPlayingKey = "HideWindowWhenNotPlaying";
+        private const string DockWindowHeightKey = "DockWindowHeight";
+
+        private const string SelectedFontFamilyIndexKey = "SelectedFontFamilyIndex";
+        private const string LyricsFontFamilyKey = "LyricsFontFamily";
+        private const string IsDragEverywhereEnabledKey = "IsDragEverywhereEnabled";
+
         private readonly ApplicationDataContainer _localSettings;
 
         public SettingsService()
@@ -96,7 +121,6 @@ namespace BetterLyrics.WinUI3.Services
                     SourceGenerationContext.Default.ListLyricsSearchProviderInfo
                 )
             );
-            SetDefault(MediaSourceProvidersInfoKey, "[]");
             if (LyricsSearchProvidersInfo.Count != Enum.GetValues<LyricsSearchProvider>().Length)
             {
                 LyricsSearchProvidersInfo = Enum.GetValues<LyricsSearchProvider>()
@@ -109,6 +133,31 @@ namespace BetterLyrics.WinUI3.Services
                     ))
                     .ToList();
             }
+
+            SetDefault(
+                AlbumArtSearchProvidersInfoKey,
+                System.Text.Json.JsonSerializer.Serialize(
+                    Enum.GetValues<AlbumArtSearchProvider>()
+                        .Select(p => new AlbumArtSearchProviderInfo(p, true))
+                        .ToList(),
+                    SourceGenerationContext.Default.ListAlbumArtSearchProviderInfo
+                )
+            );
+            if (AlbumArtSearchProvidersInfo.Count != Enum.GetValues<AlbumArtSearchProvider>().Length)
+            {
+                AlbumArtSearchProvidersInfo = Enum.GetValues<AlbumArtSearchProvider>()
+                    .Select(p => new AlbumArtSearchProviderInfo(
+                        p,
+                        AlbumArtSearchProvidersInfo
+                            .Where(x => x.Provider == p)
+                            .FirstOrDefault()
+                            ?.IsEnabled ?? true
+                    ))
+                    .ToList();
+            }
+
+            SetDefault(MediaSourceProvidersInfoKey, "[]");
+
             // App appearance
             SetDefault(LanguageKey, (int)Language.FollowSystem);
 
@@ -123,13 +172,14 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(StandardWindowWidthKey, 1600);
 
             SetDefault(AutoLockOnDesktopModeKey, false);
+            SetDefault(IsImmersiveModeKey, false);
             // App behavior
             SetDefault(AutoStartWindowTypeKey, (int)AutoStartWindowType.StandardMode);
             // Album art
             SetDefault(IsCoverOverlayEnabledKey, true);
             SetDefault(IsDynamicCoverOverlayEnabledKey, true);
             SetDefault(CoverOverlayOpacityKey, 100); // 100 % = 1.0
-            SetDefault(CoverOverlayBlurAmountKey, 200);
+            SetDefault(CoverOverlayBlurAmountKey, 100);
             SetDefault(CoverImageRadiusKey, 12); // 12 %
             // Lyrics
             SetDefault(LyricsAlignmentTypeKey, (int)TextAlignmentType.Center);
@@ -142,7 +192,7 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(LyricsBgFontColorTypeKey, (int)LyricsFontColorType.AdaptiveGrayed);
             SetDefault(LyricsFgFontColorTypeKey, (int)LyricsFontColorType.AdaptiveGrayed);
             SetDefault(LyricsStrokeFontColorTypeKey, (int)LyricsFontColorType.AdaptiveGrayed);
-            
+
             SetDefault(LyricsCustomBgFontColorKey, Colors.White.ToInt());
             SetDefault(LyricsCustomFgFontColorKey, Colors.White.ToInt());
             SetDefault(LyricsCustomStrokeFontColorKey, Colors.White.ToInt());
@@ -151,21 +201,106 @@ namespace BetterLyrics.WinUI3.Services
             SetDefault(LyricsLineSpacingFactorKey, 0.5f);
             SetDefault(LyricsVerticalEdgeOpacityKey, 0);
             SetDefault(IsLyricsGlowEffectEnabledKey, true);
-            SetDefault(LyricsGlowEffectScopeKey, (int)LineRenderingType.CurrentCharOnly);
+            SetDefault(LyricsGlowEffectScopeKey, (int)LineRenderingType.CurrentChar);
+            SetDefault(LyricsHighlightSopeKey, (int)LineRenderingType.LineStartToCurrentChar);
             SetDefault(IsFanLyricsEnabledKey, false);
 
             SetDefault(LibreTranslateServerKey, "");
-            SetDefault(IsTranslationEnabledKey, false);
-            SetDefault(SelectedTargetLanguageIndexKey, 6);
+            SetDefault(IsTranslationEnabledKey, true);
+            SetDefault(ShowTranslationOnlyKey, false);
+            SetDefault(SelectedTargetLanguageIndexKey, LanguageHelper.GetDefaultTargetLanguageIndex());
+
+            SetDefault(LXMusicServerKey, "");
 
             SetDefault(LyricsFontStrokeWidthKey, 3);
-
             SetDefault(IgnoreFullscreenWindowKey, false);
-
             SetDefault(PreferredDisplayTypeKey, (int)LyricsDisplayType.SplitView);
+
+            SetDefault(LyricsScrollEasingTypeKey, (int)EasingType.EaseInOutQuad);
+            SetDefault(LyricsScrollDurationKey, 500); // 500ms
+            SetDefault(TimelineSyncThresholdKey, 0); // 0ms
+
+            SetDefault(IsLyricsFloatAnimationEnabledKey, true);
+
+            SetDefault(ResetPositionOffsetOnSongChangedKey, false);
+            SetDefault(PositionOffsetKey, 0);
+            SetDefault(LockHotKeyIndexKey, 'U' - 'A');
+            SetDefault(DockPlacementKey, (int)DockPlacement.Top);
+            SetDefault(LyricsBgFontOpacityKey, 30); // 30%
+            SetDefault(HideWindowWhenNotPlayingKey, false);
+            SetDefault(DockWindowHeightKey, 64); // 64px
+            SetDefault(SelectedFontFamilyIndexKey, 0);
+            SetDefault(LyricsFontFamilyKey, FontHelper.SystemFontFamilies.ElementAtOrDefault(0));
+            SetDefault(IsDragEverywhereEnabledKey, false);
         }
 
-        public LyricsDisplayType PreferredDisplayType
+        public bool IsDragEverywhereEnabled
+        {
+            get => GetValue<bool>(IsDragEverywhereEnabledKey);
+            set => SetValue(IsDragEverywhereEnabledKey, value);
+        }
+
+        public string LyricsFontFamily
+        {
+            get => GetValue<string>(LyricsFontFamilyKey)!;
+            set => SetValue(LyricsFontFamilyKey, value);
+        }
+
+        public int SelectedFontFamilyIndex
+        {
+            get => GetValue<int>(SelectedFontFamilyIndexKey);
+            set => SetValue(SelectedFontFamilyIndexKey, value);
+        }
+
+        public bool HideWindowWhenNotPlaying
+        {
+            get => GetValue<bool>(HideWindowWhenNotPlayingKey);
+            set => SetValue(HideWindowWhenNotPlayingKey, value);
+        }
+
+        public int DockWindowHeight
+        {
+            get => GetValue<int>(DockWindowHeightKey);
+            set => SetValue(DockWindowHeightKey, value);
+        }
+
+        public int LyricsBgFontOpacity
+        {
+            get => GetValue<int>(LyricsBgFontOpacityKey);
+            set => SetValue(LyricsBgFontOpacityKey, value);
+        }
+
+        public bool ShowTranslationOnly
+        {
+            get => GetValue<bool>(ShowTranslationOnlyKey);
+            set => SetValue(ShowTranslationOnlyKey, value);
+        }
+
+        public DockPlacement DockPlacement
+        {
+            get => (DockPlacement)GetValue<int>(DockPlacementKey);
+            set => SetValue(DockPlacementKey, (int)value);
+        }
+
+        public int LockHotKeyIndex
+        {
+            get => GetValue<int>(LockHotKeyIndexKey);
+            set => SetValue(LockHotKeyIndexKey, value);
+        }
+
+        public EasingType LyricsScrollEasingType
+        {
+            get => (EasingType)GetValue<int>(LyricsScrollEasingTypeKey);
+            set => SetValue(LyricsScrollEasingTypeKey, (int)value);
+        }
+
+        public int LyricsScrollDuration
+        {
+            get => GetValue<int>(LyricsScrollDurationKey);
+            set => SetValue(LyricsScrollDurationKey, value);
+        }
+
+        public LyricsDisplayType DisplayType
         {
             get => (LyricsDisplayType)GetValue<int>(PreferredDisplayTypeKey);
             set => SetValue(PreferredDisplayTypeKey, (int)value);
@@ -285,19 +420,19 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(LanguageKey, (int)value);
         }
 
-        public List<LocalLyricsFolder> LocalLyricsFolders
+        public List<LocalMediaFolder> LocalMediaFolders
         {
             get =>
                 System.Text.Json.JsonSerializer.Deserialize(
                     GetValue<string>(LocalLyricsFoldersKey) ?? "[]",
-                    SourceGenerationContext.Default.ListLocalLyricsFolder
+                    SourceGenerationContext.Default.ListLocalMediaFolder
                 )!;
             set =>
                 SetValue(
                     LocalLyricsFoldersKey,
                     System.Text.Json.JsonSerializer.Serialize(
                         value,
-                        SourceGenerationContext.Default.ListLocalLyricsFolder
+                        SourceGenerationContext.Default.ListLocalMediaFolder
                     )
                 );
         }
@@ -380,6 +515,12 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(LyricsGlowEffectScopeKey, (int)value);
         }
 
+        public LineRenderingType LyricsHighlightScope
+        {
+            get => (LineRenderingType)GetValue<int>(LyricsHighlightSopeKey);
+            set => SetValue(LyricsHighlightSopeKey, (int)value);
+        }
+
         public float LyricsLineSpacingFactor
         {
             get => GetValue<float>(LyricsLineSpacingFactorKey);
@@ -403,6 +544,23 @@ namespace BetterLyrics.WinUI3.Services
                 );
         }
 
+        public List<AlbumArtSearchProviderInfo> AlbumArtSearchProvidersInfo
+        {
+            get =>
+                System.Text.Json.JsonSerializer.Deserialize(
+                    GetValue<string>(AlbumArtSearchProvidersInfoKey) ?? "[]",
+                    SourceGenerationContext.Default.ListAlbumArtSearchProviderInfo
+                )!;
+            set =>
+                SetValue(
+                    AlbumArtSearchProvidersInfoKey,
+                    System.Text.Json.JsonSerializer.Serialize(
+                        value,
+                        SourceGenerationContext.Default.ListAlbumArtSearchProviderInfo
+                    )
+                );
+        }
+
         public List<MediaSourceProviderInfo> MediaSourceProvidersInfo
         {
             get =>
@@ -444,12 +602,48 @@ namespace BetterLyrics.WinUI3.Services
             set => SetValue(SelectedTargetLanguageIndexKey, value);
         }
 
+        public string LXMusicServer
+        {
+            get => GetValue<string>(LXMusicServerKey)!;
+            set => SetValue(LXMusicServerKey, value);
+        }
+
         public bool IgnoreFullscreenWindow
         {
             get => GetValue<bool>(IgnoreFullscreenWindowKey);
             set => SetValue(IgnoreFullscreenWindowKey, value);
         }
 
+        public int TimelineSyncThreshold
+        {
+            get => GetValue<int>(TimelineSyncThresholdKey);
+            set => SetValue(TimelineSyncThresholdKey, value);
+        }
+
+        public bool IsLyricsFloatAnimationEnabled
+        {
+            get => GetValue<bool>(IsLyricsFloatAnimationEnabledKey);
+            set => SetValue(IsLyricsFloatAnimationEnabledKey, value);
+        }
+
+        public bool ResetPositionOffsetOnSongChanged
+        {
+            get => GetValue<bool>(ResetPositionOffsetOnSongChangedKey);
+            set => SetValue(ResetPositionOffsetOnSongChangedKey, value);
+        }
+
+        public int PositionOffset
+        {
+            get => GetValue<int>(PositionOffsetKey);
+            set => SetValue(PositionOffsetKey, value);
+        }
+
+        public bool IsImmersiveMode
+        {
+            get => GetValue<bool>(IsImmersiveModeKey);
+            set => SetValue(IsImmersiveModeKey, value);
+        }
+
         private T? GetValue<T>(string key)
         {
             if (_localSettings.Values.TryGetValue(key, out object? value))

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

@@ -0,0 +1,86 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Serialization;
+using BetterLyrics.WinUI3.ViewModels;
+using Lyricify.Lyrics.Helpers.General;
+using Microsoft.UI.Dispatching;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Services
+{
+    public class TranslateService : BaseViewModel, ITranslateService
+    {
+        private readonly HttpClient _httpClient;
+
+        public TranslateService(ISettingsService settingsService) : base(settingsService)
+        {
+            _httpClient = new HttpClient();
+        }
+
+        public async Task<string> TranslateTextAsync(string text, string targetLangCode, CancellationToken? token)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                throw new Exception(text + " is empty or null.");
+            }
+
+            string? originalLangCode = LanguageHelper.DetectLanguageCode(text);
+            if (string.IsNullOrWhiteSpace(originalLangCode) || originalLangCode == targetLangCode)
+            {
+                return text; // No translation needed
+            }
+            else if (originalLangCode == "zh-Hant" && targetLangCode == "zh-Hans")
+            {
+                return ChineseConverter.ConvertToSimplifiedChinese(text);
+            }
+            else if (originalLangCode == "zh-Hans" && targetLangCode == "zh-Hant")
+            {
+                return ChineseConverter.ConvertToTraditionalChinese(text);
+            }
+
+            if (string.IsNullOrEmpty(_settingsService.LibreTranslateServer))
+            {
+                throw new Exception("LibreTranslate server URL is not set in settings.");
+            }
+
+            var url = $"{_settingsService.LibreTranslateServer}/translate";
+            var response = await _httpClient.PostAsync(url, new FormUrlEncodedContent(
+            [
+                new("q", text),
+                new("source", originalLangCode),
+                new("target", targetLangCode),
+            ]));
+            token?.ThrowIfCancellationRequested();
+
+            response.EnsureSuccessStatusCode();
+            var json = await response.Content.ReadAsStringAsync();
+            token?.ThrowIfCancellationRequested();
+
+            var result = System.Text.Json.JsonSerializer.Deserialize(json, SourceGenerationContext.Default.TranslateResponse);
+            return result?.TranslatedText ?? string.Empty;
+        }
+
+        public int SearchTranslatedLyricsItself(List<LyricsData> lyricsDataArr)
+        {
+            string targetLangCode = LanguageHelper.GetUserTargetLanguageCode().Substring(0, 2);
+            if (lyricsDataArr.Count > 1)
+            {
+                for (int i = 1; i < lyricsDataArr.Count; i++)
+                {
+                    if (lyricsDataArr[i].LanguageCode?.Substring(0, 2) == targetLangCode)
+                    {
+                        return i; // Translation lyrics data found
+                    }
+                }
+            }
+            return -1; // No translation lyrics data found
+        }
+    }
+}

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

@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -118,43 +118,43 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
-    <value>Local music libraries</value>
+    <value>本地媒体库</value>
   </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
-    <value>Add folders storing music or lyrics</value>
+    <value>添加存放音乐或歌词的文件夹</value>
   </data>
   <data name="SettingsPageOpenLogFolderButton.Content" xml:space="preserve">
-    <value>Open in file explorer</value>
+    <value>在文件资源管理器中打开</value>
   </data>
   <data name="SettingsPageRemovePath.Content" xml:space="preserve">
-    <value>Remove from app</value>
+    <value>从应用中移除</value>
   </data>
   <data name="SettingsPageRemoveInfo.Title" xml:space="preserve">
-    <value>You are safe to remove the following items</value>
+    <value>您可以安全删除以下项目</value>
   </data>
   <data name="SettingsPageRemoveInfo.Message" xml:space="preserve">
-    <value>Original files and folders in this path will not be deleted when removing it from this app</value>
+    <value>路径中的原始文件和文件夹不会被删除</value>
   </data>
   <data name="SettingsPageAddFolder.Header" xml:space="preserve">
-    <value>Add a folder</value>
+    <value>添加文件夹</value>
   </data>
   <data name="SettingsPageTheme.Header" xml:space="preserve">
-    <value>Lyrics background theme</value>
+    <value>歌词背景主题</value>
   </data>
   <data name="SettingsPageLanguage.Header" xml:space="preserve">
-    <value>Language</value>
+    <value>语言</value>
   </data>
   <data name="SettingsPageLyricsFontColorAdaptiveColored.Content" xml:space="preserve">
-    <value>Adaptive to lyrics background (Colored)</value>
+    <value>适应歌词背景（彩色）</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveColored.Content" xml:space="preserve">
-    <value>Adaptive to lyrics background (Colored)</value>
+    <value>适应歌词背景（彩色）</value>
   </data>
   <data name="SettingsPageLight.Content" xml:space="preserve">
-    <value>Light</value>
+    <value>浅色</value>
   </data>
   <data name="SettingsPageDark.Content" xml:space="preserve">
-    <value>Dark</value>
+    <value>深色</value>
   </data>
   <data name="SettingsPageSC.Content" xml:space="preserve">
     <value>简体中文</value>
@@ -166,319 +166,320 @@
     <value>English</value>
   </data>
   <data name="SettingsPageGitHub.Header" xml:space="preserve">
-    <value>This is an open source app</value>
+    <value>此应用已开源</value>
   </data>
   <data name="SettingsPageGitHub.ActionIconToolTip" xml:space="preserve">
-    <value>Open in new window</value>
+    <value>在新窗口中打开</value>
   </data>
   <data name="SettingsPageGitHub.Description" xml:space="preserve">
-    <value>See source code on GitHub</value>
+    <value>在 GitHub 上查看源代码</value>
   </data>
   <data name="SettingsPageVersion.Text" xml:space="preserve">
-    <value>Version</value>
+    <value>版本号</value>
   </data>
   <data name="SettingsPageNoBackdrop.Content" xml:space="preserve">
-    <value>None</value>
+    <value>无</value>
   </data>
   <data name="SettingsPageMica.Content" xml:space="preserve">
-    <value>Mica</value>
+    <value>云母</value>
   </data>
   <data name="SettingsPageMicaAlt.Content" xml:space="preserve">
-    <value>Mica Alt</value>
+    <value>云母（替代样式）</value>
   </data>
   <data name="SettingsPageDesktopAcrylic.Content" xml:space="preserve">
-    <value>Desktop Acrylic</value>
+    <value>亚克力（桌面）</value>
   </data>
   <data name="SettingsPageAcrylicBase.Content" xml:space="preserve">
-    <value>Acrylic Base</value>
+    <value>亚克力（基础）</value>
   </data>
   <data name="SettingsPageAcrylicThin.Content" xml:space="preserve">
-    <value>Acrylic Thin</value>
+    <value>亚克力（薄层）</value>
   </data>
   <data name="SettingsPageTransparent.Content" xml:space="preserve">
-    <value>Transparent</value>
+    <value>透明</value>
   </data>
   <data name="SettingsPageBackdrop.Header" xml:space="preserve">
-    <value>Lyrics backdrop</value>
+    <value>歌词背景材质</value>
   </data>
   <data name="SettingsPageSystemLanguage.Content" xml:space="preserve">
-    <value>Default</value>
+    <value>默认</value>
   </data>
   <data name="SettingsPageRestart.Content" xml:space="preserve">
-    <value>Restart app to apply change</value>
+    <value>重启应用以应用更改</value>
   </data>
   <data name="SettingsPagePathNotFound.Text" xml:space="preserve">
-    <value>The path cannot be found on your computer</value>
+    <value>无法在您的计算机中找到该路径</value>
   </data>
   <data name="SettingsPagePathExistedInfo" xml:space="preserve">
-    <value>The folder has been added. Please do not add it again.</value>
+    <value>已添加过该文件夹，请勿重复添加</value>
   </data>
   <data name="SettingsPageLyricsBackground.Header" xml:space="preserve">
-    <value>Lyrics background</value>
+    <value>歌词背景</value>
   </data>
   <data name="SettingsPageDynamicLyricsBackground.Header" xml:space="preserve">
-    <value>Dynamic lyrics background</value>
+    <value>动态歌词背景</value>
   </data>
   <data name="SettingsPageLyricsBackgroundOpacity.Header" xml:space="preserve">
-    <value>Lyrics background opacity</value>
+    <value>歌词背景不透明度</value>
   </data>
   <data name="SettingsPageTitle" xml:space="preserve">
-    <value>Settings - BetterLyrics</value>
+    <value>设置 - BetterLyrics</value>
   </data>
   <data name="LyricsPageTitle" xml:space="preserve">
     <value>BetterLyrics</value>
   </data>
   <data name="SettingsPageLyricsAlignment.Header" xml:space="preserve">
-    <value>Alignment</value>
+    <value>对齐方式</value>
   </data>
   <data name="SettingsPageLyricsCenter.Content" xml:space="preserve">
-    <value>Center</value>
+    <value>居中</value>
   </data>
   <data name="SettingsPageLyricsLeft.Content" xml:space="preserve">
-    <value>Left</value>
+    <value>靠左</value>
   </data>
   <data name="SettingsPageLyricsRight.Content" xml:space="preserve">
-    <value>Right</value>
+    <value>靠右</value>
   </data>
   <data name="SettingsPageLyricsBackgroundBlurAmount.Header" xml:space="preserve">
-    <value>Lyrics background blur amount</value>
+    <value>歌词背景模糊度</value>
   </data>
   <data name="SettingsPageLyricsBlurAmount.Header" xml:space="preserve">
-    <value>Blur amount</value>
+    <value>模糊度</value>
   </data>
   <data name="SettingsPageLyricsBlurAmountSideEffect.Text" xml:space="preserve">
-    <value>Adjusting this value will also increase the background blur intensity of the album image.</value>
+    <value>调整该数值将同步提高专辑图片背景模糊强度</value>
   </data>
   <data name="SettingsPageSliderPrefix.Text" xml:space="preserve">
-    <value>Current value: </value>
+    <value>当前值：</value>
   </data>
   <data name="SettingsPageLyricsBlurHighGPUUsage.Text" xml:space="preserve">
-    <value>Significantly higher GPU usage when blur is enabled (&gt; 0)</value>
+    <value>启用模糊（&gt; 0）时将显著提升 GPU 占用率</value>
   </data>
   <data name="SettingsPageLyricsVerticalEdgeOpacity.Header" xml:space="preserve">
-    <value>Top and bottom edge opacity</value>
+    <value>上下边缘不透明度</value>
   </data>
   <data name="SettingsPageLyricsLineSpacingFactor.Header" xml:space="preserve">
-    <value>Line spacing</value>
+    <value>行间距</value>
   </data>
   <data name="SettingsPageLyricsLineSpacingFactorUnit.Text" xml:space="preserve">
-    <value>x line height</value>
+    <value> 倍行高</value>
   </data>
   <data name="SettingsPageLyricsFontSize.Header" xml:space="preserve">
-    <value>Font size</value>
+    <value>字体大小</value>
   </data>
   <data name="MainPageLyriscOnly.Content" xml:space="preserve">
-    <value>Lyrics only</value>
+    <value>仅显示歌词</value>
   </data>
   <data name="MainWindowImmersiveMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Immersive mode</value>
+    <value>沉浸模式</value>
   </data>
   <data name="SettingsPageBackgroundOverlay.Content" xml:space="preserve">
-    <value>Lyrics background</value>
+    <value>歌词背景</value>
   </data>
   <data name="SettingsPageAbout.Content" xml:space="preserve">
-    <value>About</value>
+    <value>关于</value>
   </data>
   <data name="SettingsPageLyricsLib.Content" xml:space="preserve">
-    <value>Lyrics library</value>
+    <value>歌词源</value>
   </data>
   <data name="SettingsPageAppAppearance.Text" xml:space="preserve">
-    <value>App appearance</value>
+    <value>应用外观</value>
   </data>
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
-    <value>Glow effect</value>
-  </data>
-  <data name="SettingsPageLyricsGlowEffectScope.Header" xml:space="preserve">
-    <value>Glow effect scope</value>
+    <value>辉光效果</value>
   </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Header" xml:space="preserve">
-    <value>Configure lyrics search providers</value>
+    <value>配置歌词源</value>
   </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Description" xml:space="preserve">
-    <value>Drag to sort, the lyrics search order will be in the following order</value>
+    <value>拖动排序，歌词搜索顺序将按以下顺序</value>
   </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
-    <value>Add</value>
+    <value>添加</value>
   </data>
   <data name="MainPageWelcomeTeachingTip.Title" xml:space="preserve">
-    <value>Welcome to BetterLyrics</value>
+    <value>欢迎使用 BetterLyrics</value>
   </data>
   <data name="MainPageWelcomeTeachingTip.Subtitle" xml:space="preserve">
-    <value>Hover the mouse over the top or bottom area of ​​the app to display more function options</value>
+    <value>单击左上按钮以启用沉浸式模式。
+如果遇到任何问题，请转到“设置”页面，关于标签，查看常见问题解答或联系作者以获取反馈</value>
   </data>
   <data name="MainPageNoMusicPlaying.Text" xml:space="preserve">
-    <value>No music playing now</value>
+    <value>当前没有正在播放的音乐</value>
   </data>
   <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>Developer options</value>
+    <value>高级选项</value>
   </data>
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
-    <value>Play test music</value>
+    <value>播放测试音乐</value>
   </data>
   <data name="SettingsPagePlayingMockMusicButton.Content" xml:space="preserve">
-    <value>Play "Cut To The Feeling" on "soundcloud.com"</value>
+    <value>在 “soundcloud.com” 上播放 “Cut to the Feeling”</value>
   </data>
   <data name="SettingsPageCache.Header" xml:space="preserve">
-    <value>Cache</value>
+    <value>缓存</value>
   </data>
   <data name="SettingsPageCache.Description" xml:space="preserve">
-    <value>Including log files, network lyrics cache</value>
+    <value>包括日志文件，网络歌词缓存</value>
   </data>
   <data name="SettingsPageLyricsBgFontColor.Header" xml:space="preserve">
-    <value>Font color (Non-current playback area)</value>
+    <value>字体颜色（非当前播放区域）</value>
   </data>
   <data name="SettingsPageLyricsFgFontColor.Header" xml:space="preserve">
-    <value>Font color (Current playback area)</value>
+    <value>字体颜色（当前播放区域）</value>
   </data>
   <data name="SettingsPageLyricsFontColorAdaptiveGrayed.Content" xml:space="preserve">
-    <value>Adaptive to lyrics background (Grayed)</value>
+    <value>适应歌词背景（灰色）</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorAdaptiveGrayed.Content" xml:space="preserve">
-    <value>Adaptive to lyrics background (Grayed)</value>
+    <value>适应歌词背景（灰色）</value>
   </data>
   <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
-    <value>Album art area style</value>
+    <value>专辑区域样式</value>
   </data>
   <data name="SettingsPageAlbumRadius.Header" xml:space="preserve">
-    <value>Corner radius</value>
+    <value>圆角半径</value>
   </data>
   <data name="SettingsPageTitleBarType.Header" xml:space="preserve">
-    <value>Title bar size</value>
+    <value>标题栏大小</value>
   </data>
   <data name="SettingsPageCompactTitleBar.Content" xml:space="preserve">
-    <value>Compact</value>
+    <value>紧凑</value>
   </data>
   <data name="SettingsPageExtendedTitleBar.Content" xml:space="preserve">
-    <value>Extended</value>
+    <value>扩展</value>
   </data>
   <data name="BaseWindowAOTFlyoutItem.Text" xml:space="preserve">
-    <value>Always on top</value>
+    <value>将应用置于顶层</value>
   </data>
   <data name="BaseWindowFullScreenFlyoutItem.Text" xml:space="preserve">
-    <value>Full screen</value>
+    <value>全屏</value>
   </data>
   <data name="BaseWindowEnterFullScreenHint" xml:space="preserve">
-    <value>Press Esc to exit full screen mode</value>
+    <value>按 Esc 退出全屏模式</value>
   </data>
   <data name="MainPageEnterImmersiveModeHint" xml:space="preserve">
-    <value>Hover back again to show the toggle button</value>
+    <value>再次悬停以显示切换按钮</value>
   </data>
   <data name="BaseWindowHostInfoBarCheckBox.Content" xml:space="preserve">
-    <value>Do not show this message again</value>
+    <value>不再显示此消息</value>
   </data>
   <data name="MainPageNoLocalFilesMatched.Text" xml:space="preserve">
-    <value>No local files matched</value>
+    <value>找不到匹配的本地文件</value>
   </data>
   <data name="MainPageAlbumArtOnly.Content" xml:space="preserve">
-    <value>Album art only</value>
+    <value>仅显示专辑封面</value>
   </data>
   <data name="MainPageSplitView.Content" xml:space="preserve">
-    <value>Split view</value>
+    <value>分屏视图</value>
   </data>
   <data name="MainPageDisplayTypeSwitcher.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Change display type</value>
+    <value>切换显示模式</value>
   </data>
   <data name="MainPageDesktopLyricsToggler.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Switch to desktop lyrics mode</value>
+    <value>切换到桌面歌词模式</value>
   </data>
   <data name="BaseWindowMiniFlyoutItem.Text" xml:space="preserve">
-    <value>Picture-in-picture mode</value>
+    <value>画中画模式</value>
   </data>
   <data name="BaseWindowUnMiniFlyoutItem.Text" xml:space="preserve">
-    <value>Exit picture-in-picture mode</value>
+    <value>退出画中画模式</value>
   </data>
   <data name="LyricsNotFound" xml:space="preserve">
-    <value>Lyrics not found</value>
+    <value>未找到歌词</value>
   </data>
   <data name="SettingsPageLyricsEffect.Text" xml:space="preserve">
-    <value>Lyrics effect</value>
+    <value>歌词动效</value>
   </data>
   <data name="SettingsPageLyricsStyle.Text" xml:space="preserve">
-    <value>Lyrics style</value>
+    <value>歌词样式</value>
   </data>
   <data name="SettingsPagePathBeIncludedInfo" xml:space="preserve">
-    <value>This folder is already included in the existing folder and does not need to be added again</value>
+    <value>该文件夹已包含在已有文件夹中，无需再次添加</value>
   </data>
   <data name="SettingsPageAppBehavior.Text" xml:space="preserve">
-    <value>App behavior</value>
+    <value>应用行为</value>
   </data>
   <data name="SettingsPageAutoStartWindow.Header" xml:space="preserve">
-    <value>When starting the app</value>
+    <value>启动应用时</value>
   </data>
   <data name="SettingsPageAutoStartInAppLyrics.Content" xml:space="preserve">
-    <value>Activate standard mode</value>
+    <value>启动标准模式</value>
   </data>
   <data name="SettingsPageAutoStartDesktopLyrics.Content" xml:space="preserve">
-    <value>Activate desktop mode</value>
+    <value>启动桌面模式</value>
   </data>
   <data name="SettingsPageAutoStartDockLyrics.Content" xml:space="preserve">
-    <value>Activate dock mode</value>
+    <value>启动停靠模式</value>
   </data>
   <data name="SystemTrayPageTitle" xml:space="preserve">
-    <value>System tray - BetterLyrics</value>
+    <value>系统托盘 - BetterLyrics</value>
   </data>
   <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
-    <value>Dock mode</value>
+    <value>停靠模式</value>
+  </data>
+  <data name="SettingsPageAppDock.Text" xml:space="preserve">
+    <value>停靠模式</value>
   </data>
   <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
-    <value>Desktop mode</value>
+    <value>桌面模式</value>
+  </data>
+  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
+    <value>桌面模式</value>
   </data>
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
-    <value>Font weight</value>
+    <value>字体粗细</value>
   </data>
   <data name="SettingsPageLyricsThin.Content" xml:space="preserve">
-    <value>Thin</value>
+    <value>极细</value>
   </data>
   <data name="SettingsPageLyricsExtraLight.Content" xml:space="preserve">
-    <value>Extra Light</value>
+    <value>超细</value>
   </data>
   <data name="SettingsPageLyricsLight.Content" xml:space="preserve">
-    <value>Light</value>
+    <value>细体</value>
   </data>
   <data name="SettingsPageLyricsSemiLight.Content" xml:space="preserve">
-    <value>Semi Light</value>
+    <value>次细</value>
   </data>
   <data name="SettingsPageLyricsNormal.Content" xml:space="preserve">
-    <value>Normal</value>
+    <value>常规</value>
   </data>
   <data name="SettingsPageLyricsMedium.Content" xml:space="preserve">
-    <value>Medium</value>
+    <value>中等</value>
   </data>
   <data name="SettingsPageLyricsSemiBold.Content" xml:space="preserve">
-    <value>Semi Bold</value>
+    <value>次粗</value>
   </data>
   <data name="SettingsPageLyricsBold.Content" xml:space="preserve">
-    <value>Bold</value>
+    <value>粗体</value>
   </data>
   <data name="SettingsPageLyricsExtraBold.Content" xml:space="preserve">
-    <value>Extra Bold</value>
+    <value>特粗</value>
   </data>
   <data name="SettingsPageLyricsBlack.Content" xml:space="preserve">
-    <value>Black</value>
+    <value>黑体</value>
   </data>
   <data name="SettingsPageLyricsExtraBlack.Content" xml:space="preserve">
-    <value>Extra Black</value>
+    <value>超黑</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeWholeLyrics.Content" xml:space="preserve">
-    <value>Whole lyrics</value>
+  <data name="SettingsPageLyricsRendingScopeCurrentLine.Content" xml:space="preserve">
+    <value>当前行</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentLine.Content" xml:space="preserve">
-    <value>Current line</value>
-  </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentChar.Content" xml:space="preserve">
-    <value>Current char</value>
+  <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
+    <value>当前字符</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
-    <value>Settings</value>
+    <value>设置</value>
   </data>
   <data name="LyricsLoading" xml:space="preserve">
-    <value>Loading lyrics...</value>
+    <value>加载歌词中...</value>
   </data>
   <data name="LyricsSearchProviderLocalLrcFile" xml:space="preserve">
-    <value>Local .LRC files</value>
+    <value>本地 .LRC 文件</value>
   </data>
   <data name="LyricsSearchProviderLocalMusicFile" xml:space="preserve">
-    <value>Local music files</value>
+    <value>本地音乐文件</value>
   </data>
   <data name="LyricsSearchProviderLrcLib" xml:space="preserve">
     <value>LRCLIB</value>
@@ -490,13 +491,13 @@
     <value>한국어</value>
   </data>
   <data name="LyricsSearchProviderEslrcFile" xml:space="preserve">
-    <value>Local .ESLRC files</value>
+    <value>本地 .ESLRC 文件</value>
   </data>
   <data name="LyricsSearchProviderTtmlFile" xml:space="preserve">
-    <value>Local .TTML files</value>
+    <value>本地 .TTML 文件</value>
   </data>
   <data name="SettingsPagePathIncludingOthersInfo" xml:space="preserve">
-    <value>This folder contains added folders, please delete these folders to add the folder</value>
+    <value>该文件夹包含已添加文件夹，请删除这些文件夹以添加该文件夹</value>
   </data>
   <data name="LyricsSearchProviderAmllTtmlDb" xml:space="preserve">
     <value>amll-ttml-db</value>
@@ -511,147 +512,288 @@
     <value>Kugou</value>
   </data>
   <data name="SettingsPageDebugOverlay.Header" xml:space="preserve">
-    <value>Show debug overlay</value>
+    <value>显示调试覆盖层</value>
   </data>
   <data name="DependenciesSettingsExpander.Header" xml:space="preserve">
-    <value>Dependencies</value>
+    <value>依赖</value>
   </data>
   <data name="HostWindowClickThroughFlyoutItem.Text" xml:space="preserve">
-    <value>Lock</value>
+    <value>锁定</value>
   </data>
   <data name="SystemTraySettings.Text" xml:space="preserve">
-    <value>Settings</value>
+    <value>打开设置</value>
   </data>
   <data name="SystemTrayExit.Text" xml:space="preserve">
-    <value>Exit</value>
+    <value>退出程序</value>
   </data>
   <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>Unlock the window (Restart needed)</value>
+    <value>解锁窗口</value>
   </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
-    <value>Lock</value>
+    <value>锁定</value>
   </data>
-  <data name="HostWindowLockToolTip.Content" xml:space="preserve">
-    <value>To unlock after locking, go to the system tray to unlock</value>
+  <data name="HostWindowLockToolTip.Text" xml:space="preserve">
+    <value>锁定后解锁，请转到系统托盘解锁或按下</value>
   </data>
   <data name="SettingsPageFan.Header" xml:space="preserve">
-    <value>Fan lyrics</value>
+    <value>扇形歌词</value>
   </data>
   <data name="SettingsPageLyricsFontColorCustom.Content" xml:space="preserve">
-    <value>Custom</value>
+    <value>自定义</value>
   </data>
   <data name="SettingsPageLyricsFgFontColorCustom.Content" xml:space="preserve">
-    <value>Custom</value>
+    <value>自定义</value>
   </data>
   <data name="SettingsPageLyrics.Content" xml:space="preserve">
-    <value>Lyrics style and effect</value>
+    <value>歌词样式与动效</value>
   </data>
   <data name="SettingsPageApp.Content" xml:space="preserve">
-    <value>App appearance and behavior</value>
+    <value>应用外观与行为</value>
   </data>
   <data name="SettingsPageAutoLock.Header" xml:space="preserve">
-    <value>Auto-lock when activating desktop mode</value>
+    <value>启动桌面模式时随即锁定窗口</value>
   </data>
   <data name="SettingsPageSongInfoAlignment.Header" xml:space="preserve">
-    <value>Alignment</value>
+    <value>对齐方式</value>
   </data>
   <data name="SettingsPageSongInfoCenter.Content" xml:space="preserve">
-    <value>Center</value>
+    <value>居中</value>
   </data>
   <data name="SettingsPageSongInfoLeft.Content" xml:space="preserve">
-    <value>Left</value>
+    <value>靠左</value>
   </data>
   <data name="SettingsPageSongInfoRight.Content" xml:space="preserve">
-    <value>Right</value>
+    <value>靠右</value>
   </data>
   <data name="SettingsPageAlbumArt.Text" xml:space="preserve">
-    <value>Album art</value>
+    <value>专辑</value>
   </data>
   <data name="SettingsPageSongInfo.Text" xml:space="preserve">
-    <value>Song title &amp; artist</value>
+    <value>歌曲标题和艺术家</value>
   </data>
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
-    <value>Easing animation type</value>
+    <value>缓动动画类型</value>
   </data>
-  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
-    <value>Media sources</value>
+  <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
+    <value>播放源</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Header" xml:space="preserve">
-    <value>Media source</value>
+    <value>播放源</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Description" xml:space="preserve">
-    <value>Enable or disable lyrics display for a specified media source</value>
+    <value>为指定媒体源启用或禁用歌词显示</value>
   </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
-    <value>Log record</value>
+    <value>日志记录</value>
   </data>
   <data name="SettingsPageTranslation.Content" xml:space="preserve">
-    <value>Lyrics translation</value>
+    <value>歌词翻译</value>
   </data>
   <data name="MainPagePositionOffsetSlider.Header" xml:space="preserve">
-    <value>Lyrics timeline offset (ms)</value>
+    <value>歌词时间轴偏移（毫秒）</value>
   </data>
   <data name="SettingsPageTranslationConfig.Header" xml:space="preserve">
-    <value>Configure translation services</value>
+    <value>配置翻译服务</value>
   </data>
   <data name="SettingsPageLibreTranslateServer.Header" xml:space="preserve">
-    <value>Server address</value>
+    <value>服务器地址</value>
   </data>
   <data name="SettingsPageServerTestButton.Content" xml:space="preserve">
-    <value>Test server</value>
+    <value>测试服务器</value>
   </data>
   <data name="SettingsPageTargetLanguage.Header" xml:space="preserve">
-    <value>Target language</value>
+    <value>目标语言</value>
   </data>
   <data name="SettingsPageTranslationInfo.Header" xml:space="preserve">
-    <value>Translation service powered by LibreTranslate</value>
+    <value>翻译服务由 LibreTranslate 驱动</value>
   </data>
   <data name="SettingsPageTranslationInfoLink.Text" xml:space="preserve">
-    <value>Visit https://github.com/LibreTranslate/LibreTranslate for installation instructions and more information (this software is not affiliated with this translation service in any way)</value>
+    <value>访问 https://github.com/LibreTranslate/LibreTranslate 获取安装教程及更多信息（本软件与该翻译服务无任何联系）</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestSuccessInfo" xml:space="preserve">
-    <value>Server test successful</value>
+  <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
+    <value>服务器测试成功</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestFailedInfo" xml:space="preserve">
-    <value>Server test failed</value>
+  <data name="SettingsPageServerTestFailedInfo" xml:space="preserve">
+    <value>服务器测试失败</value>
   </data>
   <data name="SettingsPageLyricsFontStrokeWidth.Header" xml:space="preserve">
-    <value>Lyrics stroke width (Desktop mode only)</value>
+    <value>歌词描边宽度（仅桌面模式）</value>
   </data>
   <data name="SettingsPageFollowSystem.Content" xml:space="preserve">
-    <value>Follow system</value>
+    <value>跟随系统</value>
   </data>
   <data name="SettingsPageAutoStart.Header" xml:space="preserve">
-    <value>Automatic startup</value>
+    <value>自动启动</value>
   </data>
   <data name="SettingsPageLyricsStrokeFontColor.Header" xml:space="preserve">
-    <value>Lyrics stroke color (Desktop mode only)</value>
+    <value>歌词描边颜色（仅桌面模式）</value>
   </data>
   <data name="SettingsPageIgnoreFullscreenWindow.Header" xml:space="preserve">
-    <value>Always stay on top of fullscreen applications</value>
+    <value>始终显示在全屏应用上方</value>
   </data>
   <data name="SettingsPageIgnoreFullscreenWindow.Description" xml:space="preserve">
-    <value>Force this app to appear on top of full-screen apps when docked or desktop mode is enabled</value>
+    <value>当启用停靠模式或桌面模式时强制将本应用显示在全屏应用的上方</value>
   </data>
   <data name="HostWindowMoreButtonToolTip.Content" xml:space="preserve">
-    <value>More</value>
+    <value>更多</value>
   </data>
   <data name="LyricsPageTimelineOffsetButtonToolTip.Content" xml:space="preserve">
-    <value>Lyrics timeline offset</value>
+    <value>歌词时间偏移</value>
   </data>
   <data name="LyricsPageTranslationButtonToolTip.Content" xml:space="preserve">
-    <value>Translate</value>
+    <value>翻译</value>
   </data>
   <data name="LyricsPageDisplayTypeButtonToolTip.Content" xml:space="preserve">
-    <value>Display type</value>
+    <value>显示类型</value>
   </data>
   <data name="LyricsPageSettingsButtonToolTip.Content" xml:space="preserve">
-    <value>Settings</value>
+    <value>设置</value>
   </data>
   <data name="TranslateServerNotSet" xml:space="preserve">
-    <value>Translate server is not set, please configure it in settings first</value>
+    <value>未设置翻译服务器，请先在设置中进行配置</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Text" xml:space="preserve">
-    <value>Will automatically reset to 0 when switching songs</value>
+    <value>切换歌曲时重置为 0</value>
+  </data>
+  <data name="SettingsPageTargetLanguage.Description" xml:space="preserve">
+    <value>将优先读取歌词内翻译，若无匹配则向 LibreTranslate 服务器请求机器翻译</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Header" xml:space="preserve">
+    <value>配置专辑封面源</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Description" xml:space="preserve">
+    <value>拖动排序，专辑封面搜索顺序将按以下顺序</value>
+  </data>
+  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
+    <value>专辑封面源</value>
+  </data>
+  <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
+    <value>本地音乐文件</value>
+  </data>
+  <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
+    <value>音乐播放器</value>
+  </data>
+  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
+    <value>媒体库</value>
+  </data>
+  <data name="SettingsPageScrollEasing.Header" xml:space="preserve">
+    <value>歌词滚动动画类型</value>
+  </data>
+  <data name="SettingsPageScrollDuration.Header" xml:space="preserve">
+    <value>歌词滚动动画持续时间</value>
+  </data>
+  <data name="SettingsPageEasingTypeLinear.Content" xml:space="preserve">
+    <value>线性</value>
+  </data>
+  <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
+    <value>平滑步进</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutSine.Content" xml:space="preserve">
+    <value>正弦缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuad.Content" xml:space="preserve">
+    <value>二次缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutElastic.Content" xml:space="preserve">
+    <value>弹性缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBack.Content" xml:space="preserve">
+    <value>回弹缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBounce.Content" xml:space="preserve">
+    <value>弹跳缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCirc.Content" xml:space="preserve">
+    <value>圆形缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutExpo.Content" xml:space="preserve">
+    <value>指数缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuint.Content" xml:space="preserve">
+    <value>五次缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuart.Content" xml:space="preserve">
+    <value>四次缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCubic.Content" xml:space="preserve">
+    <value>三次缓入缓出</value>
+  </data>
+  <data name="SettingsPageLyricsRendingScopeLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>当前歌词开始到当前字符</value>
+  </data>
+  <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
+    <value>高亮显示范围</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
+    <value>歌词时间轴同步阈值</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
+    <value>当歌词进度抖动时，请尝试增加该阈值；更改此值会导致歌词同步有偏差</value>
+  </data>
+  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+    <value>QQ 反馈交流群</value>
+  </data>
+  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+    <value>Discord</value>
+  </data>
+  <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
+    <value>立即加入</value>
+  </data>
+  <data name="SettingsPageLyricsFloatAnimation.Header" xml:space="preserve">
+    <value>浮动动画</value>
+  </data>
+  <data name="SettingsPageScope.Header" xml:space="preserve">
+    <value>范围</value>
+  </data>
+  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
+    <value>解锁和锁定快捷键</value>
+  </data>
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
+    <value>LX 音乐服务器</value>
+  </data>
+  <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
+    <value>停靠模式位置</value>
+  </data>
+  <data name="SettingsPageDockPlacementTop.Content" xml:space="preserve">
+    <value>顶部</value>
+  </data>
+  <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
+    <value>底部</value>
+  </data>
+  <data name="LyricsPageTranslationEnabled.Header" xml:space="preserve">
+    <value>启用翻译</value>
+  </data>
+  <data name="LyricsPageTranslationOnly.Header" xml:space="preserve">
+    <value>仅显示翻译</value>
+  </data>
+  <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
+    <value>字体不透明度（非当前播放区域）</value>
+  </data>
+  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+    <value>常见问题与解答</value>
+  </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>无法连接到 LX 音乐服务器，请转到设置 - 高级选项以检查是否正确输入链接</value>
+  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自动隐藏窗口</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>停靠模式或桌面模式下，无歌曲正在播放时，自动隐藏窗口</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窗口高度</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌词字体</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>全局拖拽</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>将标题栏扩展至整个页面使得在任意非交互区域均可拖拽窗口</value>
+  </data>
+  <data name="MusicGalleryPageTitle" xml:space="preserve">
+    <value>音乐库</value>
   </data>
 </root>

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

@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
-    <value>地元の音楽図書館</value>
+    <value>地元のメディア図書館</value>
   </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>音楽や歌詞を保存するフォルダーを追加します</value>
@@ -280,7 +280,7 @@
     <value>について</value>
   </data>
   <data name="SettingsPageLyricsLib.Content" xml:space="preserve">
-    <value>歌詞ライブラリ</value>
+    <value>歌詞</value>
   </data>
   <data name="SettingsPageAppAppearance.Text" xml:space="preserve">
     <value>アプリの外観</value>
@@ -288,11 +288,8 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>グロー効果</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScope.Header" xml:space="preserve">
-    <value>グローエフェクトスコープ</value>
-  </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Header" xml:space="preserve">
-    <value>歌詞検索プロバイダーを構成します</value>
+    <value>歌詞ソースを構成します</value>
   </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Description" xml:space="preserve">
     <value>ドラッグしてソートすると、歌詞の検索注文は次の順序で行われます</value>
@@ -304,13 +301,14 @@
     <value>BetterLyrics へようこそ</value>
   </data>
   <data name="MainPageWelcomeTeachingTip.Subtitle" xml:space="preserve">
-    <value>マウスをアプリの上または下部の領域にホバリングして、より多くの機能オプションを表示します</value>
+    <value>左上ボタンをクリックして、没入型モードを有効にします。
+問題が発生した場合は、[設定]ページ、[タブについて]にアクセスして、FAQを表示するか、フィードバックについて著者に連絡してください</value>
   </data>
   <data name="MainPageNoMusicPlaying.Text" xml:space="preserve">
     <value>今は音楽が再生されていません</value>
   </data>
   <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>開発者オプション</value>
+    <value>高度なオプション</value>
   </data>
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>テスト音楽を再生します</value>
@@ -420,9 +418,15 @@
   <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
     <value>ドックモード</value>
   </data>
+  <data name="SettingsPageAppDock.Text" xml:space="preserve">
+    <value>ドックモード</value>
+  </data>
   <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
     <value>デスクトップモード</value>
   </data>
+  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
+    <value>デスクトップモード</value>
+  </data>
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>フォント重量</value>
   </data>
@@ -459,13 +463,10 @@
   <data name="SettingsPageLyricsExtraBlack.Content" xml:space="preserve">
     <value>余分な黒</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeWholeLyrics.Content" xml:space="preserve">
-    <value>歌詞全体</value>
-  </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentLine.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentLine.Content" xml:space="preserve">
     <value>現在の行</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentChar.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>現在の文字</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
@@ -526,13 +527,13 @@
     <value>プログラムを終了します</value>
   </data>
   <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>ウィンドウのロックを解除する（再起動が必要）</value>
+    <value>ウィンドウのロックを解除します</value>
   </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>ロック</value>
   </data>
-  <data name="HostWindowLockToolTip.Content" xml:space="preserve">
-    <value>ロック後にロックを解除するには、システムトレイに移動してロックを解除します</value>
+  <data name="HostWindowLockToolTip.Text" xml:space="preserve">
+    <value>ロック後にロックを解除するには、システムトレイに移動してロックを解除または押します</value>
   </data>
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>ファンの歌詞</value>
@@ -573,11 +574,11 @@
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>アニメーションタイプを緩和します</value>
   </data>
-  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
-    <value>メディアソース</value>
+  <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
+    <value>再生ソース</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Header" xml:space="preserve">
-    <value>メディアソース</value>
+    <value>再生ソース</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Description" xml:space="preserve">
     <value>指定されたメディアソースの歌詞ディスプレイを有効または無効にする</value>
@@ -609,10 +610,10 @@
   <data name="SettingsPageTranslationInfoLink.Text" xml:space="preserve">
     <value>https://github.com/LibreTranslate/LibreTranslate にアクセスしてください。</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestSuccessInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>サーバーテストが成功しました</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestFailedInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestFailedInfo" xml:space="preserve">
     <value>サーバーテストに失敗しました</value>
   </data>
   <data name="SettingsPageLyricsFontStrokeWidth.Header" xml:space="preserve">
@@ -652,6 +653,147 @@
     <value>翻訳サーバーは設定されていません。最初に設定で構成してください</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Text" xml:space="preserve">
-    <value>曲を切り替えると、0 に自動的にリセットされます</value>
+    <value>曲を切り替えるときに0にリセットします</value>
+  </data>
+  <data name="SettingsPageTargetLanguage.Description" xml:space="preserve">
+    <value>歌詞の翻訳は最初に読まれます。一致していない場合、機械の翻訳はLibretranslate Serverから要求されます</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Header" xml:space="preserve">
+    <value>アルバムカバーソースを構成します</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Description" xml:space="preserve">
+    <value>ドラッグしてソートすると、アルバムアートサーチオーダーは次の順序で行われます</value>
+  </data>
+  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
+    <value>アルバムアートソース</value>
+  </data>
+  <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
+    <value>ローカル音楽ファイル</value>
+  </data>
+  <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
+    <value>音楽プレーヤー</value>
+  </data>
+  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
+    <value>メディアライブラリ</value>
+  </data>
+  <data name="SettingsPageScrollEasing.Header" xml:space="preserve">
+    <value>歌詞スクロールアニメーションタイプ</value>
+  </data>
+  <data name="SettingsPageScrollDuration.Header" xml:space="preserve">
+    <value>歌詞スクロールアニメーションの期間</value>
+  </data>
+  <data name="SettingsPageEasingTypeLinear.Content" xml:space="preserve">
+    <value>リニア</value>
+  </data>
+  <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
+    <value>スムーズなステップ</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutSine.Content" xml:space="preserve">
+    <value>サインがゆっくりと出入りします</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuad.Content" xml:space="preserve">
+    <value>セカンダリスローインとアウト</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutElastic.Content" xml:space="preserve">
+    <value>弾力性は内外に遅くなります</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBack.Content" xml:space="preserve">
+    <value>リバウンドはスローアウトで遅くなります</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBounce.Content" xml:space="preserve">
+    <value>ゆっくりと出入りします</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCirc.Content" xml:space="preserve">
+    <value>丸い、ゆっくりと出入り</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutExpo.Content" xml:space="preserve">
+    <value>インデックスは内外に遅くなります</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuint.Content" xml:space="preserve">
+    <value>5つの遅いインとアウト</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuart.Content" xml:space="preserve">
+    <value>4つの遅いインとアウト</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCubic.Content" xml:space="preserve">
+    <value>3つの遅いインとアウト</value>
+  </data>
+  <data name="SettingsPageLyricsRendingScopeLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>現在のラインが現在の文字から始まります</value>
+  </data>
+  <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
+    <value>ハイライトスコープ</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
+    <value>歌詞タイムライン同期しきい値</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
+    <value>歌詞の進行が不安定な場合は、このしきい値を増やしてみてください。この値を変更すると、歌詞の同期が逸脱する可能性があります</value>
+  </data>
+  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+    <value>QQフィードバック＆チャットグループ</value>
+  </data>
+  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+    <value>Discord</value>
+  </data>
+  <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
+    <value>今すぐ参加してください</value>
+  </data>
+  <data name="SettingsPageLyricsFloatAnimation.Header" xml:space="preserve">
+    <value>フローティングアニメーション</value>
+  </data>
+  <data name="SettingsPageScope.Header" xml:space="preserve">
+    <value>範囲</value>
+  </data>
+  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
+    <value>ショートカットキーのロックを解除およびロックします</value>
+  </data>
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
+    <value>LX Music Server</value>
+  </data>
+  <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
+    <value>ドックモード配置</value>
+  </data>
+  <data name="SettingsPageDockPlacementTop.Content" xml:space="preserve">
+    <value>トップ</value>
+  </data>
+  <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
+    <value>底</value>
+  </data>
+  <data name="LyricsPageTranslationEnabled.Header" xml:space="preserve">
+    <value>翻訳を有効にします</value>
+  </data>
+  <data name="LyricsPageTranslationOnly.Header" xml:space="preserve">
+    <value>翻訳のみを表示します</value>
+  </data>
+  <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
+    <value>フォントの不透明度（非電流再生エリア）</value>
+  </data>
+  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+    <value>よくある質問</value>
+  </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>LX Music Serverに接続できない場合は、設定に移動してください。リンクが正しく入力されているかどうかを確認するための高度なオプションに移動してください</value>
+  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自動ハイドウィンドウ</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>ドックモードやデスクトップモードで再生されている曲がないときにウィンドウを自動的に非表示にする</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窓の高さ</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌詞フォントファミリー</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>グローバルドラッグ</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>タイトルバーをページ全体に拡張して、ウィンドウを非対話領域でドラッグできるようにします</value>
+  </data>
+  <data name="MusicGalleryPageTitle" xml:space="preserve">
+    <value>音楽ギャラリー</value>
   </data>
 </root>

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

@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
-    <value>로컬 음악 도서관</value>
+    <value>로컬 미디어 라이브러리</value>
   </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>음악이나 가사를 저장하는 폴더 추가</value>
@@ -280,7 +280,7 @@
     <value>에 대한</value>
   </data>
   <data name="SettingsPageLyricsLib.Content" xml:space="preserve">
-    <value>가사 도서관</value>
+    <value>가사</value>
   </data>
   <data name="SettingsPageAppAppearance.Text" xml:space="preserve">
     <value>앱 모양</value>
@@ -288,11 +288,8 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>글로우 효과</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScope.Header" xml:space="preserve">
-    <value>글로우 효과 범위</value>
-  </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Header" xml:space="preserve">
-    <value>가사 검색 제공 업체를 구성하십시오</value>
+    <value>가사 소스를 구성하십시오</value>
   </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Description" xml:space="preserve">
     <value>정렬하기 위해 드래그하면 가사 검색 순서는 다음 순서로됩니다.</value>
@@ -304,13 +301,14 @@
     <value>Betterlyrics에 오신 것을 환영합니다</value>
   </data>
   <data name="MainPageWelcomeTeachingTip.Subtitle" xml:space="preserve">
-    <value>더 많은 기능 옵션을 표시하려면 앱의 상단 또는 하단 영역 위로 마우스를 가져옵니다.</value>
+    <value>몰입 형 모드를 활성화하려면 왼쪽 상단 버튼을 클릭하십시오.
+문제가 발생하면 설정 페이지, 탭 정보로 이동하여 FAQ를보고 저자에게 연락하여 피드백을 받으십시오.</value>
   </data>
   <data name="MainPageNoMusicPlaying.Text" xml:space="preserve">
     <value>지금 음악이 재생되지 않습니다</value>
   </data>
   <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>개발자 옵션</value>
+    <value>고급 옵션</value>
   </data>
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>테스트 음악을 재생하십시오</value>
@@ -420,9 +418,15 @@
   <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
     <value>도크 모드</value>
   </data>
+  <data name="SettingsPageAppDock.Text" xml:space="preserve">
+    <value>도크 모드</value>
+  </data>
   <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
     <value>데스크탑 모드</value>
   </data>
+  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
+    <value>데스크탑 모드</value>
+  </data>
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>글꼴 무게</value>
   </data>
@@ -459,13 +463,10 @@
   <data name="SettingsPageLyricsExtraBlack.Content" xml:space="preserve">
     <value>여분의 검은 색</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeWholeLyrics.Content" xml:space="preserve">
-    <value>전체 가사</value>
-  </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentLine.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentLine.Content" xml:space="preserve">
     <value>현재 라인</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentChar.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>현재 숯</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
@@ -526,13 +527,13 @@
     <value>프로그램을 종료하십시오</value>
   </data>
   <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>창 잠금 해제 (다시 시작)</value>
+    <value>창을 잠금 해제하십시오</value>
   </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>잠금</value>
   </data>
-  <data name="HostWindowLockToolTip.Content" xml:space="preserve">
-    <value>잠금 잠금을 해제하려면 시스템 트레이로 이동하여 잠금을 해제하십시오.</value>
+  <data name="HostWindowLockToolTip.Text" xml:space="preserve">
+    <value>잠금 잠금을 해제하려면 시스템 트레이로 이동하여 잠금을 해제하거나 누릅니다.</value>
   </data>
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>팬 가사</value>
@@ -573,11 +574,11 @@
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>애니메이션 유형 완화</value>
   </data>
-  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
-    <value>미디어 소스</value>
+  <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
+    <value>재생 소스</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Header" xml:space="preserve">
-    <value>미디어 소스</value>
+    <value>재생 소스</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Description" xml:space="preserve">
     <value>지정된 미디어 소스의 가사 디스플레이 활성화 또는 비활성화</value>
@@ -609,10 +610,10 @@
   <data name="SettingsPageTranslationInfoLink.Text" xml:space="preserve">
     <value>설치 지침 및 자세한 정보는 https://github.com/LibreTranslate/LibreTranslate 를 방문하십시오 (이 소프트웨어는이 번역 서비스와 제휴하지 않습니다).</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestSuccessInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>서버 테스트 성공</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestFailedInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestFailedInfo" xml:space="preserve">
     <value>서버 테스트가 실패했습니다</value>
   </data>
   <data name="SettingsPageLyricsFontStrokeWidth.Header" xml:space="preserve">
@@ -652,6 +653,147 @@
     <value>번역 서버가 설정되지 않았습니다. 먼저 설정으로 구성하십시오.</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Text" xml:space="preserve">
-    <value>노래를 전환 할 때 자동으로 0 으로 재설정됩니다</value>
+    <value>노래를 전환 할 때 0 으로 재설정하십시오</value>
+  </data>
+  <data name="SettingsPageTargetLanguage.Description" xml:space="preserve">
+    <value>가사의 번역은 먼저 읽습니다. 일치하지 않으면 LibreTranslate 서버에서 기계 번역이 요청됩니다.</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Header" xml:space="preserve">
+    <value>앨범 표지 소스를 구성합니다</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Description" xml:space="preserve">
+    <value>분류하기 위해 드래그하면 앨범 아트 검색 순서는 다음 순서로됩니다.</value>
+  </data>
+  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
+    <value>앨범 아트 소스</value>
+  </data>
+  <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
+    <value>로컬 음악 파일</value>
+  </data>
+  <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
+    <value>음악 플레이어</value>
+  </data>
+  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
+    <value>미디어 라이브러리</value>
+  </data>
+  <data name="SettingsPageScrollEasing.Header" xml:space="preserve">
+    <value>가사 스크롤링 애니메이션 유형</value>
+  </data>
+  <data name="SettingsPageScrollDuration.Header" xml:space="preserve">
+    <value>가사 스크롤링 애니메이션 지속 시간</value>
+  </data>
+  <data name="SettingsPageEasingTypeLinear.Content" xml:space="preserve">
+    <value>선의</value>
+  </data>
+  <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
+    <value>부드러운 단계</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutSine.Content" xml:space="preserve">
+    <value>천천히 입력하십시오</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuad.Content" xml:space="preserve">
+    <value>이차 느린 속도가 느려집니다</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutElastic.Content" xml:space="preserve">
+    <value>탄력성이 속도가 느려집니다</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBack.Content" xml:space="preserve">
+    <value>리바운드는 느리게 느려집니다</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBounce.Content" xml:space="preserve">
+    <value>천천히 안팎으로 튀어 나옵니다</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCirc.Content" xml:space="preserve">
+    <value>둥글고 느리게 안팎으로</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutExpo.Content" xml:space="preserve">
+    <value>인덱스 속도가 느려집니다</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuint.Content" xml:space="preserve">
+    <value>5 번 느리게 안팎으로</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuart.Content" xml:space="preserve">
+    <value>4 개의 느린 안팎</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCubic.Content" xml:space="preserve">
+    <value>세 번 느리게 안팎으로</value>
+  </data>
+  <data name="SettingsPageLyricsRendingScopeLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>현재 라인은 현재 숯으로 시작합니다</value>
+  </data>
+  <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
+    <value>하이라이트 범위</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
+    <value>가사 타임 라인 동기화 임계 값</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
+    <value>가사 진행 상황이 불안하다면이 임계 값을 높이십시오. 이 값을 변경하면 가사가 동기화 될 수 있습니다</value>
+  </data>
+  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+    <value>QQ 피드백 및 채팅 그룹</value>
+  </data>
+  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+    <value>Discord</value>
+  </data>
+  <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
+    <value>지금 가입하십시오</value>
+  </data>
+  <data name="SettingsPageLyricsFloatAnimation.Header" xml:space="preserve">
+    <value>떠 다니는 애니메이션</value>
+  </data>
+  <data name="SettingsPageScope.Header" xml:space="preserve">
+    <value>범위</value>
+  </data>
+  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
+    <value>바로 가기 키를 잠금 해제하고 잠그십시오</value>
+  </data>
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
+    <value>LX 음악 서버</value>
+  </data>
+  <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
+    <value>도크 모드 배치</value>
+  </data>
+  <data name="SettingsPageDockPlacementTop.Content" xml:space="preserve">
+    <value>맨 위</value>
+  </data>
+  <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
+    <value>맨 아래</value>
+  </data>
+  <data name="LyricsPageTranslationEnabled.Header" xml:space="preserve">
+    <value>번역 활성화</value>
+  </data>
+  <data name="LyricsPageTranslationOnly.Header" xml:space="preserve">
+    <value>번역 만 표시하십시오</value>
+  </data>
+  <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
+    <value>글꼴 불투명 (비 전류 재생 영역)</value>
+  </data>
+  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+    <value>자주 묻는 질문</value>
+  </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>LX Music Server에 연결할 수 없습니다. 설정으로 이동하십시오 - 고급 옵션이 링크가 올바르게 입력되었는지 확인하십시오.</value>
+  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>자동 가죽 창</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>도크 모드 또는 데스크탑 모드에서 재생되지 않을 때는 창을 자동으로 숨기고 있습니다.</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>창 높이</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>가사 글꼴 가족</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>글로벌 드래그</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>비 중과 영역에서 창을 드래그 할 수 있도록 제목 표시 줄을 전체 페이지로 확장하십시오.</value>
+  </data>
+  <data name="MusicGalleryPageTitle" xml:space="preserve">
+    <value>음악 갤러리</value>
   </data>
 </root>

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

@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
-    <value>本地音乐媒体库</value>
+    <value>本地媒体库</value>
   </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>添加存放音乐或歌词的文件夹</value>
@@ -280,7 +280,7 @@
     <value>关于</value>
   </data>
   <data name="SettingsPageLyricsLib.Content" xml:space="preserve">
-    <value>歌词库</value>
+    <value>歌词源</value>
   </data>
   <data name="SettingsPageAppAppearance.Text" xml:space="preserve">
     <value>应用外观</value>
@@ -288,11 +288,8 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>辉光效果</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScope.Header" xml:space="preserve">
-    <value>辉光效果作用范围</value>
-  </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Header" xml:space="preserve">
-    <value>配置歌词搜索服务</value>
+    <value>配置歌词源</value>
   </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Description" xml:space="preserve">
     <value>拖动排序，歌词搜索顺序将按以下顺序</value>
@@ -304,13 +301,14 @@
     <value>欢迎使用 BetterLyrics</value>
   </data>
   <data name="MainPageWelcomeTeachingTip.Subtitle" xml:space="preserve">
-    <value>将鼠标悬停在应用程序的顶部或底部区域以显示更多功能选项</value>
+    <value>单击左上按钮以启用沉浸式模式。
+如果遇到任何问题，请转到“设置”页面，关于标签，查看常见问题解答或联系作者以获取反馈</value>
   </data>
   <data name="MainPageNoMusicPlaying.Text" xml:space="preserve">
     <value>当前没有正在播放的音乐</value>
   </data>
   <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>开发者选项</value>
+    <value>高级选项</value>
   </data>
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>播放测试音乐</value>
@@ -420,9 +418,15 @@
   <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
     <value>停靠模式</value>
   </data>
+  <data name="SettingsPageAppDock.Text" xml:space="preserve">
+    <value>停靠模式</value>
+  </data>
   <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
     <value>桌面模式</value>
   </data>
+  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
+    <value>桌面模式</value>
+  </data>
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>字体粗细</value>
   </data>
@@ -459,13 +463,10 @@
   <data name="SettingsPageLyricsExtraBlack.Content" xml:space="preserve">
     <value>超黑</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeWholeLyrics.Content" xml:space="preserve">
-    <value>全部歌词</value>
-  </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentLine.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentLine.Content" xml:space="preserve">
     <value>当前行</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentChar.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>当前字符</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
@@ -526,13 +527,13 @@
     <value>退出程序</value>
   </data>
   <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>解锁窗口（需要重新启动）</value>
+    <value>解锁窗口</value>
   </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>锁定</value>
   </data>
-  <data name="HostWindowLockToolTip.Content" xml:space="preserve">
-    <value>锁定后解锁，请转到系统托盘解锁</value>
+  <data name="HostWindowLockToolTip.Text" xml:space="preserve">
+    <value>锁定后解锁，请转到系统托盘解锁或按下</value>
   </data>
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>扇形歌词</value>
@@ -573,11 +574,11 @@
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>缓动动画类型</value>
   </data>
-  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
-    <value>媒体来源</value>
+  <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
+    <value>播放源</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Header" xml:space="preserve">
-    <value>媒体来源</value>
+    <value>播放源</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Description" xml:space="preserve">
     <value>为指定媒体源启用或禁用歌词显示</value>
@@ -609,10 +610,10 @@
   <data name="SettingsPageTranslationInfoLink.Text" xml:space="preserve">
     <value>访问 https://github.com/LibreTranslate/LibreTranslate 获取安装教程及更多信息（本软件与该翻译服务无任何联系）</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestSuccessInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>服务器测试成功</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestFailedInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestFailedInfo" xml:space="preserve">
     <value>服务器测试失败</value>
   </data>
   <data name="SettingsPageLyricsFontStrokeWidth.Header" xml:space="preserve">
@@ -652,6 +653,147 @@
     <value>未设置翻译服务器，请先在设置中进行配置</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Text" xml:space="preserve">
-    <value>切换歌曲时将自动重置为 0</value>
+    <value>切换歌曲时重置为 0</value>
+  </data>
+  <data name="SettingsPageTargetLanguage.Description" xml:space="preserve">
+    <value>将优先读取歌词内翻译，若无匹配则向 LibreTranslate 服务器请求机器翻译</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Header" xml:space="preserve">
+    <value>配置专辑封面源</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Description" xml:space="preserve">
+    <value>拖动排序，专辑封面搜索顺序将按以下顺序</value>
+  </data>
+  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
+    <value>专辑封面源</value>
+  </data>
+  <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
+    <value>本地音乐文件</value>
+  </data>
+  <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
+    <value>音乐播放器</value>
+  </data>
+  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
+    <value>媒体库</value>
+  </data>
+  <data name="SettingsPageScrollEasing.Header" xml:space="preserve">
+    <value>歌词滚动动画类型</value>
+  </data>
+  <data name="SettingsPageScrollDuration.Header" xml:space="preserve">
+    <value>歌词滚动动画持续时间</value>
+  </data>
+  <data name="SettingsPageEasingTypeLinear.Content" xml:space="preserve">
+    <value>线性</value>
+  </data>
+  <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
+    <value>平滑步进</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutSine.Content" xml:space="preserve">
+    <value>正弦缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuad.Content" xml:space="preserve">
+    <value>二次缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutElastic.Content" xml:space="preserve">
+    <value>弹性缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBack.Content" xml:space="preserve">
+    <value>回弹缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBounce.Content" xml:space="preserve">
+    <value>弹跳缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCirc.Content" xml:space="preserve">
+    <value>圆形缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutExpo.Content" xml:space="preserve">
+    <value>指数缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuint.Content" xml:space="preserve">
+    <value>五次缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuart.Content" xml:space="preserve">
+    <value>四次缓入缓出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCubic.Content" xml:space="preserve">
+    <value>三次缓入缓出</value>
+  </data>
+  <data name="SettingsPageLyricsRendingScopeLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>当前歌词开始到当前字符</value>
+  </data>
+  <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
+    <value>高亮显示范围</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
+    <value>歌词时间轴同步阈值</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
+    <value>当歌词进度抖动时，请尝试增加该阈值；更改此值会导致歌词同步有偏差</value>
+  </data>
+  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+    <value>QQ 反馈交流群</value>
+  </data>
+  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+    <value>Discord</value>
+  </data>
+  <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
+    <value>立即加入</value>
+  </data>
+  <data name="SettingsPageLyricsFloatAnimation.Header" xml:space="preserve">
+    <value>浮动动画</value>
+  </data>
+  <data name="SettingsPageScope.Header" xml:space="preserve">
+    <value>范围</value>
+  </data>
+  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
+    <value>解锁和锁定快捷键</value>
+  </data>
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
+    <value>LX 音乐服务器</value>
+  </data>
+  <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
+    <value>停靠模式位置</value>
+  </data>
+  <data name="SettingsPageDockPlacementTop.Content" xml:space="preserve">
+    <value>顶部</value>
+  </data>
+  <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
+    <value>底部</value>
+  </data>
+  <data name="LyricsPageTranslationEnabled.Header" xml:space="preserve">
+    <value>启用翻译</value>
+  </data>
+  <data name="LyricsPageTranslationOnly.Header" xml:space="preserve">
+    <value>仅显示翻译</value>
+  </data>
+  <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
+    <value>字体不透明度（非当前播放区域）</value>
+  </data>
+  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+    <value>常见问题与解答</value>
+  </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>无法连接到 LX 音乐服务器，请转到设置 - 高级选项以检查是否正确输入链接</value>
+  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自动隐藏窗口</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>停靠模式或桌面模式下，无歌曲正在播放时，自动隐藏窗口</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窗口高度</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌词字体</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>全局拖拽</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>将标题栏扩展至整个页面使得在任意非交互区域均可拖拽窗口</value>
+  </data>
+  <data name="MusicGalleryPageTitle" xml:space="preserve">
+    <value>音乐库</value>
   </data>
 </root>

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

@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
-    <value>本地音樂媒體庫</value>
+    <value>本地媒體庫</value>
   </data>
   <data name="SettingsPageMusicLib.Description" xml:space="preserve">
     <value>新增存放音樂或歌詞的資料夾</value>
@@ -280,7 +280,7 @@
     <value>關於</value>
   </data>
   <data name="SettingsPageLyricsLib.Content" xml:space="preserve">
-    <value>歌詞庫</value>
+    <value>歌詞源</value>
   </data>
   <data name="SettingsPageAppAppearance.Text" xml:space="preserve">
     <value>應用外觀</value>
@@ -288,11 +288,8 @@
   <data name="SettingsPageLyricsGlowEffect.Header" xml:space="preserve">
     <value>輝光效果</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScope.Header" xml:space="preserve">
-    <value>輝光效果作用範圍</value>
-  </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Header" xml:space="preserve">
-    <value>配置歌詞搜尋服務</value>
+    <value>配置歌詞源</value>
   </data>
   <data name="SettingsPageLyricsSearchProvidersConfig.Description" xml:space="preserve">
     <value>拖動排序，歌詞搜索順序將按以下順序</value>
@@ -304,13 +301,14 @@
     <value>歡迎使用 BetterLyrics</value>
   </data>
   <data name="MainPageWelcomeTeachingTip.Subtitle" xml:space="preserve">
-    <value>將鼠標懸停在應用程序的頂部或底部區域以顯示更多功能選項</value>
+    <value>單擊左上按鈕以啟用沉浸式模式。
+如果遇到任何問題，請轉到“設置”頁面，關於標籤，查看常見問題解答或聯繫作者以獲取反饋</value>
   </data>
   <data name="MainPageNoMusicPlaying.Text" xml:space="preserve">
     <value>目前沒有正在播放的音樂</value>
   </data>
   <data name="SettingsPageDev.Content" xml:space="preserve">
-    <value>開發者選項</value>
+    <value>高級選項</value>
   </data>
   <data name="SettingsPageMockMusicPlaying.Header" xml:space="preserve">
     <value>播放測試音樂</value>
@@ -337,7 +335,7 @@
     <value>適應歌詞背景（灰色）</value>
   </data>
   <data name="SettingsPageAlbumStyle.Content" xml:space="preserve">
-    <value>专辑区域样式</value>
+    <value>專輯區域樣式</value>
   </data>
   <data name="SettingsPageAlbumRadius.Header" xml:space="preserve">
     <value>圓角半徑</value>
@@ -420,9 +418,15 @@
   <data name="HostWindowDockFlyoutItem.Text" xml:space="preserve">
     <value>停靠模式</value>
   </data>
+  <data name="SettingsPageAppDock.Text" xml:space="preserve">
+    <value>停靠模式</value>
+  </data>
   <data name="HostWindowDesktopFlyoutItem.Text" xml:space="preserve">
     <value>桌面模式</value>
   </data>
+  <data name="SettingsPageAppDesktop.Text" xml:space="preserve">
+    <value>桌面模式</value>
+  </data>
   <data name="SettingsPageLyricsFontWeight.Header" xml:space="preserve">
     <value>字體粗細</value>
   </data>
@@ -459,13 +463,10 @@
   <data name="SettingsPageLyricsExtraBlack.Content" xml:space="preserve">
     <value>超黑</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeWholeLyrics.Content" xml:space="preserve">
-    <value>全部歌詞</value>
-  </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentLine.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentLine.Content" xml:space="preserve">
     <value>目前行</value>
   </data>
-  <data name="SettingsPageLyricsGlowEffectScopeCurrentChar.Content" xml:space="preserve">
+  <data name="SettingsPageLyricsRendingScopeCurrentChar.Content" xml:space="preserve">
     <value>目前字元</value>
   </data>
   <data name="HostWindowSettingsFlyoutItem.Text" xml:space="preserve">
@@ -526,13 +527,13 @@
     <value>退出程序</value>
   </data>
   <data name="SystemTrayUnlock.Text" xml:space="preserve">
-    <value>解鎖窗口（需要重新啟動）</value>
+    <value>解鎖窗口</value>
   </data>
   <data name="HostWindowClickThroughButton.Content" xml:space="preserve">
     <value>鎖定</value>
   </data>
-  <data name="HostWindowLockToolTip.Content" xml:space="preserve">
-    <value>鎖定後解鎖，請轉到系統托盤解鎖</value>
+  <data name="HostWindowLockToolTip.Text" xml:space="preserve">
+    <value>鎖定後解鎖，請轉到系統托盤解鎖或按下</value>
   </data>
   <data name="SettingsPageFan.Header" xml:space="preserve">
     <value>扇形歌詞</value>
@@ -573,11 +574,11 @@
   <data name="SettingsPageEasingFuncType.Header" xml:space="preserve">
     <value>缓动动画类型</value>
   </data>
-  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
-    <value>媒體來源</value>
+  <data name="SettingsPagePlaybackLib.Content" xml:space="preserve">
+    <value>播放來源</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Header" xml:space="preserve">
-    <value>媒體來源</value>
+    <value>播放來源</value>
   </data>
   <data name="SettingsPageMediaSourceProvidersConfig.Description" xml:space="preserve">
     <value>為指定媒體源啟用或禁用歌詞顯示</value>
@@ -609,10 +610,10 @@
   <data name="SettingsPageTranslationInfoLink.Text" xml:space="preserve">
     <value>造訪 https://github.com/LibreTranslate/LibreTranslate 以取得安裝教學及更多資訊（本軟體與此翻譯服務無任何關聯）</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestSuccessInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestSuccessInfo" xml:space="preserve">
     <value>服務器測試成功</value>
   </data>
-  <data name="SettingsPageLibreTranslateTestFailedInfo" xml:space="preserve">
+  <data name="SettingsPageServerTestFailedInfo" xml:space="preserve">
     <value>服務器測試失敗</value>
   </data>
   <data name="SettingsPageLyricsFontStrokeWidth.Header" xml:space="preserve">
@@ -652,6 +653,147 @@
     <value>未設定翻譯伺服器，請先在設定中進行配置</value>
   </data>
   <data name="LyricsPagePositionOffsetHint.Text" xml:space="preserve">
-    <value>將在切換歌曲時自動重設為 0</value>
+    <value>切換歌曲時重置為 0</value>
+  </data>
+  <data name="SettingsPageTargetLanguage.Description" xml:space="preserve">
+    <value>將優先讀取歌詞內翻譯，若無匹配則向 LibreTranslate 伺服器請求機器翻譯</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Header" xml:space="preserve">
+    <value>配置專輯封面源</value>
+  </data>
+  <data name="SettingsPageAlbumArtSearchProvidersConfig.Description" xml:space="preserve">
+    <value>拖曳排序，專輯封面搜尋順序將按以下順序</value>
+  </data>
+  <data name="SettingsPageAlbumLib.Content" xml:space="preserve">
+    <value>專輯封面來源</value>
+  </data>
+  <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
+    <value>本地音樂文件</value>
+  </data>
+  <data name="AlbumArtSearchSMTCProvider" xml:space="preserve">
+    <value>音樂播放器</value>
+  </data>
+  <data name="SettingsPageMediaLib.Content" xml:space="preserve">
+    <value>媒體庫</value>
+  </data>
+  <data name="SettingsPageScrollEasing.Header" xml:space="preserve">
+    <value>歌詞滾動動畫類型</value>
+  </data>
+  <data name="SettingsPageScrollDuration.Header" xml:space="preserve">
+    <value>歌詞滾動動畫持續時間</value>
+  </data>
+  <data name="SettingsPageEasingTypeLinear.Content" xml:space="preserve">
+    <value>線性</value>
+  </data>
+  <data name="SettingsPageEasingTypeSmoothStep.Content" xml:space="preserve">
+    <value>平滑步進</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutSine.Content" xml:space="preserve">
+    <value>正弦緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuad.Content" xml:space="preserve">
+    <value>二次緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutElastic.Content" xml:space="preserve">
+    <value>彈性緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBack.Content" xml:space="preserve">
+    <value>回彈緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutBounce.Content" xml:space="preserve">
+    <value>彈跳緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCirc.Content" xml:space="preserve">
+    <value>圓形緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutExpo.Content" xml:space="preserve">
+    <value>指數緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuint.Content" xml:space="preserve">
+    <value>五次緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutQuart.Content" xml:space="preserve">
+    <value>四次緩入緩出</value>
+  </data>
+  <data name="SettingsPageEasingTypeEaseInOutCubic.Content" xml:space="preserve">
+    <value>三次緩入緩出</value>
+  </data>
+  <data name="SettingsPageLyricsRendingScopeLineStartToCurrentChar.Content" xml:space="preserve">
+    <value>當前歌詞開始到當前字符</value>
+  </data>
+  <data name="SettingsPageLyricsHighlightScope.Header" xml:space="preserve">
+    <value>高亮顯示範圍</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Header" xml:space="preserve">
+    <value>歌詞時間軸同步閾值</value>
+  </data>
+  <data name="SettingsPageLyricsTimelineThreshold.Description" xml:space="preserve">
+    <value>當歌詞進度抖動時，請嘗試增加該閾值；更改此值會導致歌詞同步偏差</value>
+  </data>
+  <data name="SettingsPageQQGroup.Header" xml:space="preserve">
+    <value>QQ 回饋交流群</value>
+  </data>
+  <data name="SettingsPageDiscord.Header" xml:space="preserve">
+    <value>Discord</value>
+  </data>
+  <data name="SettingsPageJoinNowButton.Content" xml:space="preserve">
+    <value>立即加入</value>
+  </data>
+  <data name="SettingsPageLyricsFloatAnimation.Header" xml:space="preserve">
+    <value>浮動動畫</value>
+  </data>
+  <data name="SettingsPageScope.Header" xml:space="preserve">
+    <value>範圍</value>
+  </data>
+  <data name="SettingsPageLockHotKey.Header" xml:space="preserve">
+    <value>解鎖和鎖定快捷鍵</value>
+  </data>
+  <data name="SettingsPageLXMusicServer.Header" xml:space="preserve">
+    <value>LX 音樂服務器</value>
+  </data>
+  <data name="SettingsPageDockPlacement.Header" xml:space="preserve">
+    <value>停靠模式位置</value>
+  </data>
+  <data name="SettingsPageDockPlacementTop.Content" xml:space="preserve">
+    <value>頂部</value>
+  </data>
+  <data name="SettingsPageDockPlacementBottom.Content" xml:space="preserve">
+    <value>底部</value>
+  </data>
+  <data name="LyricsPageTranslationEnabled.Header" xml:space="preserve">
+    <value>啟用翻譯</value>
+  </data>
+  <data name="LyricsPageTranslationOnly.Header" xml:space="preserve">
+    <value>僅顯示翻譯</value>
+  </data>
+  <data name="SettingsPageLyricsBgFontOpacity.Header" xml:space="preserve">
+    <value>字體不透明度（非目前播放區域）</value>
+  </data>
+  <data name="SettingsPageFAQ.Header" xml:space="preserve">
+    <value>常見問題與解答</value>
+  </data>
+  <data name="FailToStartLXMusicServer" xml:space="preserve">
+    <value>無法連接到 LX 音樂服務器，請轉到設置 - 高級選項以檢查是否正確輸入鏈接</value>
+  </data>
+  <data name="SettingsPageHideWindow.Header" xml:space="preserve">
+    <value>自動隱藏窗口</value>
+  </data>
+  <data name="SettingsPageHideWindow.Description" xml:space="preserve">
+    <value>停靠模式或桌面模式下，無歌曲正在播放時，自動隱藏窗口</value>
+  </data>
+  <data name="SettingsPageDockWindowHeight.Header" xml:space="preserve">
+    <value>窗口高度</value>
+  </data>
+  <data name="SettingsPageLyricsFontFamily.Header" xml:space="preserve">
+    <value>歌詞字體</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Header" xml:space="preserve">
+    <value>全域拖曳</value>
+  </data>
+  <data name="SettingsPageGlobalDrag.Description" xml:space="preserve">
+    <value>將標題列擴展至整個頁面使得在任意非互動區域均可拖曳窗口</value>
+  </data>
+  <data name="MusicGalleryPageTitle" xml:space="preserve">
+    <value>音樂庫</value>
   </data>
 </root>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseViewModel.cs

@@ -7,22 +7,20 @@ using Microsoft.UI.Dispatching;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class BaseViewModel : ObservableRecipient, IDisposable
+    public partial class BaseViewModel : ObservableRecipient
     {
-        private protected readonly DispatcherQueue _dispatcherQueue =
-            DispatcherQueue.GetForCurrentThread();
+        private protected readonly DispatcherQueue _dispatcherQueue;
+
+        private protected readonly DispatcherQueueTimer _dispatcherQueueTimer;
 
         private protected readonly ISettingsService _settingsService;
 
         public BaseViewModel(ISettingsService settingsService)
         {
             IsActive = true;
+            _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            _dispatcherQueueTimer = _dispatcherQueue.CreateTimer();
             _settingsService = settingsService;
         }
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/BaseWindowViewModel.cs

@@ -11,8 +11,7 @@ using Microsoft.UI.Xaml;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class BaseWindowViewModel : BaseViewModel
+    public partial class BaseWindowViewModel(ISettingsService settingsService) : BaseViewModel(settingsService)
     {
-        public BaseWindowViewModel(ISettingsService settingsService) : base(settingsService) { }
     }
 }

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

@@ -9,41 +9,96 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
+using System;
 using System.Diagnostics;
+using System.Numerics;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class LyricsPageViewModel : BaseViewModel, IRecipient<PropertyChangedMessage<int>>, IRecipient<PropertyChangedMessage<bool>>
+    public partial class LyricsPageViewModel : BaseViewModel,
+        IRecipient<PropertyChangedMessage<bool>>,
+        IRecipient<PropertyChangedMessage<int>>,
+        IRecipient<PropertyChangedMessage<string>>,
+        IRecipient<PropertyChangedMessage<TimeSpan>>
     {
         private readonly IPlaybackService _playbackService;
-
-        private LyricsDisplayType? _preferredDisplayTypeBeforeSwitchToNonStandardMode;
+        private readonly ThrottleHelper _timelineThrottle = new(TimeSpan.FromSeconds(1));
 
         public LyricsPageViewModel(ISettingsService settingsService, IPlaybackService playbackService) : base(settingsService)
         {
-            LyricsFontSize = _settingsService.LyricsFontSize;
+            IsFirstRun = _settingsService.IsFirstRun;
             IsTranslationEnabled = _settingsService.IsTranslationEnabled;
-            PreferredDisplayType = _settingsService.PreferredDisplayType;
+            DisplayType = _settingsService.DisplayType;
+            ResetPositionOffsetOnSongChanged = _settingsService.ResetPositionOffsetOnSongChanged;
+            PositionOffset = _settingsService.PositionOffset;
+            IsImmersiveMode = _settingsService.IsImmersiveMode;
+            ShowTranslationOnly = _settingsService.ShowTranslationOnly;
+            LyricsFontSize = _settingsService.LyricsFontSize;
+            LyricsFontFamily = _settingsService.LyricsFontFamily;
+
+            OnIsImmersiveModeChanged(IsImmersiveMode);
+
+            //Volume = SystemVolumeHelper.GetMasterVolume();
+            //SystemVolumeHelper.VolumeChanged += SystemVolumeHelper_VolumeChanged;
 
             _playbackService = playbackService;
             _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
+            _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
 
+            IsSongPlaying = _playbackService.IsPlaying;
+        }
 
-            IsFirstRun = _settingsService.IsFirstRun;
+        //private void SystemVolumeHelper_VolumeChanged(int volume)
+        //{
+        //    Volume = volume;
+        //}
+
+        private void PlaybackService_IsPlayingChanged(object? sender, Events.IsPlayingChangedEventArgs e)
+        {
+            IsSongPlaying = e.IsPlaying;
         }
 
         private void PlaybackService_SongInfoChanged(object? sender, Events.SongInfoChangedEventArgs e)
         {
             SongInfo = e.SongInfo;
-            PositionOffset = 0; // Reset position offset when song changes
-            TrySwitchToPreferredDisplayType(e.SongInfo);
+            SongDurationSeconds = SongInfo?.Duration ?? 0;
+            if (ResetPositionOffsetOnSongChanged)
+            {
+                PositionOffset = 0;
+            }
         }
 
+        [ObservableProperty]
+        public partial double TimelinePositionSeconds { get; set; }
+
+        [ObservableProperty]
+        public partial int SongDurationSeconds { get; set; }
+
+        [ObservableProperty]
+        public partial int Volume { get; set; }
+
+        [ObservableProperty]
+        public partial string LyricsFontFamily { get; set; }
+
+        [ObservableProperty]
+        public partial int LyricsFontSize { get; set; }
+
+        [ObservableProperty]
+        public partial bool IsImmersiveMode { get; set; }
+
+        [ObservableProperty]
+        public partial float BottomCommandGridOpacity { get; set; }
+
+        [ObservableProperty]
+        public partial float BottomCommandFlyoutTriggerOpacity { get; set; }
+
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
-        public partial LyricsDisplayType DisplayType { get; set; } = LyricsDisplayType.PlaceholderOnly;
+        public partial LyricsDisplayType DisplayType { get; set; }
 
         [ObservableProperty]
         public partial bool IsFirstRun { get; set; }
@@ -51,35 +106,27 @@ namespace BetterLyrics.WinUI3.ViewModels
         [ObservableProperty]
         public partial bool IsWelcomeTeachingTipOpen { get; set; }
 
-        [ObservableProperty]
-        public partial Visibility BottomCommandGridVisibility { get; set; } = Visibility.Visible;
-
-        [ObservableProperty]
-        public partial int LyricsFontSize { get; set; }
-
-        [ObservableProperty]
-        public partial LyricsDisplayType PreferredDisplayType { get; set; }
-
         [ObservableProperty]
         public partial SongInfo? SongInfo { get; set; } = null;
 
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
-        public partial int PositionOffset { get; set; } = 0;
+        public partial int PositionOffset { get; set; }
 
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
-        public partial bool IsTranslationEnabled { get; set; } = false;
+        public partial bool IsTranslationEnabled { get; set; }
 
-        partial void OnIsTranslationEnabledChanged(bool value)
-        {
-            _settingsService.IsTranslationEnabled = value;
-        }
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool ShowTranslationOnly { get; set; }
 
-        partial void OnPreferredDisplayTypeChanged(LyricsDisplayType value)
-        {
-            _settingsService.PreferredDisplayType = value;
-        }
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool ResetPositionOffsetOnSongChanged { get; set; }
+
+        [ObservableProperty]
+        public partial bool IsSongPlaying { get; set; }
 
         public void Receive(PropertyChangedMessage<bool> message)
         {
@@ -87,17 +134,98 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 if (message.PropertyName == nameof(LyricsWindowViewModel.IsDockMode))
                 {
-                    SetNonStandardModePreferredDisplayType(message.NewValue);
-                    TrySwitchToPreferredDisplayType(SongInfo);
+                    if (message.NewValue)
+                    {
+                        DisplayType = LyricsDisplayType.LyricsOnly;
+                    }
+                    else
+                    {
+                        DisplayType = _settingsService.DisplayType;
+                    }
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                 {
-                    SetNonStandardModePreferredDisplayType(message.NewValue);
-                    TrySwitchToPreferredDisplayType(SongInfo);
+                    if (message.NewValue)
+                    {
+                        DisplayType = LyricsDisplayType.LyricsOnly;
+                    }
+                    else
+                    {
+                        DisplayType = _settingsService.DisplayType;
+                    }
+                }
+                else if (message.PropertyName == nameof(LyricsWindowViewModel.IsImmersiveMode))
+                {
+                    IsImmersiveMode = message.NewValue;
                 }
             }
         }
 
+        [RelayCommand]
+        private static void OpenSettingsWindow()
+        {
+            WindowHelper.OpenWindow<SettingsWindow>();
+        }
+
+        [RelayCommand]
+        private async Task PlaySongAsync()
+        {
+            await _playbackService.PlayAsync();
+        }
+
+        [RelayCommand]
+        private async Task PauseSongAsync()
+        {
+            await _playbackService.PauseAsync();
+        }
+
+        [RelayCommand]
+        private async Task PreviousSongAsync()
+        {
+            await _playbackService.PreviousAsync();
+        }
+
+        [RelayCommand]
+        private async Task NextSongAsync()
+        {
+            await _playbackService.NextAsync();
+        }
+
+        partial void OnIsFirstRunChanged(bool value)
+        {
+            IsWelcomeTeachingTipOpen = value;
+            _settingsService.IsFirstRun = false;
+        }
+
+        partial void OnIsTranslationEnabledChanged(bool value)
+        {
+            _settingsService.IsTranslationEnabled = value;
+        }
+
+        partial void OnPositionOffsetChanged(int value)
+        {
+            _settingsService.PositionOffset = value;
+        }
+
+        partial void OnIsImmersiveModeChanged(bool value)
+        {
+            if (value)
+            {
+                BottomCommandGridOpacity = 0f;
+                BottomCommandFlyoutTriggerOpacity = 0f;
+            }
+            else
+            {
+                BottomCommandGridOpacity = 1f;
+                BottomCommandFlyoutTriggerOpacity = 1f;
+            }
+        }
+
+        partial void OnShowTranslationOnlyChanged(bool value)
+        {
+            _settingsService.ShowTranslationOnly = value;
+        }
+
         public void Receive(PropertyChangedMessage<int> message)
         {
             if (message.Sender is SettingsPageViewModel)
@@ -109,50 +237,37 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
         }
 
-        [RelayCommand]
-        private void OpenSettingsWindow()
+        public void Receive(PropertyChangedMessage<string> message)
         {
-            WindowHelper.OpenOrShowWindow<SettingsWindow>();
-        }
-
-        private void SetNonStandardModePreferredDisplayType(bool isEnabled)
-        {
-            if (isEnabled)
+            if (message.Sender is SettingsPageViewModel)
             {
-                _preferredDisplayTypeBeforeSwitchToNonStandardMode = PreferredDisplayType;
-                PreferredDisplayType = LyricsDisplayType.LyricsOnly;
-            }
-            else
-            {
-                PreferredDisplayType = _preferredDisplayTypeBeforeSwitchToNonStandardMode ?? LyricsDisplayType.SplitView;
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontFamily))
+                {
+                    LyricsFontFamily = message.NewValue;
+                }
             }
         }
 
-        private void TrySwitchToPreferredDisplayType(SongInfo? songInfo)
+        //partial void OnVolumeChanged(int value)
+        //{
+        //    SystemVolumeHelper.SetMasterVolume(value);
+        //}
+
+        public void Receive(PropertyChangedMessage<TimeSpan> message)
         {
-            LyricsDisplayType displayType;
-
-            if (songInfo == null)
+            if (message.Sender is LyricsRendererViewModel)
             {
-                displayType = LyricsDisplayType.PlaceholderOnly;
+                if (message.PropertyName == nameof(LyricsRendererViewModel.TotalTime))
+                {
+                    if (_timelineThrottle.CanTrigger())
+                    {
+                        _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                        {
+                            TimelinePositionSeconds = message.NewValue.TotalSeconds;
+                        });
+                    }
+                }
             }
-            else if (PreferredDisplayType is LyricsDisplayType preferredDisplayType)
-            {
-                displayType = preferredDisplayType;
-            }
-            else
-            {
-                displayType = LyricsDisplayType.SplitView;
-            }
-
-            DisplayType = displayType;
-
-        }
-
-        partial void OnIsFirstRunChanged(bool value)
-        {
-            IsWelcomeTeachingTipOpen = value;
-            _settingsService.IsFirstRun = false;
         }
     }
 }

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

@@ -0,0 +1,75 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class LyricsRendererViewModel
+    {
+        public LyricsRendererViewModel(ISettingsService settingsService, IPlaybackService playbackService, ILyricsSearchService musicSearchService, ILibWatcherService libWatcherService, ITranslateService libreTranslateService) : base(settingsService)
+        {
+            _lyrcsSearchService = musicSearchService;
+            _playbackService = playbackService;
+            _libWatcherService = libWatcherService;
+            _translateService = libreTranslateService;
+
+            _logger = Ioc.Default.GetRequiredService<ILogger<LyricsRendererViewModel>>();
+
+            _albumArtCornerRadius = _settingsService.CoverImageRadius;
+            _isDynamicCoverOverlayEnabled = _settingsService.IsDynamicCoverOverlayEnabled;
+            _albumArtBgOpacity = _settingsService.CoverOverlayOpacity;
+            _albumArtBgBlurAmount = _settingsService.CoverOverlayBlurAmount;
+
+            _lyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
+            _lyricsFgFontColorType = _settingsService.LyricsFgFontColorType;
+
+            _lyricsTextFormat.FontWeight = _settingsService.LyricsFontWeight.ToFontWeight();
+
+            _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = _settingsService.LyricsFontFamily;
+
+            _lyricsAlignmentType = _settingsService.LyricsAlignmentType;
+            _lyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
+            _lyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
+            _lyricsFontSize = _settingsService.LyricsFontSize;
+            _lyricsBlurAmount = _settingsService.LyricsBlurAmount;
+            _isLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
+            _lyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
+            _lyricsHighlightScope = _settingsService.LyricsHighlightScope;
+
+            _customBgFontColor = _settingsService.LyricsCustomBgFontColor;
+            _customFgFontColor = _settingsService.LyricsCustomFgFontColor;
+
+            _lyricsBgTheme = _settingsService.LyricsBackgroundTheme;
+
+            _isFanLyricsEnabled = _settingsService.IsFanLyricsEnabled;
+            _lyricsFontStrokeWidth = _settingsService.LyricsFontStrokeWidth;
+            _isTranslationEnabled = _settingsService.IsTranslationEnabled;
+            _showTranslationOnly = _settingsService.ShowTranslationOnly;
+            _targetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
+            _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment = _settingsService.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
+
+            _timelineSyncThreshold = _settingsService.TimelineSyncThreshold;
+
+            _canvasYScrollTransition.SetDuration(_settingsService.LyricsScrollDuration / 1000f);
+            _canvasYScrollTransition.SetEasingType(_settingsService.LyricsScrollEasingType);
+            _defaultOpacity = _settingsService.LyricsBgFontOpacity / 100f;
+
+            _isLyricsFloatAnimationEnabled = _settingsService.IsLyricsFloatAnimationEnabled;
+            _displayType = _displayTypeReceived = _settingsService.DisplayType;
+
+            _libWatcherService.MusicLibraryFilesChanged +=
+                LibWatcherService_MusicLibraryFilesChanged;
+
+            _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
+            _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
+            _playbackService.AlbumArtChangedChanged += PlaybackService_AlbumArtChangedChanged;
+            _playbackService.PositionChanged += PlaybackService_PositionChanged;
+
+            _isPlaying = _playbackService.IsPlaying;
+
+            UpdateColorConfig();
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Models;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Brushes;
 using Microsoft.Graphics.Canvas.Effects;
@@ -8,17 +7,12 @@ using Microsoft.Graphics.Canvas.Geometry;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
-using Microsoft.UI.Text;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Media;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Windows.Foundation;
-using Windows.Graphics.Imaging;
 using Windows.UI;
-using Windows.UI.Text;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -44,63 +38,65 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             using var combined = new CanvasCommandList(control);
             using var combinedDs = combined.CreateDrawingSession();
-            DrawAlbumArtBackground(control, combinedDs);
+
             if (_isDockMode)
             {
-                DrawImmersiveBackground(control, combinedDs);
+                DrawImmersiveBackground(control, combinedDs, 0f);
             }
-            combinedDs.DrawImage(blurredLyrics);
-
-            if (_isDesktopMode)
+            else if (_isDesktopMode)
             {
-                ds.DrawImage(blurredLyrics);
+                DrawImmersiveBackground(control, combinedDs, 0f);
             }
             else
             {
-                ds.DrawImage(combined);
+                DrawAlbumArtBackground(control, combinedDs);
             }
 
+            combinedDs.DrawImage(blurredLyrics);
+
+            ds.DrawImage(combined);
+
             DrawAlbumArt(control, ds);
             DrawTitleAndArtist(control, ds);
 
             if (_isDebugOverlayEnabled)
             {
-                var currentPlayingLine = _multiLangLyrics
-                    .SafeGet(_langIndex)
-                    ?.SafeGet(_playingLineIndex);
+                var currentPlayingLine = _lyricsDataArr
+                    .ElementAtOrDefault(_langIndex)
+                    ?.LyricsLines.ElementAtOrDefault(_playingLineIndex);
 
                 if (currentPlayingLine != null)
                 {
                     GetLinePlayingProgress(
-                        currentPlayingLine,
+                        _playingLineIndex,
                         out int charStartIndex,
                         out int charLength,
                         out float charProgress
                     );
 
-                    //ds.DrawText(
-                    //    $"[DEBUG]\n" +
-                    //        $"Cur playing {_playingLineIndex}, char start idx {charStartIndex}, length {charLength}, prog {charProgress}\n" +
-                    //        $"Visible lines [{_startVisibleLineIndex}, {_endVisibleLineIndex}]\n" +
-                    //        $"Cur time {_totalTime + _positionOffset}\n" +
-                    //        $"Lang size {_multiLangLyrics.Count}\n" +
-                    //        $"Song duration {TimeSpan.FromMilliseconds(SongInfo?.DurationMs ?? 0)}",
-                    //    new Vector2(10, 10),
-                    //    ThemeTypeSent == Microsoft.UI.Xaml.ElementTheme.Light ? Colors.Black : Colors.White
-                    //);
+                    ds.DrawText(
+                        $"[DEBUG]\n" +
+                            $"Cur playing {_playingLineIndex}, char start idx {charStartIndex}, length {charLength}, prog {charProgress}\n" +
+                            $"Visible lines [{_startVisibleLineIndex}, {_endVisibleLineIndex}]\n" +
+                            $"Cur time {TotalTime + _positionOffset}\n" +
+                            $"Lang size {_lyricsDataArr.Count}\n" +
+                            $"Song duration {TimeSpan.FromMilliseconds(SongInfo?.DurationMs ?? 0)}",
+                        new Vector2(10, 10),
+                        ThemeTypeSent == Microsoft.UI.Xaml.ElementTheme.Light ? Colors.Black : Colors.White
+                    );
 
-                    for (int i = _startVisibleLineIndex; i <= _endVisibleLineIndex; i++)
-                    {
-                        LyricsLine? line = _multiLangLyrics.SafeGet(_langIndex)?.SafeGet(i);
-                        if (line != null)
-                        {
-                            ds.DrawText(
-                                $"[{i}] {line.OriginalText} {line.HighlightOpacityTransition.Value}",
-                                new Vector2(10, 30 + (i - _startVisibleLineIndex) * 20),
-                                ThemeTypeSent == ElementTheme.Light ? Colors.Black : Colors.White
-                            );
-                        }
-                    }
+                    //for (int i = _startVisibleLineIndex; i <= _endVisibleLineIndex; i++)
+                    //{
+                    //    LyricsLine? line = _multiLangLyrics.SafeGet(_langIndex)?.SafeGet(i);
+                    //    if (line != null)
+                    //    {
+                    //        ds.DrawText(
+                    //            $"[{i}] {line.OriginalText} {line.HighlightOpacityTransition.Value}",
+                    //            new Vector2(10, 30 + (i - _startVisibleLineIndex) * 20),
+                    //            ThemeTypeSent == ElementTheme.Light ? Colors.Black : Colors.White
+                    //        );
+                    //    }
+                    //}
                 }
             }
         }
@@ -110,18 +106,19 @@ namespace BetterLyrics.WinUI3.ViewModels
             float imageWidth = (float)canvasBitmap.Size.Width;
             float imageHeight = (float)canvasBitmap.Size.Height;
 
-            float scaleFactor = MathF.Sqrt(MathF.Pow(_canvasWidth, 2) + MathF.Pow(_canvasHeight, 2)) / MathF.Min(imageWidth, imageHeight);
+            float targetSize = MathF.Sqrt(MathF.Pow(_canvasWidth, 2) + MathF.Pow(_canvasHeight, 2)) * 1.4f;
+            float scaleFactor = targetSize / MathF.Min(imageWidth, imageHeight);
 
             float x = _canvasWidth / 2 - imageWidth * scaleFactor / 2;
             float y = _canvasHeight / 2 - imageHeight * scaleFactor / 2;
 
-            // Source: https://zhuanlan.zhihu.com/p/37178216
-            float bright = _lyricsBgBrightnessTransition.Value / 1f * 2f; // 明度参数，范围在0.0f到2.0f之间
+            // Original source: https://zhuanlan.zhihu.com/p/37178216
+            float gain = _lyricsBgBrightnessTransition.Value;
 
-            float whiteX = Math.Min(2 - bright, 1);
-            float whiteY = 1f;
-            float blackX = Math.Max(1 - bright, 0);
-            float blackY = 0f;
+            float whiteX = 1 - 0.5f * gain;
+            float whiteY = 0.5f + 0.5f * gain;
+            float blackX = 0.5f - 0.5f * gain;
+            float blackY = 0 + 0.5f * gain;
 
             ds.DrawImage(new OpacityEffect
             {
@@ -136,8 +133,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                     BlackPoint = new Vector2(blackX, blackY),
                 },
                 Opacity = opacity,
-            }, new Vector2(x, y)
-            );
+            }, new Vector2(x, y));
         }
 
         private void DrawForegroundImgae(ICanvasAnimatedControl control, CanvasDrawingSession ds, CanvasBitmap canvasBitmap, float opacity)
@@ -193,11 +189,13 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             using var coverOverlayEffect = new OpacityEffect
             {
-                Opacity = CoverOverlayOpacity / 100f,
+                Opacity = _albumArtBgOpacity / 100f,
                 Source = new GaussianBlurEffect
                 {
-                    BlurAmount = CoverOverlayBlurAmount,
+                    BlurAmount = _albumArtBgBlurAmount,
                     Source = overlappedCovers,
+                    BorderMode = EffectBorderMode.Soft,
+                    Optimization = EffectOptimization.Speed,
                 },
             };
             ds.DrawImage(coverOverlayEffect);
@@ -269,9 +267,9 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void DrawBlurredLyrics(ICanvasAnimatedControl control, CanvasDrawingSession ds)
         {
-            var currentPlayingLine = _multiLangLyrics
-                .SafeGet(_langIndex)
-                ?.SafeGet(_playingLineIndex);
+            var currentPlayingLine = _lyricsDataArr
+                .ElementAtOrDefault(_langIndex)
+                ?.LyricsLines.ElementAtOrDefault(_playingLineIndex);
 
             if (currentPlayingLine == null)
             {
@@ -280,34 +278,23 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             for (int i = _startVisibleLineIndex; i <= _endVisibleLineIndex; i++)
             {
-                var line = _multiLangLyrics.SafeGet(_langIndex)?.SafeGet(i);
-
-                if (line == null)
-                {
-                    continue;
-                }
+                var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i);
+                if (line == null) continue;
 
                 var textLayout = line.CanvasTextLayout;
-
-                if (textLayout == null)
-                {
-                    continue;
-                }
+                if (textLayout == null) continue;
 
                 var position = new Vector2(line.Position.X, line.Position.Y);
 
                 float layoutWidth = (float)textLayout.LayoutBounds.Width;
                 float layoutHeight = (float)textLayout.LayoutBounds.Height;
 
-                if (layoutWidth <= 0 || layoutHeight <= 0)
-                {
-                    continue;
-                }
+                if (layoutWidth <= 0 || layoutHeight <= 0) continue;
 
                 float centerX = position.X;
                 float centerY = position.Y + layoutHeight / 2;
 
-                switch (LyricsAlignmentType)
+                switch (_lyricsAlignmentType)
                 {
                     case TextAlignmentType.Left:
                         textLayout.HorizontalAlignment = CanvasHorizontalAlignment.Left;
@@ -324,11 +311,14 @@ namespace BetterLyrics.WinUI3.ViewModels
                         break;
                 }
 
+                float xOffset = _lyricsXTransition.Value;
+                float yOffset = _canvasYScrollTransition.Value + _canvasHeight / 2;
+
                 // 组合变换：缩放 -> 旋转 -> 平移
                 ds.Transform =
                     Matrix3x2.CreateScale(line.ScaleTransition.Value, new Vector2(centerX, centerY))
                     * Matrix3x2.CreateRotation(line.AngleTransition.Value, currentPlayingLine.Position)
-                    * Matrix3x2.CreateTranslation(_lyricsXTransition.Value, _canvasYScrollTransition.Value + _canvasHeight / 2);
+                    * Matrix3x2.CreateTranslation(xOffset, yOffset);
 
                 // Create the background lyrics line with stroke and fill
                 using var bgLyrics = new CanvasCommandList(control.Device);
@@ -339,22 +329,23 @@ namespace BetterLyrics.WinUI3.ViewModels
                 using var fgLyricsDs = fgLyrics.CreateDrawingSession();
 
                 // 创建文字几何体
-                using (var textGeometry = CanvasGeometry.CreateText(textLayout))
+                using var textGeometry = CanvasGeometry.CreateText(textLayout);
+                if (_isDesktopMode)
                 {
-                    if (_isDesktopMode)
-                    {
-                        bgLyricsDs.DrawGeometry(textGeometry, position, _strokeFontColor, _lyricsFontStrokeWidth); // 背景描边
-                        fgLyricsDs.DrawGeometry(textGeometry, position, _strokeFontColor, _lyricsFontStrokeWidth); // 前景描边
-                    }
-
-                    bgLyricsDs.FillGeometry(textGeometry, position, _bgFontColor); // 背景填充
-                    fgLyricsDs.FillGeometry(textGeometry, position, _fgFontColor); // 前景填充
+                    bgLyricsDs.DrawGeometry(textGeometry, position, _strokeFontColor, _lyricsFontStrokeWidth); // 背景描边
+                    fgLyricsDs.DrawGeometry(textGeometry, position, _strokeFontColor, _lyricsFontStrokeWidth); // 前景描边
                 }
 
+                bgLyricsDs.FillGeometry(textGeometry, position, _bgFontColor); // 背景填充
+                fgLyricsDs.FillGeometry(textGeometry, position, _fgFontColor); // 前景填充
+
+                using var combined = new CanvasCommandList(control.Device);
+                using var combinedDs = combined.CreateDrawingSession();
+
                 // Mock gradient blurred lyrics layer
                 // 先铺一层带默认透明度的已经加了模糊效果的歌词作为最底层（背景歌词层次）
                 // Current line will not be blurred
-                ds.DrawImage(
+                combinedDs.DrawImage(
                     new GaussianBlurEffect
                     {
                         Source = new OpacityEffect { Source = bgLyrics, Opacity = line.OpacityTransition.Value * _lyricsOpacityTransition.Value },
@@ -376,7 +367,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                     if (i == _playingLineIndex)
                     {
                         GetLinePlayingProgress(
-                            line,
+                            i,
                             out int charStartIndex,
                             out int charLength,
                             out float charProgress
@@ -397,7 +388,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                                     region.LayoutBounds.Width,
                                     region.LayoutBounds.Height
                                 );
-                                maskDs.FillRectangle(rect, Colors.Black);
+                                maskDs.FillRectangle(rect, Color.FromArgb(255, 128, 128, 128));
                             }
                         }
 
@@ -442,7 +433,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                             fadingWidth
                         );
 
-                        maskDs.FillRectangle(highlightRect, Colors.White);
+                        maskDs.FillRectangle(highlightRect, Color.FromArgb(255, 128, 128, 128));
                         maskDs.FillRectangle(fadeOutRect, fadeOutBrush);
 
                         highlightMaskDs.FillRectangle(fadeInRect, fadeInBrush);
@@ -451,7 +442,8 @@ namespace BetterLyrics.WinUI3.ViewModels
                     else
                     {
                         float height = 0f;
-                        var regions = textLayout.GetCharacterRegions(0, string.Join("", line.CharTimings.Select(x => x.Text)).Length);
+                        //var regions = textLayout.GetCharacterRegions(0, string.Join("", line.LyricsChars.Select(x => x.Text)).Length);
+                        var regions = textLayout.GetCharacterRegions(0, line.OriginalText.Length);
                         if (regions.Length > 0)
                         {
                             height = (float)regions[^1].LayoutBounds.Bottom - (float)regions[0].LayoutBounds.Top;
@@ -468,21 +460,21 @@ namespace BetterLyrics.WinUI3.ViewModels
                         );
                     }
 
-                    ds.DrawImage(
-                        new OpacityEffect
+                    using var opacityEffect = new OpacityEffect
+                    {
+                        Source = new BlendEffect
                         {
-                            Source = new BlendEffect
-                            {
-                                Background = IsLyricsGlowEffectEnabled
+                            Background = _isLyricsGlowEffectEnabled
                                     ? new GaussianBlurEffect
                                     {
                                         Source = new AlphaMaskEffect
                                         {
                                             Source = fgLyrics,
-                                            AlphaMask = LyricsGlowEffectScope switch
+                                            AlphaMask = _lyricsGlowEffectScope switch
                                             {
-                                                LineRenderingType.UntilCurrentChar => mask,
-                                                LineRenderingType.CurrentCharOnly => highlightMask,
+                                                LineRenderingType.CurrentChar => highlightMask,
+                                                LineRenderingType.LineStartToCurrentChar => mask,
+                                                LineRenderingType.CurrentLine => fgLyrics,
                                                 _ => mask,
                                             },
                                         },
@@ -490,15 +482,49 @@ namespace BetterLyrics.WinUI3.ViewModels
                                         Optimization = EffectOptimization.Quality,
                                     }
                                     : new CanvasCommandList(control.Device),
-                                Foreground = new AlphaMaskEffect
+                            Foreground = new AlphaMaskEffect
+                            {
+                                Source = fgLyrics,
+                                AlphaMask = _lyricsHighlightScope switch
                                 {
-                                    Source = fgLyrics,
-                                    AlphaMask = mask,
+                                    LineRenderingType.CurrentChar => highlightMask,
+                                    LineRenderingType.LineStartToCurrentChar => mask,
+                                    LineRenderingType.CurrentLine => fgLyrics,
+                                    _ => mask,
                                 },
                             },
-                            Opacity = line.HighlightOpacityTransition.Value * _lyricsOpacityTransition.Value,
+                        },
+                        Opacity = line.HighlightOpacityTransition.Value * _lyricsOpacityTransition.Value,
+                    };
+
+                    combinedDs.DrawImage(opacityEffect);
+
+                    if (i == _playingLineIndex)
+                    {
+                        if (_isLyricsFloatAnimationEnabled)
+                        {
+                            ds.DrawImage(new DisplacementMapEffect
+                            {
+                                Source = combined,
+                                Displacement = mask,
+                                XChannelSelect = EffectChannelSelect.Red,
+                                YChannelSelect = EffectChannelSelect.Alpha,
+                                Amount = 1f
+                            });
                         }
-                    );
+                        else
+                        {
+                            ds.DrawImage(combined);
+                        }
+                    }
+                    else
+                    {
+                        ds.DrawImage(combined);
+                    }
+                }
+                else
+                {
+                    ds.DrawImage(combined);
                 }
 
                 // Reset scale
@@ -506,41 +532,21 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
         }
 
-        private void DrawImmersiveBackground(
-            ICanvasAnimatedControl control,
-            CanvasDrawingSession ds,
-            bool withGradient = true
-        )
+        private void DrawImmersiveBackground(ICanvasAnimatedControl control, CanvasDrawingSession ds, float radius)
         {
-            ds.FillRectangle(
+            CanvasCommandList list = new(control.Device);
+            using var listDs = list.CreateDrawingSession();
+            listDs.FillRoundedRectangle(
                 new Rect(0, 0, _canvasWidth, _canvasHeight),
-                new CanvasLinearGradientBrush(
-                    control,
-                    [
-                        new CanvasGradientStop
-                        {
-                            Position = 0f,
-                            Color = withGradient
-                                ? Color.FromArgb(
-                                    211,
-                                    _immersiveBgTransition.Value.R,
-                                    _immersiveBgTransition.Value.G,
-                                    _immersiveBgTransition.Value.B
-                                )
-                                : _immersiveBgTransition.Value,
-                        },
-                        new CanvasGradientStop
-                        {
-                            Position = 1,
-                            Color = _immersiveBgTransition.Value,
-                        },
-                    ]
-                )
-                {
-                    StartPoint = new Vector2(0, 0),
-                    EndPoint = new Vector2(0, _canvasHeight),
-                }
+                radius,
+                radius,
+                _immersiveBgTransition.Value
             );
+            ds.DrawImage(new OpacityEffect
+            {
+                Source = list,
+                Opacity = _immersiveBgOpacityTransition.Value
+            });
         }
 
         private CanvasLinearGradientBrush GetHorizontalFillBrush(
@@ -556,7 +562,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                     .Select(stops => new CanvasGradientStop
                     {
                         Position = stops.position,
-                        Color = Color.FromArgb((byte)(stops.opacity * 255), 0, 0, 0),
+                        Color = Color.FromArgb((byte)(stops.opacity * 255), 128, 128, 128),
                     })
                     .ToArray()
             )

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

@@ -6,12 +6,14 @@ using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.ObjectModel;
+using System.Threading.Tasks;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
     public partial class LyricsRendererViewModel
         : IRecipient<PropertyChangedMessage<int>>,
+            IRecipient<PropertyChangedMessage<string>>,
             IRecipient<PropertyChangedMessage<float>>,
             IRecipient<PropertyChangedMessage<bool>>,
             IRecipient<PropertyChangedMessage<Color>>,
@@ -21,18 +23,22 @@ namespace BetterLyrics.WinUI3.ViewModels
             IRecipient<PropertyChangedMessage<LyricsFontWeight>>,
             IRecipient<PropertyChangedMessage<LineRenderingType>>,
             IRecipient<PropertyChangedMessage<ElementTheme>>,
+            IRecipient<PropertyChangedMessage<EasingType>>,
             IRecipient<PropertyChangedMessage<ObservableCollection<LyricsSearchProviderInfo>>>,
-            IRecipient<PropertyChangedMessage<ObservableCollection<LocalLyricsFolder>>>
+            IRecipient<PropertyChangedMessage<ObservableCollection<LocalMediaFolder>>>
     {
-        public void Receive(PropertyChangedMessage<ObservableCollection<LocalLyricsFolder>> message)
+        public void Receive(PropertyChangedMessage<ObservableCollection<LocalMediaFolder>> message)
         {
             if (message.Sender is SettingsPageViewModel)
             {
-                if (message.PropertyName == nameof(SettingsPageViewModel.LocalLyricsFolders))
+                if (message.PropertyName == nameof(SettingsPageViewModel.LocalMediaFolders))
                 {
                     // Music lib changed, re-fetch lyrics
                     _logger.LogInformation("Local lyrics folders changed, refreshing lyrics.");
-                    RefreshLyricsAsync();
+                    _ = _refreshLyricsRunner.RunAsync(async tokne =>
+                    {
+                        await RefreshLyricsAsync(tokne);
+                    });
                 }
             }
         }
@@ -45,20 +51,21 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     // Lyrics search providers info changed, re-fetch lyrics
                     _logger.LogInformation("Lyrics search providers info changed, refreshing lyrics.");
-                    RefreshLyricsAsync();
+                    _ = _refreshLyricsRunner.RunAsync(async token =>
+                    {
+                        await RefreshLyricsAsync(token);
+                    });
                 }
             }
         }
 
-        // Receive methods for handling messages from other view models
-
         public void Receive(PropertyChangedMessage<bool> message)
         {
             if (message.Sender is SettingsPageViewModel)
             {
                 if (message.PropertyName == nameof(SettingsPageViewModel.IsDynamicCoverOverlayEnabled))
                 {
-                    IsDynamicCoverOverlayEnabled = message.NewValue;
+                    _isDynamicCoverOverlayEnabled = message.NewValue;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.IsDebugOverlayEnabled))
                 {
@@ -66,23 +73,41 @@ namespace BetterLyrics.WinUI3.ViewModels
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.IsLyricsGlowEffectEnabled))
                 {
-                    IsLyricsGlowEffectEnabled = message.NewValue;
+                    _isLyricsGlowEffectEnabled = message.NewValue;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.IsFanLyricsEnabled))
                 {
                     _isFanLyricsEnabled = message.NewValue;
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.IsLyricsFloatAnimationEnabled))
+                {
+                    _isLyricsFloatAnimationEnabled = message.NewValue;
+                }
             }
             else if (message.Sender is LyricsWindowViewModel)
             {
                 if (message.PropertyName == nameof(LyricsWindowViewModel.IsDockMode))
                 {
                     _isDockMode = message.NewValue;
+                    UpdateColorConfig();
+                    UpdateImmersiveBackgroundOpacity();
                 }
                 else if (message.PropertyName == nameof(LyricsWindowViewModel.IsDesktopMode))
                 {
                     _isDesktopMode = message.NewValue;
+                    UpdateColorConfig();
+                    UpdateImmersiveBackgroundOpacity();
+                }
+                else if (message.PropertyName == nameof(LyricsWindowViewModel.IsLyricsWindowLocked))
+                {
+                    _isLyricsWindowLocked = message.NewValue;
+                    UpdateImmersiveBackgroundOpacity();
+                }
+                else if (message.PropertyName == nameof(LyricsWindowViewModel.IsMouseWithinWindow))
+                {
+                    _isMouseWithinWindow = message.NewValue;
+                    UpdateImmersiveBackgroundOpacity();
                 }
             }
             else if (message.Sender is LyricsPageViewModel)
@@ -91,7 +116,12 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     _isTranslationEnabled = message.NewValue;
                     _logger.LogInformation("Translation enabled state changed: {IsEnabled}", _isTranslationEnabled);
-                    UpdateTranslationsAsync();
+                    UpdateTranslations();
+                }
+                else if (message.PropertyName == nameof(LyricsPageViewModel.ShowTranslationOnly))
+                {
+                    _showTranslationOnly = message.NewValue;
+                    UpdateTranslations();
                 }
             }
         }
@@ -104,7 +134,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 {
                     _immersiveBgTransition.StartTransition(message.NewValue);
                     _environmentalColor = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
             }
             else if (message.Sender is SettingsPageViewModel)
@@ -112,17 +142,17 @@ namespace BetterLyrics.WinUI3.ViewModels
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsCustomBgFontColor))
                 {
                     _customBgFontColor = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsCustomFgFontColor))
                 {
                     _customFgFontColor = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsCustomStrokeFontColor))
                 {
                     _customStrokeFontColor = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
             }
         }
@@ -133,7 +163,8 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsLineSpacingFactor))
                 {
-                    LyricsLineSpacingFactor = message.NewValue;
+                    _lyricsLineSpacingFactor = message.NewValue;
+                    _isLayoutChanged = true;
                 }
             }
         }
@@ -148,36 +179,50 @@ namespace BetterLyrics.WinUI3.ViewModels
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.CoverOverlayOpacity))
                 {
-                    CoverOverlayOpacity = message.NewValue;
+                    _albumArtBgOpacity = message.NewValue;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.CoverOverlayBlurAmount))
                 {
-                    CoverOverlayBlurAmount = message.NewValue;
+                    _albumArtBgBlurAmount = message.NewValue;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsVerticalEdgeOpacity))
                 {
-                    LyricsVerticalEdgeOpacity = message.NewValue;
+                    _lyricsVerticalEdgeOpacity = message.NewValue;
                     _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsBlurAmount))
                 {
-                    LyricsBlurAmount = message.NewValue;
+                    _lyricsBlurAmount = message.NewValue;
                     _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
                 {
-                    LyricsFontSize = message.NewValue;
+                    _lyricsFontSize = message.NewValue;
+                    _isLayoutChanged = true;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.SelectedTargetLanguageIndex))
                 {
                     _targetLanguageIndex = message.NewValue;
                     _logger.LogInformation("Target language index changed: {Index}", _targetLanguageIndex);
-                    UpdateTranslationsAsync();
+                    UpdateTranslations();
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontStrokeWidth))
                 {
                     _lyricsFontStrokeWidth = message.NewValue;
                 }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsScrollDuration))
+                {
+                    _canvasYScrollTransition.SetDuration(message.NewValue / 1000f);
+                }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.TimelineSyncThreshold))
+                {
+                    _timelineSyncThreshold = message.NewValue;
+                }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsBgFontOpacity))
+                {
+                    _defaultOpacity = message.NewValue / 100f;
+                    _isLayoutChanged = true;
+                }
             }
             else if (message.Sender is LyricsPageViewModel)
             {
@@ -194,7 +239,11 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsGlowEffectScope))
                 {
-                    LyricsGlowEffectScope = message.NewValue;
+                    _lyricsGlowEffectScope = message.NewValue;
+                }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsHighlightScope))
+                {
+                    _lyricsHighlightScope = message.NewValue;
                 }
             }
         }
@@ -205,7 +254,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsAlignmentType))
                 {
-                    LyricsAlignmentType = message.NewValue;
+                    _lyricsAlignmentType = message.NewValue;
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.SongInfoAlignmentType))
                 {
@@ -227,17 +276,17 @@ namespace BetterLyrics.WinUI3.ViewModels
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsBgFontColorType))
                 {
                     _lyricsBgFontColorType = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFgFontColorType))
                 {
                     _lyricsFgFontColorType = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
                 else if (message.PropertyName == nameof(SettingsPageViewModel.LyricsStrokeFontColorType))
                 {
                     _lyricsStrokeFontColorType = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
             }
         }
@@ -248,7 +297,8 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontWeight))
                 {
-                    LyricsFontWeight = message.NewValue;
+                    _lyricsTextFormat.FontWeight = message.NewValue.ToFontWeight();
+                    _isLayoutChanged = true;
                 }
             }
         }
@@ -260,25 +310,32 @@ namespace BetterLyrics.WinUI3.ViewModels
                 if (message.PropertyName == nameof(SettingsPageViewModel.LyricsBackgroundTheme))
                 {
                     _lyricsBgTheme = message.NewValue;
-                    UpdateFontColor();
+                    UpdateColorConfig();
                 }
             }
         }
 
-        partial void OnLyricsFontSizeChanged(int value)
+        public void Receive(PropertyChangedMessage<EasingType> message)
         {
-            _isLayoutChanged = true;
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsScrollEasingType))
+                {
+                    _canvasYScrollTransition.SetEasingType(message.NewValue);
+                }
+            }
         }
 
-        partial void OnLyricsFontWeightChanged(LyricsFontWeight value)
+        public void Receive(PropertyChangedMessage<string> message)
         {
-            _lyricsTextFormat.FontWeight = value.ToFontWeight();
-            _isLayoutChanged = true;
-        }
-
-        partial void OnLyricsLineSpacingFactorChanged(float value)
-        {
-            _isLayoutChanged = true;
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontFamily))
+                {
+                    _lyricsTextFormat.FontFamily = _artistTextFormat.FontFamily = _titleTextFormat.FontFamily = message.NewValue;
+                    _isLayoutChanged = true;
+                }
+            }
         }
     }
 }

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

@@ -1,4 +1,5 @@
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
 using Microsoft.UI;
 using System;
 using System.Collections.Generic;
@@ -13,7 +14,8 @@ namespace BetterLyrics.WinUI3.ViewModels
     {
         private readonly ValueTransition<float> _canvasYScrollTransition = new(
             initialValue: 0f,
-            durationSeconds: 0.3f
+            durationSeconds: 0.5f,
+            easingType: EasingType.EaseInOutCubic
         );
 
         private readonly ValueTransition<Color> _immersiveBgTransition = new(
@@ -22,6 +24,11 @@ namespace BetterLyrics.WinUI3.ViewModels
             interpolator: (from, to, progress) => Helper.ColorHelper.GetInterpolatedColor(progress, from, to)
         );
 
+        private readonly ValueTransition<float> _immersiveBgOpacityTransition = new(
+            initialValue: 1f,
+            durationSeconds: 0.2f
+        );
+
         private readonly ValueTransition<float> _lyricsXTransition = new(
             initialValue: 0f,
             durationSeconds: 0.3f

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

@@ -7,6 +7,9 @@ using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using System.Numerics;
 using Windows.UI;
 
@@ -18,7 +21,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private bool _isCanvasHeightChanged = false;
 
         private bool _isDisplayTypeChanged = false;
-        
+
         private bool _isPlayingLineChanged = false;
         private bool _isVisibleLinesBoundaryChanged = false;
 
@@ -28,7 +31,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             if (_isPlaying)
             {
-                _totalTime += _elapsedTime;
+                TotalTime += _elapsedTime;
             }
 
             var playingLineIndex = GetCurrentPlayingLineIndex();
@@ -43,12 +46,13 @@ namespace BetterLyrics.WinUI3.ViewModels
             _displayType = _displayTypeReceived;
             _playingLineIndex = playingLineIndex;
 
+            _immersiveBgOpacityTransition.Update(_elapsedTime);
             _immersiveBgTransition.Update(_elapsedTime);
             _albumArtBgTransition.Update(_elapsedTime);
             _lyricsBgBrightnessTransition.Update(_elapsedTime);
             _songInfoOpacityTransition.Update(_elapsedTime);
 
-            if (IsDynamicCoverOverlayEnabled)
+            if (_isDynamicCoverOverlayEnabled)
             {
                 _rotateAngle += _coverRotateSpeed;
                 _rotateAngle %= MathF.PI * 2;
@@ -90,8 +94,6 @@ namespace BetterLyrics.WinUI3.ViewModels
                         _lyricsXTransition.StartTransition((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 + _leftMargin + _middleMargin, jumpTo);
                         _albumArtXTransition.StartTransition(_leftMargin + ((_canvasWidth - _leftMargin - _middleMargin - _rightMargin) / 2 - _albumArtSize) / 2, jumpTo);
                         break;
-                    case LyricsDisplayType.PlaceholderOnly:
-                        break;
                     default:
                         break;
                 }
@@ -129,14 +131,14 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (control == null)
                 return;
 
-            _lyricsTextFormat.FontSize = LyricsFontSize;
+            _lyricsTextFormat.FontSize = _lyricsFontSize;
 
             float y = 0;
 
             // Init Positions
-            for (int i = 0; i < _multiLangLyrics.SafeGet(_langIndex)?.Count; i++)
+            for (int i = 0; i < _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.Count; i++)
             {
-                var line = _multiLangLyrics[_langIndex].SafeGet(i);
+                var line = _lyricsDataArr[_langIndex].LyricsLines.ElementAtOrDefault(i);
 
                 if (line == null)
                 {
@@ -163,7 +165,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                 y +=
                     (float)line.CanvasTextLayout.LayoutBounds.Height
                     / line.CanvasTextLayout.LineCount
-                    * (line.CanvasTextLayout.LineCount + LyricsLineSpacingFactor);
+                    * (line.CanvasTextLayout.LineCount + _lyricsLineSpacingFactor);
             }
         }
 
@@ -177,7 +179,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             if ((!_isPlayingLineChanged && forceScroll) || _isPlayingLineChanged)
             {
-                LyricsLine? currentPlayingLine = _multiLangLyrics.SafeGet(_langIndex)?.SafeGet(_playingLineIndex);
+                LyricsLine? currentPlayingLine = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(_playingLineIndex);
 
                 if (currentPlayingLine == null) return;
 
@@ -185,7 +187,7 @@ namespace BetterLyrics.WinUI3.ViewModels
 
                 if (playingTextLayout == null) return;
 
-                float? targetYScrollOffset = (float?)(-currentPlayingLine!.Position.Y + _multiLangLyrics.SafeGet(_langIndex)?[0].Position.Y - playingTextLayout.LayoutBounds.Height / 2);
+                float? targetYScrollOffset = (float?)(-currentPlayingLine!.Position.Y + _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines[0].Position.Y - playingTextLayout.LayoutBounds.Height / 2);
 
                 if (!targetYScrollOffset.HasValue) return;
 
@@ -194,48 +196,13 @@ namespace BetterLyrics.WinUI3.ViewModels
 
             _canvasYScrollTransition.Update(_elapsedTime);
 
-            int startVisibleLineIndex = -1;
-            int endVisibleLineIndex = -1;
-
             // Update visible line indices
-            for (int i = startLineIndex; i <= endLineIndex; i++)
-            {
-                var line = _multiLangLyrics.SafeGet(_langIndex)?.SafeGet(i);
+            var lines = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines;
+            if (lines == null || lines.Count == 0) return;
 
-                if (line == null || line.CanvasTextLayout == null)
-                {
-                    continue;
-                }
-
-                var textLayout = line.CanvasTextLayout;
-
-                if (
-                    _canvasYScrollTransition.Value
-                        + _canvasHeight / 2
-                        + line.Position.Y
-                        + textLayout.LayoutBounds.Height
-                    >= 0
-                )
-                {
-                    if (startVisibleLineIndex == -1)
-                    {
-                        startVisibleLineIndex = i;
-                    }
-                }
-                if (
-                    _canvasYScrollTransition.Value
-                        + _canvasHeight / 2
-                        + line.Position.Y
-                        + textLayout.LayoutBounds.Height
-                    >= control.Size.Height
-                )
-                {
-                    if (endVisibleLineIndex == -1)
-                    {
-                        endVisibleLineIndex = i;
-                    }
-                }
-            }
+            float offset = _canvasYScrollTransition.Value + _canvasHeight / 2;
+            int startVisibleLineIndex = FindFirstVisibleLine(lines, offset);
+            int endVisibleLineIndex = FindLastVisibleLine(lines, offset, _canvasHeight);
 
             if (startVisibleLineIndex != -1 && endVisibleLineIndex == -1)
             {
@@ -248,7 +215,53 @@ namespace BetterLyrics.WinUI3.ViewModels
             _endVisibleLineIndex = endVisibleLineIndex;
         }
 
-        private void UpdateFontColor()
+        private int FindFirstVisibleLine(IList<LyricsLine> lines, float offset)
+        {
+            int left = 0, right = lines.Count - 1, result = -1;
+            while (left <= right)
+            {
+                int mid = (left + right) / 2;
+                var line = lines[mid];
+                var layout = line.CanvasTextLayout;
+                if (layout == null) break;
+                float value = offset + line.Position.Y + (float)layout.LayoutBounds.Height;
+                if (value >= 0)
+                {
+                    result = mid;
+                    right = mid - 1;
+                }
+                else
+                {
+                    left = mid + 1;
+                }
+            }
+            return result;
+        }
+
+        private int FindLastVisibleLine(IList<LyricsLine> lines, float offset, float canvasHeight)
+        {
+            int left = 0, right = lines.Count - 1, result = -1;
+            while (left <= right)
+            {
+                int mid = (left + right) / 2;
+                var line = lines[mid];
+                var layout = line.CanvasTextLayout;
+                if (layout == null) break;
+                float value = offset + line.Position.Y + (float)layout.LayoutBounds.Height;
+                if (value >= canvasHeight)
+                {
+                    result = mid;
+                    right = mid - 1;
+                }
+                else
+                {
+                    left = mid + 1;
+                }
+            }
+            return result;
+        }
+
+        private void UpdateColorConfig()
         {
             if (_isDesktopMode || _isDockMode)
             {
@@ -295,7 +308,8 @@ namespace BetterLyrics.WinUI3.ViewModels
             if (_adaptiveGrayedFontColor == _lightColor)
             {
                 grayedEnvironmentalColor = _darkColor;
-            } else if (_adaptiveGrayedFontColor == _darkColor)
+            }
+            else if (_adaptiveGrayedFontColor == _darkColor)
             {
                 grayedEnvironmentalColor = _lightColor;
             }
@@ -359,15 +373,15 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void UpdateLinesProps()
         {
-            var currentPlayingLine = _multiLangLyrics
-                .SafeGet(_langIndex)
-                ?.SafeGet(_playingLineIndex);
+            var currentPlayingLine = _lyricsDataArr
+                .ElementAtOrDefault(_langIndex)
+                ?.LyricsLines.ElementAtOrDefault(_playingLineIndex);
 
             if (currentPlayingLine == null) return;
 
             for (int i = _startVisibleLineIndex; i <= _endVisibleLineIndex; i++)
             {
-                var line = _multiLangLyrics.SafeGet(_langIndex)?.SafeGet(i);
+                var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i);
 
                 if (line == null) continue;
 
@@ -384,9 +398,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                             : 0
                     );
 
-                    line.BlurAmountTransition.StartTransition(LyricsBlurAmount * distanceFactor);
+                    line.BlurAmountTransition.StartTransition(_lyricsBlurAmount * distanceFactor);
                     line.ScaleTransition.StartTransition(_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale));
-                    line.OpacityTransition.StartTransition(_defaultOpacity - distanceFactor * _defaultOpacity * (1 - LyricsVerticalEdgeOpacity / 100f));
+                    line.OpacityTransition.StartTransition(_defaultOpacity - distanceFactor * _defaultOpacity * (1 - _lyricsVerticalEdgeOpacity / 100f));
                     line.HighlightOpacityTransition.StartTransition(i == _playingLineIndex ? 1f : 0f);
                 }
 
@@ -397,5 +411,33 @@ namespace BetterLyrics.WinUI3.ViewModels
                 line.HighlightOpacityTransition.Update(_elapsedTime);
             }
         }
+
+        private void UpdateImmersiveBackgroundOpacity()
+        {
+            float targetOpacity;
+            if (_isDesktopMode)
+            {
+                if (_isLyricsWindowLocked)
+                {
+                    targetOpacity = 0;
+                }
+                else
+                {
+                    if (_isMouseWithinWindow)
+                    {
+                        targetOpacity = 1f;
+                    }
+                    else
+                    {
+                        targetOpacity = 0f;
+                    }
+                }
+            }
+            else
+            {
+                targetOpacity = 1f;
+            }
+            _immersiveBgOpacityTransition.StartTransition(targetOpacity);
+        }
     }
 }

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

@@ -8,6 +8,8 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Lyricify.Lyrics.Helpers.General;
+using Lyricify.Lyrics.Providers;
 using Microsoft.Extensions.Logging;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Text;
@@ -29,9 +31,15 @@ namespace BetterLyrics.WinUI3.ViewModels
     public partial class LyricsRendererViewModel : BaseViewModel
     {
         private TimeSpan _elapsedTime = TimeSpan.Zero;
-        private TimeSpan _totalTime = TimeSpan.Zero;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial TimeSpan TotalTime { get; set; } = TimeSpan.Zero;
+
         private TimeSpan _positionOffset = TimeSpan.Zero;
 
+        private int _songDurationMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds;
+
         private SoftwareBitmap? _lastAlbumArtSwBitmap = null;
         private SoftwareBitmap? _albumArtSwBitmap = null;
 
@@ -54,7 +62,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         private float _canvasWidth = 0f;
         private float _canvasHeight = 0f;
 
-        private readonly float _defaultOpacity = 0.3f;
+        private float _defaultOpacity;
         private readonly float _highlightedOpacity = 1.0f;
 
         private readonly float _defaultScale = 0.75f;
@@ -63,14 +71,30 @@ namespace BetterLyrics.WinUI3.ViewModels
         private readonly float _coverRotateSpeed = 0.003f;
         private float _rotateAngle = 0f;
 
+        private TextAlignmentType _lyricsAlignmentType;
+
         private readonly float _lyricsGlowEffectAmount = 8f;
+        private int _lyricsBlurAmount;
+        private int _lyricsVerticalEdgeOpacity;
+
+        private ElementTheme _lyricsBgTheme;
+        private LineRenderingType _lyricsGlowEffectScope;
+        private LineRenderingType _lyricsHighlightScope;
+
+        private int _lyricsFontStrokeWidth;
+        private int _lyricsFontSize;
+        private float _lyricsLineSpacingFactor;
+
+        private LyricsFontColorType _lyricsBgFontColorType;
+        private LyricsFontColorType _lyricsFgFontColorType;
+        private LyricsFontColorType _lyricsStrokeFontColorType;
 
         private float _maxLyricsWidth = 0f;
 
-        private readonly IMusicSearchService _musicSearchService;
+        private readonly ILyricsSearchService _lyrcsSearchService;
         private readonly ILibWatcherService _libWatcherService;
         private readonly IPlaybackService _playbackService;
-        private readonly ILibreTranslateService _libreTranslateService;
+        private readonly ITranslateService _translateService;
         private readonly ILogger _logger;
 
         private readonly float _leftMargin = 36f;
@@ -96,14 +120,6 @@ namespace BetterLyrics.WinUI3.ViewModels
         private Color? _customFgFontColor;
         private Color? _customStrokeFontColor;
 
-        private LyricsFontColorType _lyricsBgFontColorType;
-        private LyricsFontColorType _lyricsFgFontColorType;
-        private LyricsFontColorType _lyricsStrokeFontColorType;
-
-        private ElementTheme _lyricsBgTheme;
-
-        private int _lyricsFontStrokeWidth;
-
         private int _playingLineIndex = -1;
 
         private int _startVisibleLineIndex = -1;
@@ -116,14 +132,25 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private bool _isPlaying = true;
 
+        private bool _isLyricsWindowLocked = false;
+        private bool _isMouseWithinWindow = false;
+
+        private bool _isDynamicCoverOverlayEnabled;
+        private bool _isLyricsGlowEffectEnabled;
+
+        private bool _isLyricsFloatAnimationEnabled;
+
         private bool _isLayoutChanged = true;
 
         private int _langIndex = 0;
 
-        private List<List<LyricsLine>> _multiLangLyrics = [];
-        private List<string> _translations = [];
-        private bool _isTranslationEnabled = false;
-        private int _targetLanguageIndex = 6;
+        private List<LyricsData> _lyricsDataArr = [];
+        private List<string> _translationList = [];
+        private bool _isTranslationEnabled;
+        private bool _showTranslationOnly;
+        private int _targetLanguageIndex;
+
+        private int _timelineSyncThreshold;
 
         private CanvasTextFormat _lyricsTextFormat = new()
         {
@@ -149,93 +176,18 @@ namespace BetterLyrics.WinUI3.ViewModels
             TrimmingGranularity = CanvasTextTrimmingGranularity.Character,
         };
 
-        private Task? _refreshLyricsTask;
-        private CancellationTokenSource? _refreshLyricsCts;
+        private LatestOnlyTaskRunner _refreshLyricsRunner = new();
+        private LatestOnlyTaskRunner _showTranslationsRunner = new();
 
-        private Task? _showTranslationsTask;
-        private CancellationTokenSource? _showTranslationsCts;
+        private LyricsDisplayType _displayTypeReceived;
+        private LyricsDisplayType _displayType;
 
-        public LyricsRendererViewModel(ISettingsService settingsService, IPlaybackService playbackService, IMusicSearchService musicSearchService, ILibWatcherService libWatcherService, ILibreTranslateService libreTranslateService) : base(settingsService)
-        {
-            _musicSearchService = musicSearchService;
-            _playbackService = playbackService;
-            _libWatcherService = libWatcherService;
-            _libreTranslateService = libreTranslateService;
-
-            _logger = Ioc.Default.GetRequiredService<ILogger<LyricsRendererViewModel>>();
-
-            _albumArtCornerRadius = _settingsService.CoverImageRadius;
-            IsDynamicCoverOverlayEnabled = _settingsService.IsDynamicCoverOverlayEnabled;
-            CoverOverlayOpacity = _settingsService.CoverOverlayOpacity;
-            CoverOverlayBlurAmount = _settingsService.CoverOverlayBlurAmount;
-
-            _lyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
-            _lyricsFgFontColorType = _settingsService.LyricsFgFontColorType;
-
-            LyricsFontWeight = _settingsService.LyricsFontWeight;
-            LyricsAlignmentType = _settingsService.LyricsAlignmentType;
-            LyricsVerticalEdgeOpacity = _settingsService.LyricsVerticalEdgeOpacity;
-            LyricsLineSpacingFactor = _settingsService.LyricsLineSpacingFactor;
-            LyricsFontSize = _settingsService.LyricsFontSize;
-            LyricsBlurAmount = _settingsService.LyricsBlurAmount;
-            IsLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
-            LyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
-
-            _customBgFontColor = _settingsService.LyricsCustomBgFontColor;
-            _customFgFontColor = _settingsService.LyricsCustomFgFontColor;
-
-            _lyricsBgTheme = _settingsService.LyricsBackgroundTheme;
-
-            _isFanLyricsEnabled = _settingsService.IsFanLyricsEnabled;
-
-            _lyricsFontStrokeWidth = _settingsService.LyricsFontStrokeWidth;
-
-            _isTranslationEnabled = _settingsService.IsTranslationEnabled;
-            _targetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
-
-            _titleTextFormat.HorizontalAlignment = _artistTextFormat.HorizontalAlignment = _settingsService.SongInfoAlignmentType.ToCanvasHorizontalAlignment();
-
-            _libWatcherService.MusicLibraryFilesChanged +=
-                LibWatcherService_MusicLibraryFilesChanged;
-
-            _playbackService.IsPlayingChanged += PlaybackService_IsPlayingChanged;
-            _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
-            _playbackService.PositionChanged += PlaybackService_PositionChanged;
-
-            UpdateFontColor();
-        }
+        private int _albumArtBgBlurAmount;
+        private int _albumArtBgOpacity;
 
         [ObservableProperty]
         public partial bool IsTranslating { get; set; } = false;
 
-        public int CoverOverlayBlurAmount { get; set; }
-
-        public int CoverOverlayOpacity { get; set; }
-
-        private LyricsDisplayType _displayTypeReceived = LyricsDisplayType.PlaceholderOnly;
-        private LyricsDisplayType _displayType = LyricsDisplayType.PlaceholderOnly;
-
-        public bool IsDynamicCoverOverlayEnabled { get; set; }
-
-        public bool IsLyricsGlowEffectEnabled { get; set; }
-
-        public TextAlignmentType LyricsAlignmentType { get; set; }
-
-        public int LyricsBlurAmount { get; set; }
-
-        [ObservableProperty]
-        public partial int LyricsFontSize { get; set; }
-
-        [ObservableProperty]
-        public partial LyricsFontWeight LyricsFontWeight { get; set; }
-
-        public LineRenderingType LyricsGlowEffectScope { get; set; }
-
-        [ObservableProperty]
-        public partial float LyricsLineSpacingFactor { get; set; }
-
-        public int LyricsVerticalEdgeOpacity { get; set; }
-
         [ObservableProperty]
         public partial SongInfo? SongInfo { get; set; }
 
@@ -245,32 +197,43 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private int GetCurrentPlayingLineIndex()
         {
-            for (int i = 0; i < _multiLangLyrics.SafeGet(_langIndex)?.Count; i++)
+            var totalMs = TotalTime.TotalMilliseconds + _positionOffset.TotalMilliseconds;
+            if (totalMs < _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.FirstOrDefault()?.StartMs) return 0;
+
+            for (int i = 0; i < _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.Count; i++)
             {
-                var line = _multiLangLyrics.SafeGet(_langIndex)?[i];
-                if (line == null)
+                var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i);
+                if (line == null) continue;
+                var nextLine = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(i + 1);
+                if (nextLine != null && line.StartMs <= totalMs && totalMs < nextLine.StartMs)
                 {
-                    continue;
+                    return i;
                 }
-                if (
-                    line.StartMs <= _totalTime.TotalMilliseconds + _positionOffset.TotalMilliseconds
-                    && _totalTime.TotalMilliseconds + _positionOffset.TotalMilliseconds <= line.EndMs
-                )
+                else if (nextLine == null && line.StartMs <= totalMs)
                 {
                     return i;
                 }
             }
 
-            return -1;
+            return GetMaxLyricsLineIndexBoundaries().Item2;
         }
 
-        private void GetLinePlayingProgress(LyricsLine line, out int charStartIndex, out int charLength, out float charProgress)
+        private void GetLinePlayingProgress(int lineIndex, out int charStartIndex, out int charLength, out float charProgress)
         {
             charStartIndex = 0;
             charLength = 0;
             charProgress = 0f;
 
-            float now = (float)_totalTime.TotalMilliseconds + (float)_positionOffset.TotalMilliseconds;
+            var line = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(lineIndex);
+            if (line == null) return;
+            var nextLine = _lyricsDataArr.ElementAtOrDefault(_langIndex)?.LyricsLines.ElementAtOrDefault(lineIndex + 1);
+
+            int lineEndMs;
+            if (line.EndMs != null) lineEndMs = line.EndMs.Value;
+            else if (nextLine != null) lineEndMs = nextLine.StartMs;
+            else lineEndMs = _songDurationMs;
+
+            float now = (float)TotalTime.TotalMilliseconds + (float)_positionOffset.TotalMilliseconds;
 
             // 1. 还没到本句
             if (now < line.StartMs)
@@ -279,27 +242,37 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
 
             // 2. 已经超过本句
-            if (now > line.EndMs)
+            if (now > lineEndMs)
             {
+                charProgress = 1f;
+                charStartIndex = line.OriginalText.Length - 1;
+                charLength = 1;
                 return;
             }
 
             // 3. 有逐字时间轴
-            if (line.CharTimings != null && line.CharTimings.Count > 0)
+            if (line.LyricsChars != null && line.LyricsChars.Count > 1)
             {
-                int charTimingsCount = line.CharTimings.Count;
+                int charTimingsCount = line.LyricsChars.Count;
                 for (int i = 0; i < charTimingsCount; i++)
                 {
-                    var timing = line.CharTimings[i];
+                    var timing = line.LyricsChars[i];
+                    var nextTiming = line.LyricsChars.ElementAtOrDefault(i + 1);
+
+                    int timingEndMs;
+                    if (timing.EndMs != null) timingEndMs = timing.EndMs.Value;
+                    else if (nextTiming != null) timingEndMs = nextTiming.StartMs;
+                    else timingEndMs = lineEndMs;
+
+                    charStartIndex = timing.StartIndex;
+                    charLength = timing.Text.Length;
 
                     // 当前时间在某个字的高亮区间
-                    if (now >= timing.StartMs && now <= timing.EndMs)
+                    if (now >= timing.StartMs && now <= timingEndMs)
                     {
-                        charStartIndex = timing.StartIndex;
-                        charLength = timing.Text.Length;
-                        if (timing.EndMs != timing.StartMs)
+                        if (timingEndMs != timing.StartMs)
                         {
-                            charProgress = (now - timing.StartMs) / (timing.EndMs - timing.StartMs);
+                            charProgress = (now - timing.StartMs) / (timingEndMs - timing.StartMs);
                         }
                         else
                         {
@@ -307,15 +280,30 @@ namespace BetterLyrics.WinUI3.ViewModels
                         }
                         return;
                     }
+                    else if (now > timingEndMs && (nextTiming == null || now < nextTiming?.StartMs))
+                    {
+                        charProgress = 1f;
+                        return;
+                    }
                 }
             }
             else
             {
-                // 没有逐字时间轴，直接线性
-                charProgress = (now - line.StartMs) / line.DurationMs;
-                charProgress = Math.Clamp(charProgress, 0f, 1f);
-                charStartIndex = 0;
-                charLength = line.OriginalText.Length;
+                // 没有逐字时间轴，均匀分配每个字的高亮时间
+                int textLength = line.OriginalText.Length;
+                if (textLength == 0) return;
+
+                float lineProgress = (now - line.StartMs) / (lineEndMs - line.StartMs);
+                lineProgress = Math.Clamp(lineProgress, 0f, 1f);
+
+                // 计算当前高亮到第几个字
+                float charFloatIndex = lineProgress * textLength;
+                int charIndex = (int)charFloatIndex;
+                charStartIndex = Math.Clamp(charIndex, 0, textLength - 1);
+                charLength = 1;
+
+                // 当前字的进度（0~1）
+                charProgress = charFloatIndex - charIndex;
             }
         }
 
@@ -323,20 +311,23 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             if (
                 SongInfo == null
-                || _multiLangLyrics.SafeGet(_langIndex) == null
-                || _multiLangLyrics[_langIndex].Count == 0
+                || _lyricsDataArr.ElementAtOrDefault(_langIndex) == null
+                || _lyricsDataArr[_langIndex].LyricsLines.Count == 0
             )
             {
                 return new Tuple<int, int>(-1, -1);
             }
 
-            return new Tuple<int, int>(0, _multiLangLyrics[_langIndex].Count - 1);
+            return new Tuple<int, int>(0, _lyricsDataArr[_langIndex].LyricsLines.Count - 1);
         }
 
         private void LibWatcherService_MusicLibraryFilesChanged(object? sender, LibChangedEventArgs e)
         {
             _logger.LogInformation("Music library files changed: {ChangeType} {FilePath}, refreshing lyrics...", e.ChangeType, e.FilePath);
-            RefreshLyricsAsync();
+            _ = _refreshLyricsRunner.RunAsync(async token =>
+            {
+                await RefreshLyricsAsync(token);
+            });
         }
 
         private void PlaybackService_IsPlayingChanged(object? sender, IsPlayingChangedEventArgs e)
@@ -346,32 +337,16 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void PlaybackService_PositionChanged(object? sender, PositionChangedEventArgs e)
         {
-            if (Math.Abs(_totalTime.TotalMilliseconds - e.Position.TotalMilliseconds) > 300)
+            if (Math.Abs(TotalTime.TotalMilliseconds - e.Position.TotalMilliseconds) >= _timelineSyncThreshold)
             {
-                _totalTime = e.Position;
+                TotalTime = e.Position;
             }
         }
 
-        private async void PlaybackService_SongInfoChanged(object? sender, SongInfoChangedEventArgs e)
+        private void PlaybackService_SongInfoChanged(object? sender, SongInfoChangedEventArgs e)
         {
             SongInfo = e.SongInfo;
 
-            if (SongInfo?.AlbumArtSwBitmap != _albumArtSwBitmap)
-            {
-                _lastAlbumArtSwBitmap = _albumArtSwBitmap;
-                _lastAlbumArtCanvasBitmap = null;
-
-                _albumArtSwBitmap = SongInfo?.AlbumArtSwBitmap;
-                _albumArtCanvasBitmap = null;
-
-                _albumArtAccentColor = SongInfo?.AlbumArtAccentColor;
-
-                _albumArtBgTransition.Reset(0f);
-                _albumArtBgTransition.StartTransition(1f);
-
-                UpdateFontColor();
-            }
-
             if (SongInfo?.Title != _songTitle || SongInfo?.Artist != _songArtist)
             {
                 _lastSongTitle = _songTitle;
@@ -380,186 +355,199 @@ namespace BetterLyrics.WinUI3.ViewModels
                 _lastSongArtist = _songArtist;
                 _songArtist = SongInfo?.Artist;
 
+                _songDurationMs = (int)(SongInfo?.DurationMs ?? TimeSpan.FromMinutes(99).TotalMilliseconds);
+
                 _songInfoOpacityTransition.Reset(0f);
                 _songInfoOpacityTransition.StartTransition(1f);
 
                 _logger.LogInformation("Song info changed: Title={Title}, Artist={Artist}, refreshing lyrics...", _songTitle, _songArtist);
-                await RefreshLyricsAsync();
-
-                _totalTime = TimeSpan.Zero;
+                Debug.WriteLine($"Song info changed: Title={_songTitle}, Artist={_songArtist}");
+                _ = _refreshLyricsRunner.RunAsync(async token =>
+                {
+                    await RefreshLyricsAsync(token);
+                });
+                TotalTime = TimeSpan.Zero;
             }
         }
 
-        private async Task RefreshLyricsAsync()
+        private void PlaybackService_AlbumArtChangedChanged(object? sender, AlbumArtChangedEventArgs e)
         {
-            // 取消上一次
-            _refreshLyricsCts?.Cancel();
-            if (_refreshLyricsTask != null)
+            if (e.AlbumArtSwBitmap != _albumArtSwBitmap)
             {
-                await _refreshLyricsTask;
+                _lastAlbumArtSwBitmap = _albumArtSwBitmap;
+                _lastAlbumArtCanvasBitmap = null;
+
+                _albumArtSwBitmap = e.AlbumArtSwBitmap;
+                _albumArtCanvasBitmap = null;
+
+                _albumArtAccentColor = e.AlbumArtAccentColor;
+
+                _albumArtBgTransition.Reset(0f);
+                _albumArtBgTransition.StartTransition(1f);
+
+                UpdateColorConfig();
             }
-
-            var cts = new CancellationTokenSource();
-            _refreshLyricsCts = cts;
-            var token = cts.Token;
-
-            _refreshLyricsTask = RefreshLyricsCoreAsync(token);
-            await _refreshLyricsTask;
         }
 
-        private async Task UpdateTranslationsAsync()
+        private void UpdateTranslations()
         {
+            _lyricsDataArr.ElementAtOrDefault(0)?.SetDisplayedTextInOriginalText();
+            _isLayoutChanged = true;
+
             IsTranslating = true;
             if (_isTranslationEnabled)
             {
-                await ShowWithTranslationsAsync();
+                _ = _refreshLyricsRunner.RunAsync(async token =>
+                {
+                    await SetDisplayedAlongWithTranslationsAsync(token);
+                    IsTranslating = false;
+                    _isLayoutChanged = true;
+                });
             }
             else
             {
-                ShowOriginalsOnly();
-            }
-            IsTranslating = false;
-        }
-
-        private async Task ShowWithTranslationsAsync()
-        {
-            _showTranslationsCts?.Cancel();
-            if (_showTranslationsTask != null)
-            {
-                await _showTranslationsTask;
-            }
-
-            var cts = new CancellationTokenSource();
-            _showTranslationsCts = cts;
-            var token = cts.Token;
-
-            _showTranslationsTask = ShowTranslationsCoreAsync(token);
-            await _showTranslationsTask;
-        }
-
-        private async Task ShowTranslationsCoreAsync(CancellationToken token)
-        {
-            _logger.LogInformation("Showing translations for lyrics...");
-            try
-            {
-                if (string.IsNullOrEmpty(_settingsService.LibreTranslateServer))
-                {
-                    _dispatcherQueue.TryEnqueue(() =>
-                    {
-                        App.Current.LyricsWindowNotificationPanel?.Notify(
-                            App.ResourceLoader!.GetString("TranslateServerNotSet"),
-                            Microsoft.UI.Xaml.Controls.InfoBarSeverity.Warning
-                        );
-                    });
-                    ShowOriginalsOnly();
-                    return;
-                }
-                var text = string.Join("\n", _multiLangLyrics.FirstOrDefault()?.Select(x => x.OriginalText) ?? []);
-                var translated = await _libreTranslateService.TranslateAsync(text, token);
-                token.ThrowIfCancellationRequested();
-
-                _translations = translated.Split('\n').ToList();
-                bool totallySame = true;
-                foreach (var langLyrics in _multiLangLyrics)
-                {
-                    int i = 0;
-                    foreach (var line in langLyrics)
-                    {
-                        if (line.OriginalText != _translations[i])
-                        {
-                            totallySame = false;
-                            break;
-                        }
-                        i++;
-                    }
-                    break;
-                }
-
-                foreach (var langLyrics in _multiLangLyrics)
-                {
-                    int i = 0;
-                    foreach (var line in langLyrics)
-                    {
-                        line.DisplayedText = totallySame ? line.OriginalText : $"{line.OriginalText}\n{_translations[i]}";
-                        i++;
-                    }
-                    break;
-                }
+                _lyricsDataArr.ElementAtOrDefault(0)?.SetDisplayedTextInOriginalText();
+                _langIndex = 0;
+                IsTranslating = false;
                 _isLayoutChanged = true;
             }
-            catch (Exception)
-            {
-                IsTranslating = false;
-            }
         }
 
-        private void ShowOriginalsOnly()
+        private async Task SetDisplayedAlongWithTranslationsAsync(CancellationToken token)
         {
-            _logger.LogInformation("Showing original lyrics only, translations disabled.");
-            foreach (var langLyrics in _multiLangLyrics)
+            _logger.LogInformation("Showing translation for lyrics...");
+            string targetLangCode = LanguageHelper.GetUserTargetLanguageCode();
+            string? originalText = _lyricsDataArr.FirstOrDefault()?.WrappedOriginalText;
+            if (originalText == null) return;
+
+            string? originalLangCode = LanguageHelper.DetectLanguageCode(originalText);
+
+            if (originalLangCode == targetLangCode)
             {
-                foreach (var line in langLyrics)
-                {
-                    line.DisplayedText = line.OriginalText;
-                }
+                _logger.LogInformation("Original lyrics already in target language: {TargetLangCode}", targetLangCode);
+                _lyricsDataArr[0].SetDisplayedTextInOriginalText();
             }
-            _isLayoutChanged = true;
-        }
-
-        private async Task RefreshLyricsCoreAsync(CancellationToken token)
-        {
-            try
+            else
             {
-                _logger.LogInformation("Refreshing lyrics...");
-
-                SetLyricsLoadingPlaceholder();
-
-                string? lyricsRaw = null;
-
-                if (SongInfo != null)
+                // Try get translation from itself first
+                int found = _translateService.SearchTranslatedLyricsItself(_lyricsDataArr);
+                if (found >= 0)
                 {
-                    lyricsRaw = await _musicSearchService.SearchLyricsAsync(
-                        SongInfo.Title,
-                        SongInfo.Artist,
-                        SongInfo.Album ?? "",
-                        SongInfo.DurationMs ?? 0,
-                        token
-                    );
-                    _logger.LogInformation("Lyrics search result: {LyricsRaw}", lyricsRaw ?? "null");
-                    token.ThrowIfCancellationRequested();
+                    if (_showTranslationOnly)
+                    {
+                        _lyricsDataArr[found].SetDisplayedTextInOriginalText();
+                        _langIndex = found;
+                    }
+                    else
+                    {
+                        _lyricsDataArr[0].SetDisplayedTextAlongWith(_lyricsDataArr[found]);
+                        _langIndex = 0;
+                    }
                 }
                 else
                 {
-                    _logger.LogWarning("SongInfo is null, cannot search lyrics.");
-                }
+                    string translated = string.Empty;
+                    try
+                    {
+                        translated = await _translateService.TranslateTextAsync(originalText, targetLangCode, token);
+                        if (translated == string.Empty) return;
 
-                _multiLangLyrics = new LyricsParser().Parse(
-                        lyricsRaw,
-                        (int?)SongInfo?.DurationMs ?? (int)TimeSpan.FromMinutes(99).TotalMilliseconds
-                    );
-                _logger.LogInformation("Parsed lyrics: {MultiLangLyricsCount} languages", _multiLangLyrics.Count);
-                await UpdateTranslationsAsync();
-                token.ThrowIfCancellationRequested();
+                        if (_showTranslationOnly)
+                        {
+                            _lyricsDataArr[^1] = _lyricsDataArr[0].CreateLyricsDataFrom(translated);
+                            _lyricsDataArr[^1].SetDisplayedTextInOriginalText();
+                            _langIndex = _lyricsDataArr.Count - 1;
+                        }
+                        else
+                        {
+                            _lyricsDataArr[0].SetDisplayedTextAlongWith(translated);
+                            _langIndex = 0;
+                        }
+                        token.ThrowIfCancellationRequested();
+                    }
+                    catch (Exception) { }
+                }
             }
-            catch (Exception) { }
         }
 
-        private void SetLyricsLoadingPlaceholder()
+        private async Task RefreshLyricsAsync(CancellationToken token)
         {
-            _multiLangLyrics = [];
-            _multiLangLyrics.Add(
-                [
-                    new LyricsLine
-                    {
-                        StartMs = 0,
-                        EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                        OriginalText = "● ● ●",
-                        DisplayedText = "● ● ●",
-                        CharTimings = [],
-                    },
-                ]
-            );
+            _logger.LogInformation("Refreshing lyrics...");
+
+            _lyricsDataArr = [LyricsData.GetLoadingPlaceholder()];
             _isLayoutChanged = true;
+
+            string? lyricsRaw = null;
+            LyricsSearchProvider? provider = null;
+
+            if (SongInfo != null)
+            {
+                (lyricsRaw, provider) = await _lyrcsSearchService.SearchAsync(
+                    SongInfo.Title,
+                    SongInfo.Artist,
+                    SongInfo.Album ?? "",
+                    SongInfo.DurationMs ?? 0,
+                    token
+                );
+                _logger.LogInformation("Lyrics search result: {LyricsRaw}", lyricsRaw ?? "null");
+                token.ThrowIfCancellationRequested();
+                _lyricsDataArr = new LyricsParser().Parse(lyricsRaw, (int?)SongInfo?.DurationMs);
+                FillTranslationFromCache(provider);
+            }
+            else
+            {
+                _logger.LogWarning("SongInfo is null, cannot search lyrics.");
+            }
+
+            _logger.LogInformation("Parsed lyrics: {MultiLangLyricsCount} languages", _lyricsDataArr.Count);
+
+            // This ensures that original lyrics are always shown while waiting for translations
+            _lyricsDataArr[0].SetDisplayedTextInOriginalText();
+            _isLayoutChanged = true;
+
+            UpdateTranslations();
+        }
+
+        private void FillTranslationFromCache(LyricsSearchProvider? provider)
+        {
+            string? translationRaw = null;
+            switch (provider)
+            {
+                case LyricsSearchProvider.QQ:
+                    translationRaw = FileHelper.ReadLyricsCache(SongInfo!.Title, SongInfo.Artist, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
+                    break;
+                case LyricsSearchProvider.Kugou:
+                    break;
+                case LyricsSearchProvider.Netease:
+                    break;
+                case LyricsSearchProvider.LrcLib:
+                    break;
+                case LyricsSearchProvider.AmllTtmlDb:
+                    break;
+                case LyricsSearchProvider.LocalMusicFile:
+                    break;
+                case LyricsSearchProvider.LocalLrcFile:
+                    break;
+                case LyricsSearchProvider.LocalEslrcFile:
+                    break;
+                case LyricsSearchProvider.LocalTtmlFile:
+                    break;
+                default:
+                    break;
+            }
+            if (translationRaw != null)
+            {
+                var translationData = new LyricsParser().Parse(translationRaw, (int?)SongInfo?.DurationMs);
+                foreach (var data in translationData)
+                {
+                    data.LyricsLines = data.LyricsLines.Where(line => !string.IsNullOrWhiteSpace(line.OriginalText)).ToList();
+                    foreach (var item in data.LyricsLines)
+                    {
+                        if (item.OriginalText == "//") item.OriginalText = "";
+                    }
+                }
+                _lyricsDataArr = _lyricsDataArr.Concat(translationData).ToList();
+            }
         }
     }
 }

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

@@ -1,6 +1,5 @@
 // 2025/6/23 by Zhe Fang
 
-using System.Threading.Tasks;
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
@@ -8,28 +7,55 @@ using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using CommunityToolkit.WinUI;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Vanara.PInvoke;
+using Windows.System;
 using Windows.UI;
 using WinRT.Interop;
+using WinUIEx;
 
 namespace BetterLyrics.WinUI3
 {
     public partial class LyricsWindowViewModel
         : BaseWindowViewModel,
             IRecipient<PropertyChangedMessage<int>>,
+            IRecipient<PropertyChangedMessage<bool>>,
             IRecipient<PropertyChangedMessage<ElementTheme>>,
-            IRecipient<PropertyChangedMessage<bool>>
+            IRecipient<PropertyChangedMessage<DockPlacement>>
     {
-        private ForegroundWindowWatcherHelper? _watcherHelper = null;
+        private readonly IPlaybackService _playbackService = Ioc.Default.GetRequiredService<IPlaybackService>();
+        private ForegroundWindowWatcher? _windowWatcher = null;
+        private bool _ignoreFullscreenWindow;
+        private bool _hideWindowWhenNotPlaying;
+
+        private DockPlacement _dockPlacement;
+        private int _dockWindowHeight;
 
         public LyricsWindowViewModel(ISettingsService settingsService) : base(settingsService)
         {
             _ignoreFullscreenWindow = _settingsService.IgnoreFullscreenWindow;
+            _hideWindowWhenNotPlaying = _settingsService.HideWindowWhenNotPlaying;
+            IsImmersiveMode = _settingsService.IsImmersiveMode;
+            _dockPlacement = _settingsService.DockPlacement;
+            _dockWindowHeight = _settingsService.DockWindowHeight;
+            OnIsImmersiveModeChanged(_settingsService.IsImmersiveMode);
+
+            _playbackService.SongInfoChanged += PlaybackService_SongInfoChanged;
+        }
+
+        private void PlaybackService_SongInfoChanged(object? sender, Events.SongInfoChangedEventArgs e)
+        {
+            AutoHideOrShowWindow();
         }
 
         [ObservableProperty]
@@ -49,10 +75,11 @@ namespace BetterLyrics.WinUI3
         public partial bool IsLyricsWindowLocked { get; set; } = false;
 
         [ObservableProperty]
-        public partial Notification Notification { get; set; } = new();
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsImmersiveMode { get; set; }
 
         [ObservableProperty]
-        public partial bool ShowInfoBar { get; set; } = false;
+        public partial float TopCommandGridOpacity { get; set; }
 
         [ObservableProperty]
         public partial ElementTheme ThemeType { get; set; } = ElementTheme.Default;
@@ -61,9 +88,62 @@ namespace BetterLyrics.WinUI3
         public partial double TitleBarFontSize { get; set; } = 11;
 
         [ObservableProperty]
-        public partial double TitleBarHeight { get; set; } = 36;
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsMouseWithinWindow { get; set; } = false;
 
-        private bool _ignoreFullscreenWindow = false;
+        [ObservableProperty]
+        public partial string LockHotKey { get; set; } = "";
+
+        private void AutoHideOrShowWindow()
+        {
+            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            var hwnd = WindowNative.GetWindowHandle(window);
+
+            if (IsDockMode || IsDesktopMode)
+            {
+                if (_hideWindowWhenNotPlaying && _playbackService.SongInfo == null)
+                {
+                    if (IsDockMode)
+                    {
+                        DockModeHelper.UpdateAppBarHeight(hwnd, 0, _dockPlacement);
+                    }
+                    window.Hide();
+                }
+                else
+                {
+                    if (IsDockMode)
+                    {
+                        DockModeHelper.UpdateAppBarHeight(hwnd, _dockWindowHeight, _dockPlacement);
+                    }
+                    window.Show();
+                }
+            }
+        }
+
+        private void UpdateDockWindow()
+        {
+            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            if (!_hideWindowWhenNotPlaying || _playbackService.SongInfo != null)
+            {
+                DockModeHelper.UpdateAppBarHeight(WindowNative.GetWindowHandle(window), _dockWindowHeight, _dockPlacement);
+            }
+        }
+
+        partial void OnIsImmersiveModeChanged(bool value)
+        {
+            if (value)
+            {
+                TopCommandGridOpacity = 0f;
+            }
+            else
+            {
+                TopCommandGridOpacity = 1f;
+            }
+        }
 
         public void Receive(PropertyChangedMessage<bool> message)
         {
@@ -83,6 +163,11 @@ namespace BetterLyrics.WinUI3
                 {
                     _ignoreFullscreenWindow = message.NewValue;
                 }
+                else if (message.PropertyName == nameof(SettingsPageViewModel.HideWindowWhenNotPlaying))
+                {
+                    _hideWindowWhenNotPlaying = message.NewValue;
+                    AutoHideOrShowWindow();
+                }
             }
         }
 
@@ -101,59 +186,103 @@ namespace BetterLyrics.WinUI3
         {
             if (message.Sender is SettingsPageViewModel)
             {
-                if (message.PropertyName == nameof(SettingsPageViewModel.LyricsFontSize))
+                if (message.PropertyName == nameof(SettingsPageViewModel.DockWindowHeight))
                 {
-                    if (IsDockMode)
+                    _dockWindowHeight = message.NewValue;
+                    UpdateDockWindow();
+                }
+                else if (message.Sender is SettingsPageViewModel)
+                {
+                    if (message.PropertyName == nameof(SettingsPageViewModel.LockHotKeyIndex))
                     {
-                        var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-                        if (window == null) return;
-
-                        DockModeHelper.UpdateAppBarHeight(WindowNative.GetWindowHandle(window), message.NewValue * 4);
+                        UpdateLockHotKey(message.NewValue);
                     }
                 }
             }
         }
 
-        public void StartWatchWindowColorChange(WindowColorSampleMode mode)
+        private void UpdateLockHotKey(int hotKeyIndex)
+        {
+            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            GlobalHotKeyHelper.UnregisterAllHotKeys(window);
+            GlobalHotKeyHelper.RegisterHotKey(
+                window,
+                User32.HotKeyModifiers.MOD_CONTROL | User32.HotKeyModifiers.MOD_ALT,
+                (uint)(hotKeyIndex + (int)VirtualKey.A),
+                () =>
+                {
+                    if (IsDesktopMode)
+                    {
+                        ToggleLockWindowCommand.Execute(null);
+                    }
+                }
+            );
+            LockHotKey = ((VirtualKey)(hotKeyIndex + (int)VirtualKey.A)).ToString();
+        }
+
+        public void StartWatchWindowColorChange()
         {
             var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
             if (window == null) return;
 
             var hwnd = WindowNative.GetWindowHandle(window);
-            _watcherHelper = new ForegroundWindowWatcherHelper(
+            _windowWatcher = new ForegroundWindowWatcher(
                 hwnd,
                 onWindowChanged =>
                 {
-                    if (_ignoreFullscreenWindow && window.AppWindow.Presenter is OverlappedPresenter presenter)
+                    _dispatcherQueueTimer.Debounce(() =>
                     {
-                        presenter.IsAlwaysOnTop = true;
-                    }
-                    UpdateAccentColor(hwnd, mode);
+                        if (_ignoreFullscreenWindow && window.AppWindow.Presenter is OverlappedPresenter presenter)
+                        {
+                            presenter.IsAlwaysOnTop = true;
+                        }
+                        UpdateAccentColor(hwnd);
+                    }, TimeSpan.FromMilliseconds(300));
                 }
             );
-            _watcherHelper.Start();
-            UpdateAccentColor(hwnd, mode);
-        }
-
-        public void UpdateAccentColor(nint hwnd, WindowColorSampleMode mode)
-        {
-            ActivatedWindowAccentColor = WindowColorHelper.GetDominantColor(hwnd, mode).ToColor();
-        }
-
-        [RelayCommand]
-        private void LockWindow()
-        {
-            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
-            if (window == null) return;
-
-            DesktopModeHelper.Lock(window);
-            IsLyricsWindowLocked = true;
+            _windowWatcher.Start();
+            UpdateAccentColor(hwnd);
         }
 
         private void StopWatchWindowColorChange()
         {
-            _watcherHelper?.Stop();
-            _watcherHelper = null;
+            _windowWatcher?.Stop();
+            _windowWatcher = null;
+        }
+
+        public void UpdateAccentColor(nint hwnd)
+        {
+            WindowPixelSampleMode mode = IsDesktopMode ? WindowPixelSampleMode.WindowEdge : _dockPlacement.ToWindowPixelSampleMode();
+            ActivatedWindowAccentColor = Helper.ColorHelper.GetAccentColor(hwnd, mode).ToColor();
+        }
+
+        public void InitLockHotKey()
+        {
+            UpdateLockHotKey(_settingsService.LockHotKeyIndex);
+        }
+
+        [RelayCommand]
+        private void ToggleLockWindow()
+        {
+            var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (window == null) return;
+
+            if (IsLyricsWindowLocked)
+            {
+                DesktopModeHelper.SetClickThrough(window, false);
+                IsLyricsWindowLocked = false;
+                IsImmersiveMode = _settingsService.IsImmersiveMode;
+            }
+            else
+            {
+                DesktopModeHelper.SetClickThrough(window, true);
+                IsLyricsWindowLocked = true;
+                IsImmersiveMode = true;
+            }
+
+            AutoHideOrShowWindow();
         }
 
         [RelayCommand]
@@ -167,8 +296,8 @@ namespace BetterLyrics.WinUI3
             IsDesktopMode = !IsDesktopMode;
             if (IsDesktopMode)
             {
-                StartWatchWindowColorChange(WindowColorSampleMode.WindowEdge);
                 DesktopModeHelper.Enable(window);
+                StartWatchWindowColorChange();
             }
             else
             {
@@ -187,13 +316,33 @@ namespace BetterLyrics.WinUI3
             IsDockMode = !IsDockMode;
             if (IsDockMode)
             {
-                StartWatchWindowColorChange(WindowColorSampleMode.BelowWindow);
-                DockModeHelper.Enable(window, _settingsService.LyricsFontSize * 4);
+                DockModeHelper.Enable(window, _dockWindowHeight, _dockPlacement);
+                StartWatchWindowColorChange();
             }
             else
             {
                 DockModeHelper.Disable(window);
             }
+
+            AutoHideOrShowWindow();
+        }
+
+        [RelayCommand]
+        private void OnImmersiveToggleButtonEnabledChanged()
+        {
+            _settingsService.IsImmersiveMode = IsImmersiveMode;
+        }
+
+        public void Receive(PropertyChangedMessage<DockPlacement> message)
+        {
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.DockPlacement))
+                {
+                    _dockPlacement = message.NewValue;
+                    UpdateDockWindow();
+                }
+            }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryViewModel.cs

@@ -0,0 +1,158 @@
+using ATL;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.ApplicationModel;
+using Windows.Media;
+using Windows.Media.Core;
+using Windows.Media.Playback;
+
+namespace BetterLyrics.WinUI3.ViewModels
+{
+    public partial class MusicGalleryViewModel : BaseViewModel,
+        IRecipient<PropertyChangedMessage<ObservableCollection<LocalMediaFolder>>>
+    {
+        private readonly ILibWatcherService _libWatcherService;
+        private readonly MediaPlayer _mediaPlayer = new();
+        private readonly MediaTimelineController _timelineController = new();
+        private readonly SystemMediaTransportControls _smtc;
+        private List<Track> _tracks = [];
+
+        [ObservableProperty]
+        public partial ObservableCollection<GroupInfoList> TracksByTitle { get; set; } = [];
+
+        [ObservableProperty]
+        public partial bool IsDataLoading { get; set; } = false;
+
+        public MusicGalleryViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService) : base(settingsService)
+        {
+            _timelineController = _mediaPlayer.TimelineController = new();
+            _timelineController.PositionChanged += TimelineController_PositionChanged;
+            _smtc = _mediaPlayer.SystemMediaTransportControls;
+            _mediaPlayer.CommandManager.IsEnabled = false;
+            _smtc.IsEnabled = true;
+            _smtc.IsPlayEnabled = true;
+            _smtc.IsPauseEnabled = true;
+            _smtc.IsNextEnabled = true;
+            _smtc.IsPreviousEnabled = true;
+            _smtc.ButtonPressed += Smtc_ButtonPressed;
+
+            _libWatcherService = libWatcherService;
+            _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged;
+        }
+
+        private void TimelineController_PositionChanged(MediaTimelineController sender, object args)
+        {
+            _smtc.UpdateTimelineProperties(new SystemMediaTransportControlsTimelineProperties()
+            {
+                Position = sender.Position,
+                EndTime = sender.Duration ?? TimeSpan.Zero
+            });
+        }
+
+        private void Smtc_ButtonPressed(SystemMediaTransportControls sender, SystemMediaTransportControlsButtonPressedEventArgs args)
+        {
+            switch (args.Button)
+            {
+                case SystemMediaTransportControlsButton.Play:
+                    _smtc.PlaybackStatus = MediaPlaybackStatus.Playing;
+                    _mediaPlayer.Play();
+                    break;
+                case SystemMediaTransportControlsButton.Pause:
+                    _smtc.PlaybackStatus = MediaPlaybackStatus.Paused;
+                    _mediaPlayer.Pause();
+                    break;
+                case SystemMediaTransportControlsButton.Next:
+                    //Next
+                    break;
+                case SystemMediaTransportControlsButton.Previous:
+                    //Previous
+                    break;
+            }
+        }
+
+        private void LibWatcherService_MusicLibraryFilesChanged(object? sender, Events.LibChangedEventArgs e)
+        {
+            RefreshSongs();
+        }
+
+        public void RefreshSongs()
+        {
+            IsDataLoading = true;
+            _tracks.Clear();
+
+            Task.Run(() =>
+            {
+                foreach (var folder in _settingsService.LocalMediaFolders)
+                {
+                    if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                    {
+                        foreach (var file in Directory.GetFiles(folder.Path, $"*.*", SearchOption.AllDirectories))
+                        {
+                            Track track = new(file);
+                            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                            {
+                                _tracks.Add(track);
+                            });
+                        }
+                    }
+                }
+
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    TracksByTitle.AddRange(_tracks.GetGroupedByTitleAsync());
+                    IsDataLoading = false;
+                });
+            });
+        }
+
+        public void PlaySongAt(int? index)
+        {
+            if (index.HasValue)
+            {
+                var track = _tracks.ElementAtOrDefault(index.Value);
+                if (track != null)
+                {
+                    _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(track.Path));
+                    var updater = _smtc.DisplayUpdater;
+                    updater.AppMediaId = Package.Current.Id.FullName;
+                    updater.Type = MediaPlaybackType.Music;
+                    updater.MusicProperties.Title = track.Title;
+                    updater.MusicProperties.Artist = track.Artist;
+                    updater.MusicProperties.AlbumTitle = track.Album;
+                    if (track.EmbeddedPictures.FirstOrDefault()?.PictureData is byte[] pictureData)
+                    {
+                        updater.Thumbnail = ImageHelper.ByteArrayToRandomAccessStreamReference(pictureData);
+                    }
+                    _timelineController.Duration = TimeSpan.FromSeconds(track.Duration);
+                    _timelineController.Start();
+                    updater.Update();
+                    _smtc.PlaybackStatus = MediaPlaybackStatus.Playing;
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<ObservableCollection<LocalMediaFolder>> message)
+        {
+            if (message.Sender is SettingsPageViewModel)
+            {
+                if (message.PropertyName == nameof(SettingsPageViewModel.LocalMediaFolders))
+                {
+                    RefreshSongs();
+                }
+            }
+        }
+    }
+}

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

@@ -7,25 +7,19 @@ using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
-using ShadowViewer.Controls;
+using Microsoft.UI.Xaml.Controls;
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
 using Windows.Globalization;
-using Windows.Media.Playback;
-using Windows.System;
 using Windows.UI;
-using Windows.UI.Popups;
 using WinRT.Interop;
-using AppInfo = BetterLyrics.WinUI3.Helper.AppInfo;
+using MetadataHelper = BetterLyrics.WinUI3.Helper.MetadataHelper;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -33,11 +27,11 @@ namespace BetterLyrics.WinUI3.ViewModels
     {
         private readonly ILibWatcherService _libWatcherService;
         private readonly IPlaybackService _playbackService;
-        private readonly ILibreTranslateService _libreTranslateService;
+        private readonly ITranslateService _libreTranslateService;
 
         private readonly string _autoStartupTaskId = "AutoStartup";
 
-        public SettingsPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IPlaybackService playbackService, ILibreTranslateService libreTranslateService) : base(settingsService)
+        public SettingsPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, IPlaybackService playbackService, ITranslateService libreTranslateService) : base(settingsService)
         {
             _libWatcherService = libWatcherService;
             _playbackService = playbackService;
@@ -46,8 +40,9 @@ namespace BetterLyrics.WinUI3.ViewModels
             LibreTranslateServer = _settingsService.LibreTranslateServer;
             SelectedTargetLanguageIndex = _settingsService.SelectedTargetLanguageIndex;
 
-            LocalLyricsFolders = [.. _settingsService.LocalLyricsFolders];
+            LocalMediaFolders = [.. _settingsService.LocalMediaFolders];
             LyricsSearchProvidersInfo = [.. _settingsService.LyricsSearchProvidersInfo];
+            AlbumArtSearchProvidersInfo = [.. _settingsService.AlbumArtSearchProvidersInfo];
 
             Language = _settingsService.Language;
             CoverImageRadius = _settingsService.CoverImageRadius;
@@ -68,6 +63,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             LyricsFontSize = _settingsService.LyricsFontSize;
             IsLyricsGlowEffectEnabled = _settingsService.IsLyricsGlowEffectEnabled;
             LyricsGlowEffectScope = _settingsService.LyricsGlowEffectScope;
+            LyricsHighlightScope = _settingsService.LyricsHighlightScope;
             IsFanLyricsEnabled = _settingsService.IsFanLyricsEnabled;
 
             LyricsBgFontColorType = _settingsService.LyricsBgFontColorType;
@@ -79,18 +75,34 @@ namespace BetterLyrics.WinUI3.ViewModels
             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;
 
             Task.Run(async () =>
             {
-                BuildDate = (await Helper.AppInfo.GetBuildDate()).ToString("(yyyy/MM/dd HH:mm:ss)");
+                BuildDate = (await MetadataHelper.GetBuildDate()).ToString("(yyyy/MM/dd HH:mm:ss)");
             });
         }
 
@@ -99,6 +111,29 @@ namespace BetterLyrics.WinUI3.ViewModels
             MediaSourceProvidersInfo = [.. e.MediaSourceProviersInfo];
         }
 
+        [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; }
@@ -137,12 +172,16 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial Enums.Language Language { get; set; }
 
         [ObservableProperty]
-        public partial ObservableCollection<LocalLyricsFolder> LocalLyricsFolders { get; set; }
+        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; }
 
@@ -178,6 +217,10 @@ namespace BetterLyrics.WinUI3.ViewModels
         [NotifyPropertyChangedRecipients]
         public partial Color LyricsCustomStrokeFontColor { get; set; }
 
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial int LyricsBgFontOpacity { get; set; }
+
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
         public partial LyricsFontColorType LyricsBgFontColorType { get; set; }
@@ -202,6 +245,10 @@ namespace BetterLyrics.WinUI3.ViewModels
         [NotifyPropertyChangedRecipients]
         public partial LineRenderingType LyricsGlowEffectScope { get; set; }
 
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial LineRenderingType LyricsHighlightScope { get; set; }
+
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
         public partial float LyricsLineSpacingFactor { get; set; }
@@ -211,9 +258,17 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial int LyricsVerticalEdgeOpacity { get; set; }
 
         [ObservableProperty]
-        public partial object NavViewSelectedItemTag { get; set; }
+        public partial object NavViewSelectedItemTag { get; set; } = "App";
 
-        public string Version { get; set; } = Helper.AppInfo.AppVersion;
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool ResetPositionOffsetOnSongChanged { get; set; }
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial bool IsLyricsFloatAnimationEnabled { get; set; }
+
+        public string Version { get; set; } = MetadataHelper.AppVersion;
 
         public string BuildDate { get; set; } = string.Empty;
 
@@ -235,15 +290,32 @@ namespace BetterLyrics.WinUI3.ViewModels
         [NotifyPropertyChangedRecipients]
         public partial bool IgnoreFullscreenWindow { get; set; }
 
-        partial void OnLyricsBackgroundThemeChanged(ElementTheme value)
-        {
-            _settingsService.LyricsBackgroundTheme = value;
-        }
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        public partial EasingType LyricsScrollEasingType { get; set; }
 
-        partial void OnLyricsFontStrokeWidthChanged(int value)
-        {
-            _settingsService.LyricsFontStrokeWidth = value;
-        }
+        [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()
         {
@@ -255,23 +327,28 @@ namespace BetterLyrics.WinUI3.ViewModels
             );
         }
 
-        public void OpenMusicFolder(LocalLyricsFolder folder)
+        public void OnAlbumArtSearchProvidersReordered()
         {
-            OpenFolderInFileExplorer(folder.Path);
+            _settingsService.AlbumArtSearchProvidersInfo = [.. AlbumArtSearchProvidersInfo];
+            Broadcast(
+                AlbumArtSearchProvidersInfo,
+                AlbumArtSearchProvidersInfo,
+                nameof(AlbumArtSearchProvidersInfo)
+            );
         }
 
-        public void RemoveFolderAsync(LocalLyricsFolder folder)
+        public void RemoveFolderAsync(LocalMediaFolder folder)
         {
-            LocalLyricsFolders.Remove(folder);
-            _settingsService.LocalLyricsFolders = [.. LocalLyricsFolders];
-            _libWatcherService.UpdateWatchers([.. LocalLyricsFolders]);
-            Broadcast(LocalLyricsFolders, LocalLyricsFolders, nameof(LocalLyricsFolders));
+            LocalMediaFolders.Remove(folder);
+            _settingsService.LocalMediaFolders = [.. LocalMediaFolders];
+            _libWatcherService.UpdateWatchers([.. LocalMediaFolders]);
+            Broadcast(LocalMediaFolders, LocalMediaFolders, nameof(LocalMediaFolders));
         }
 
-        public void ToggleLocalLyricsFolder(LocalLyricsFolder folder)
+        public void ToggleLocalLyricsFolder(LocalMediaFolder folder)
         {
-            _settingsService.LocalLyricsFolders = [.. LocalLyricsFolders];
-            Broadcast(LocalLyricsFolders, LocalLyricsFolders, nameof(LocalLyricsFolders));
+            _settingsService.LocalMediaFolders = [.. LocalMediaFolders];
+            Broadcast(LocalMediaFolders, LocalMediaFolders, nameof(LocalMediaFolders));
         }
 
         public void ToggleLyricsSearchProvider(LyricsSearchProviderInfo providerInfo)
@@ -284,6 +361,16 @@ namespace BetterLyrics.WinUI3.ViewModels
             );
         }
 
+        public void ToggleAlbumArtSearchProvider(AlbumArtSearchProviderInfo providerInfo)
+        {
+            _settingsService.AlbumArtSearchProvidersInfo = [.. AlbumArtSearchProvidersInfo];
+            Broadcast(
+                AlbumArtSearchProvidersInfo,
+                AlbumArtSearchProvidersInfo,
+                nameof(AlbumArtSearchProvidersInfo)
+            );
+        }
+
         public void ToggleMediaSourceProvider(MediaSourceProviderInfo providerInfo)
         {
             Broadcast(
@@ -297,16 +384,16 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             var normalizedPath = Path.GetFullPath(path).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
 
-            if (LocalLyricsFolders.Any(x => Path.GetFullPath(x.Path).TrimEnd(Path.DirectorySeparatorChar).Equals(normalizedPath.TrimEnd(Path.DirectorySeparatorChar), StringComparison.OrdinalIgnoreCase)))
+            if (LocalMediaFolders.Any(x => Path.GetFullPath(x.Path).TrimEnd(Path.DirectorySeparatorChar).Equals(normalizedPath.TrimEnd(Path.DirectorySeparatorChar), StringComparison.OrdinalIgnoreCase)))
             {
                 App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPagePathExistedInfo"));
             }
-            else if (LocalLyricsFolders.Any(item => normalizedPath.StartsWith(Path.GetFullPath(item.Path).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)))
+            else if (LocalMediaFolders.Any(item => normalizedPath.StartsWith(Path.GetFullPath(item.Path).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)))
             {
                 // 添加的文件夹是现有文件夹的子文件夹
                 App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPagePathBeIncludedInfo"));
             }
-            else if (LocalLyricsFolders.Any(item => Path.GetFullPath(item.Path).TrimEnd(Path.DirectorySeparatorChar).StartsWith(normalizedPath, StringComparison.OrdinalIgnoreCase))
+            else if (LocalMediaFolders.Any(item => Path.GetFullPath(item.Path).TrimEnd(Path.DirectorySeparatorChar).StartsWith(normalizedPath, StringComparison.OrdinalIgnoreCase))
             )
             {
                 // 添加的文件夹是现有文件夹的父文件夹
@@ -314,45 +401,27 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             else
             {
-                LocalLyricsFolders.Add(new LocalLyricsFolder(path, true));
-                _settingsService.LocalLyricsFolders = [.. LocalLyricsFolders];
-                _libWatcherService.UpdateWatchers([.. LocalLyricsFolders]);
-                Broadcast(LocalLyricsFolders, LocalLyricsFolders, nameof(LocalLyricsFolders));
+                LocalMediaFolders.Add(new LocalMediaFolder(path, true));
+                _settingsService.LocalMediaFolders = [.. LocalMediaFolders];
+                _libWatcherService.UpdateWatchers([.. LocalMediaFolders]);
+                Broadcast(LocalMediaFolders, LocalMediaFolders, nameof(LocalMediaFolders));
             }
         }
 
         [RelayCommand]
         private async Task LaunchProjectGitHubPageAsync()
         {
-            await Launcher.LaunchUriAsync(new Uri(Helper.AppInfo.GithubUrl));
+            await Windows.System.Launcher.LaunchUriAsync(new Uri(MetadataHelper.GithubUrl));
         }
 
         [RelayCommand]
-        private void OpenCacheFolder()
+        private static async Task OpenCacheFolderAsync()
         {
-            OpenFolderInFileExplorer(Helper.AppInfo.CacheFolder);
-        }
-
-        private void OpenFolderInFileExplorer(string path)
-        {
-            Process.Start(
-                new ProcessStartInfo
-                {
-                    FileName = "explorer.exe",
-                    Arguments = path,
-                    UseShellExecute = true,
-                }
-            );
+            await Windows.System.Launcher.LaunchFolderPathAsync(PathHelper.CacheFolder);
         }
 
         [RelayCommand]
-        private void PlayTestingMusicTask()
-        {
-            WindowHelper.OpenOrShowWindow<LyricsWindow>();
-        }
-
-        [RelayCommand]
-        private void RestartApp()
+        private static void RestartApp()
         {
             WindowHelper.RestartApp();
         }
@@ -385,24 +454,42 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 try
                 {
-                    string result = await _libreTranslateService.TranslateAsync("Hello, world!", null);
-                    _dispatcherQueue.TryEnqueue(() =>
+                    string targetLangCode = LanguageHelper.SupportedTargetLanguages[SelectedTargetLanguageIndex].Code;
+                    string result = await _libreTranslateService.TranslateTextAsync("Hello, world!", targetLangCode, null);
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
-                        App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPageLibreTranslateTestSuccessInfo"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Success);
+                        App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPageServerTestSuccessInfo"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Success);
                         IsLibreTranslateServerTesting = false;
                     });
                 }
                 catch (Exception)
                 {
-                    _dispatcherQueue.TryEnqueue(() =>
+                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
                     {
-                        App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPageLibreTranslateTestFailedInfo"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
+                        App.Current.SettingsWindowNotificationPanel?.Notify(App.ResourceLoader!.GetString("SettingsPageServerTestFailedInfo"), Microsoft.UI.Xaml.Controls.InfoBarSeverity.Error);
                         IsLibreTranslateServerTesting = false;
                     });
                 }
             });
         }
 
+        [RelayCommand]
+        private void LXMusicServerTest()
+        {
+            IsLXMusicServerTesting = true;
+            Task.Run(async () =>
+            {
+                bool testResult = await NetHelper.CheckConnectivity($"{LXMusicServer}/status");
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    App.Current.SettingsWindowNotificationPanel?.Notify(
+                        App.ResourceLoader!.GetString($"SettingsPageServerTest{(testResult ? "Success" : "Failed")}Info"),
+                        testResult ? InfoBarSeverity.Success : InfoBarSeverity.Error);
+                    IsLXMusicServerTesting = false;
+                });
+            });
+        }
+
         public async Task<bool> ToggleAutoStartupAsync(bool target)
         {
             StartupTask startupTask = await StartupTask.GetAsync(_autoStartupTaskId);
@@ -435,51 +522,66 @@ 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 OnCoverOverlayOpacityChanged(int value)
         {
             _settingsService.CoverOverlayOpacity = value;
         }
-
         partial void OnIsDynamicCoverOverlayEnabledChanged(bool value)
         {
             _settingsService.IsDynamicCoverOverlayEnabled = value;
         }
-
         partial void OnLanguageChanged(Enums.Language value)
         {
             switch (value)
@@ -507,85 +609,116 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             _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();
+            }
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/SettingsWindowViewModel.cs

@@ -2,8 +2,7 @@
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public class SettingsWindowViewModel : BaseWindowViewModel
+    public partial class SettingsWindowViewModel(ISettingsService settingsService) : BaseWindowViewModel(settingsService)
     {
-        public SettingsWindowViewModel(ISettingsService settingsService) : base(settingsService) { }
     }
 }

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

@@ -5,19 +5,18 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.UI.Xaml;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class SystemTrayViewModel : BaseViewModel, IRecipient<PropertyChangedMessage<bool>>
+    public partial class SystemTrayViewModel(ISettingsService settingsService) : BaseViewModel(settingsService), IRecipient<PropertyChangedMessage<bool>>
     {
-        public SystemTrayViewModel(ISettingsService settingsService) : base(settingsService) { }
-
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
         public partial bool IsLyricsWindowLocked { get; set; } = false;
 
         [ObservableProperty]
-        public partial string ToolTipText { get; set; } = AppInfo.AppName;
+        public partial string ToolTipText { get; set; } = MetadataHelper.AppName;
 
         public void Receive(PropertyChangedMessage<bool> message)
         {
@@ -34,16 +33,20 @@ namespace BetterLyrics.WinUI3.ViewModels
         }
 
         [RelayCommand]
-        private void ExitApp()
+        private static void ExitApp()
         {
-            WindowHelper.ExitAllWindows();
+            LyricsWindow? lyricsWindow = WindowHelper.GetWindowByWindowType<LyricsWindow>();
+            if (lyricsWindow != null)
+            {
+                DockModeHelper.Disable(lyricsWindow);
+            }
+            Application.Current.Exit();
         }
 
         [RelayCommand]
-        private void OpenSettings()
+        private static void OpenSettings()
         {
-            // 打开设置窗口
-            WindowHelper.OpenOrShowWindow<SettingsWindow>();
+            WindowHelper.OpenWindow<SettingsWindow>();
         }
 
         [RelayCommand]
@@ -52,7 +55,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             var window = WindowHelper.GetWindowByWindowType<LyricsWindow>();
             if (window == null) return;
 
-            DesktopModeHelper.Unlock(window);
+            DesktopModeHelper.SetClickThrough(window, false);
             IsLyricsWindowLocked = false;
         }
     }

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

@@ -18,160 +18,379 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid">
+    <Grid x:Name="RootGrid" SizeChanged="RootGrid_SizeChanged">
         <!--  Lyrics area  -->
         <renderer:LyricsRenderer />
 
         <!--  No music playing placeholder  -->
-        <Grid x:Name="NoMusicPlayingGrid" Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
+        <Grid x:Name="NoMusicPlayingGrid" Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}">
             <TextBlock
                 x:Uid="MainPageNoMusicPlaying"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                Style="{StaticResource TitleTextBlockStyle}" />
+                FontFamily="{x:Bind ViewModel.LyricsFontFamily, Mode=OneWay}"
+                FontSize="{x:Bind ViewModel.LyricsFontSize, Mode=OneWay}" />
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
+            <interactivity:Interaction.Behaviors>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.SongInfo, Mode=OneWay}"
+                    ComparisonCondition="Equal"
+                    Value="{x:Null}">
+                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                </interactivity:DataTriggerBehavior>
+                <interactivity:DataTriggerBehavior
+                    Binding="{x:Bind ViewModel.SongInfo, Mode=OneWay}"
+                    ComparisonCondition="NotEqual"
+                    Value="{x:Null}">
+                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                </interactivity:DataTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
         </Grid>
 
         <!--  Bottom command area  -->
         <Grid
             x:Name="BottomCommandGrid"
-            Padding="12"
+            Margin="12"
             VerticalAlignment="Bottom"
             Background="Transparent"
-            Opacity="0"
+            Opacity="{x:Bind ViewModel.BottomCommandGridOpacity, Mode=OneWay}"
             PointerEntered="BottomCommandGrid_PointerEntered"
             PointerExited="BottomCommandGrid_PointerExited">
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
 
-            <StackPanel
-                x:Name="BottomLeftCommandStackPanel"
-                HorizontalAlignment="Left"
-                Orientation="Horizontal"
-                Spacing="6">
-                <StackPanel.OpacityTransition>
-                    <ScalarTransition />
-                </StackPanel.OpacityTransition>
-            </StackPanel>
+            <Grid x:Name="BottomCommandContent">
+                <Grid Padding="3" HorizontalAlignment="Left">
+                    <StackPanel
+                        x:Name="BottomLeftCommandStackPanel"
+                        Orientation="Horizontal"
+                        Spacing="3">
 
-            <StackPanel
-                x:Name="BottomCenterCommandStackPanel"
-                HorizontalAlignment="Center"
-                Orientation="Horizontal"
-                Spacing="6">
-                <StackPanel.OpacityTransition>
-                    <ScalarTransition />
-                </StackPanel.OpacityTransition>
-            </StackPanel>
+                        <StackPanel
+                            Margin="0,0,0,2"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal"
+                            Spacing="2">
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{Binding ElementName=TimelineSlider, Path=Value, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
+                            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="/" />
+                            <TextBlock Text="{Binding ElementName=TimelineSlider, Path=Maximum, Converter={StaticResource SecondsToFormattedTimeConverter}}" />
+                        </StackPanel>
 
-            <StackPanel
-                x:Name="BottomRightCommandStackPanel"
-                HorizontalAlignment="Right"
-                Orientation="Horizontal"
-                Spacing="6">
-                <StackPanel.OpacityTransition>
-                    <ScalarTransition />
-                </StackPanel.OpacityTransition>
+                        <!--  Position offset  -->
+                        <Button Click="TimelineOffsetButton_Click" Style="{StaticResource GhostButtonStyle}">
+                            <FontIcon
+                                FontFamily="{StaticResource IconFontFamily}"
+                                Glyph="&#xECE7;"
+                                RenderTransformOrigin="0.5,0.5">
+                                <FontIcon.RenderTransform>
+                                    <RotateTransform Angle="90" CenterX="0.5" CenterY="0.5" />
+                                </FontIcon.RenderTransform>
+                            </FontIcon>
+                            <ToolTipService.ToolTip>
+                                <ToolTip x:Name="TimelineOffsetToolTip" x:Uid="LyricsPageTimelineOffsetButtonToolTip" />
+                            </ToolTipService.ToolTip>
+                            <Button.DataContext>
+                                <Flyout x:Name="TimelineOffsetFlyout" ShouldConstrainToRootBounds="False">
+                                    <StackPanel>
+                                        <Slider
+                                            x:Uid="MainPagePositionOffsetSlider"
+                                            Maximum="5000"
+                                            Minimum="-5000"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="100"
+                                            TickFrequency="100"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.PositionOffset, Mode=TwoWay}" />
+                                        <RelativePanel>
+                                            <TextBlock
+                                                RelativePanel.AlignLeftWithPanel="True"
+                                                RelativePanel.AlignVerticalCenterWithPanel="True"
+                                                Text="{x:Bind ViewModel.PositionOffset, Mode=OneWay}" />
+                                            <Button
+                                                Click="PositionOffsetResetButton_Click"
+                                                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                                      Glyph=&#xE777;}"
+                                                RelativePanel.AlignRightWithPanel="True"
+                                                RelativePanel.AlignVerticalCenterWithPanel="True"
+                                                Style="{StaticResource GhostButtonStyle}" />
+                                        </RelativePanel>
+                                        <CheckBox IsChecked="{x:Bind ViewModel.ResetPositionOffsetOnSongChanged, Mode=TwoWay}">
+                                            <TextBlock x:Uid="LyricsPagePositionOffsetHint" />
+                                        </CheckBox>
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.DataContext>
+                        </Button>
 
-                <!--  Position offset  -->
-                <Button Style="{StaticResource GhostButtonStyle}">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        Glyph="&#xECE7;"
-                        RenderTransformOrigin="0.5,0.5">
-                        <FontIcon.RenderTransform>
-                            <RotateTransform Angle="90" CenterX="0.5" CenterY="0.5" />
-                        </FontIcon.RenderTransform>
-                    </FontIcon>
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Name="TimelineOffsetToolTip" x:Uid="LyricsPageTimelineOffsetButtonToolTip" />
-                    </ToolTipService.ToolTip>
-                    <Button.Flyout>
-                        <Flyout>
-                            <StackPanel>
-                                <Slider
-                                    x:Uid="MainPagePositionOffsetSlider"
-                                    Maximum="2000"
-                                    Minimum="-2000"
-                                    SnapsTo="Ticks"
-                                    StepFrequency="100"
-                                    TickFrequency="100"
-                                    TickPlacement="Outside"
-                                    Value="{x:Bind ViewModel.PositionOffset, Mode=TwoWay}" />
-                                <RelativePanel>
-                                    <TextBlock
-                                        RelativePanel.AlignLeftWithPanel="True"
-                                        RelativePanel.AlignVerticalCenterWithPanel="True"
-                                        Text="{x:Bind ViewModel.PositionOffset, Mode=OneWay}" />
-                                    <Button
-                                        Click="PositionOffsetResetButton_Click"
-                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                              Glyph=&#xE777;}"
-                                        RelativePanel.AlignRightWithPanel="True"
-                                        RelativePanel.AlignVerticalCenterWithPanel="True"
-                                        Style="{StaticResource GhostButtonStyle}" />
-                                </RelativePanel>
-                                <TextBlock Opacity="0.5" x:Uid="LyricsPagePositionOffsetHint"/>
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
+                    </StackPanel>
+                </Grid>
 
-                <!--  Translation  -->
-                <ToggleButton
-                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                          Glyph=&#xE8C1;}"
-                    IsChecked="{x:Bind ViewModel.IsTranslationEnabled, Mode=TwoWay}"
-                    Style="{StaticResource GhostToggleButtonStyle}">
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Name="TranslationToolTip" x:Uid="LyricsPageTranslationButtonToolTip" />
-                    </ToolTipService.ToolTip>
-                </ToggleButton>
+                <Grid Padding="3" HorizontalAlignment="Center">
+                    <StackPanel
+                        x:Name="BottomCenterCommandStackPanel"
+                        Orientation="Horizontal"
+                        Spacing="3">
+                        <Button
+                            Command="{x:Bind ViewModel.PreviousSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE622;}"
+                            Style="{StaticResource GhostButtonStyle}" />
+                        <Button
+                            Command="{x:Bind ViewModel.PauseSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF8AE;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.IsSongPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="True">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                </interactivity:DataTriggerBehavior>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.IsSongPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="False">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                </interactivity:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Command="{x:Bind ViewModel.PlaySongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF5B0;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <interactivity:Interaction.Behaviors>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.IsSongPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="True">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
+                                </interactivity:DataTriggerBehavior>
+                                <interactivity:DataTriggerBehavior
+                                    Binding="{x:Bind ViewModel.IsSongPlaying, Mode=OneWay}"
+                                    ComparisonCondition="Equal"
+                                    Value="False">
+                                    <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
+                                </interactivity:DataTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </Button>
+                        <Button
+                            Command="{x:Bind ViewModel.NextSongCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE623;}"
+                            Style="{StaticResource GhostButtonStyle}" />
+                    </StackPanel>
+                </Grid>
 
-                <!--  Display type  -->
-                <Button
-                    x:Name="DisplayTypeSwitchButton"
-                    x:Uid="MainPageDisplayTypeSwitcher"
-                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                          Glyph=&#xF246;}"
-                    Style="{StaticResource GhostButtonStyle}">
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Name="PresentationTypeToolTip" x:Uid="LyricsPageDisplayTypeButtonToolTip" />
-                    </ToolTipService.ToolTip>
-                    <Button.Flyout>
-                        <Flyout>
-                            <Flyout.FlyoutPresenterStyle>
-                                <Style TargetType="FlyoutPresenter">
-                                    <Setter Property="Padding" Value="12,2,12,8" />
-                                    <Setter Property="CornerRadius" Value="8" />
-                                </Style>
-                            </Flyout.FlyoutPresenterStyle>
-                            <RadioButtons MaxColumns="1" SelectedIndex="{x:Bind ViewModel.DisplayType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}">
-                                <RadioButton x:Uid="MainPageAlbumArtOnly" Click="AlbumArtOnlyRadioButton_Click" />
-                                <RadioButton x:Uid="MainPageLyriscOnly" Click="LyricsOnlyRadioButton_Click" />
-                                <RadioButton x:Uid="MainPageSplitView" Click="SplitViewRadioButton_Click" />
-                            </RadioButtons>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
+                <Grid Padding="3" HorizontalAlignment="Right">
+                    <StackPanel
+                        x:Name="BottomRightCommandStackPanel"
+                        Orientation="Horizontal"
+                        Spacing="3">
 
-                <!--  Settings  -->
-                <Button
-                    x:Name="SettingsButton"
-                    Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
-                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                          Glyph=&#xE713;}"
-                    Style="{StaticResource GhostButtonStyle}">
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Name="SettingsToolTip" x:Uid="LyricsPageSettingsButtonToolTip" />
-                    </ToolTipService.ToolTip>
-                </Button>
+                        <!--  Volume  -->
+                        <!--<Button Click="VolumeButton_Click" Style="{StaticResource GhostButtonStyle}">
+                            <Grid>
 
-            </StackPanel>
+                        -->
+                        <!--  Volumn: 0  -->
+                        <!--
+                                <FontIcon
+                                    x:Name="VolumeLevel0"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE74F;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
 
+                        -->
+                        <!--  Volumn: 1-32  -->
+                        <!--
+                                <FontIcon
+                                    x:Name="VolumeLevel1"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE993;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+
+                        -->
+                        <!--  Volumn: 33-65  -->
+                        <!--
+                                <FontIcon
+                                    x:Name="VolumeLevel2"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE994;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+
+                        -->
+                        <!--  Volumn: 66-100  -->
+                        <!--
+                                <FontIcon
+                                    x:Name="VolumeLevel3"
+                                    FontFamily="{StaticResource IconFontFamily}"
+                                    Glyph="&#xE995;">
+                                    <FontIcon.OpacityTransition>
+                                        <ScalarTransition />
+                                    </FontIcon.OpacityTransition>
+                                </FontIcon>
+                            </Grid>
+                            <Button.DataContext>
+                                <Flyout x:Name="VolumeFlyout" ShouldConstrainToRootBounds="False">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.Volume, Mode=OneWay}" />
+                                        <TextBlock Margin="0,0,14,0" VerticalAlignment="Center" />
+                                        <Slider
+                                            Width="150"
+                                            Maximum="100"
+                                            Minimum="0"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="1"
+                                            TickFrequency="1"
+                                            TickPlacement="None"
+                                            Value="{x:Bind ViewModel.Volume, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.DataContext>
+                        </Button>-->
+
+                        <!--  Translation  -->
+                        <Button
+                            Click="TranslationButton_Click"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE8BD;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <ToolTip x:Name="TranslationToolTip" x:Uid="LyricsPageTranslationButtonToolTip" />
+                            </ToolTipService.ToolTip>
+                            <Button.DataContext>
+                                <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>
+                                </Flyout>
+                            </Button.DataContext>
+                        </Button>
+
+                        <!--  Display type  -->
+                        <Button
+                            x:Name="DisplayTypeSwitchButton"
+                            x:Uid="MainPageDisplayTypeSwitcher"
+                            Click="DisplayTypeSwitchButton_Click"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF246;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <ToolTip x:Name="PresentationTypeToolTip" x:Uid="LyricsPageDisplayTypeButtonToolTip" />
+                            </ToolTipService.ToolTip>
+                            <Button.DataContext>
+                                <Flyout x:Name="DisplayTypeSwitchFlyout" ShouldConstrainToRootBounds="false">
+                                    <Flyout.FlyoutPresenterStyle>
+                                        <Style TargetType="FlyoutPresenter">
+                                            <Setter Property="Padding" Value="12,2,12,8" />
+                                            <Setter Property="CornerRadius" Value="8" />
+                                        </Style>
+                                    </Flyout.FlyoutPresenterStyle>
+                                    <RadioButtons MaxColumns="1" SelectedIndex="{x:Bind ViewModel.DisplayType, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <RadioButton x:Uid="MainPageAlbumArtOnly" Click="AlbumArtOnlyRadioButton_Click" />
+                                        <RadioButton x:Uid="MainPageLyriscOnly" Click="LyricsOnlyRadioButton_Click" />
+                                        <RadioButton x:Uid="MainPageSplitView" Click="SplitViewRadioButton_Click" />
+                                    </RadioButtons>
+                                </Flyout>
+                            </Button.DataContext>
+                        </Button>
+
+                        <!--  Settings  -->
+                        <Button
+                            x:Name="SettingsButton"
+                            Command="{x:Bind ViewModel.OpenSettingsWindowCommand}"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xF8B0;}"
+                            Style="{StaticResource GhostButtonStyle}">
+                            <ToolTipService.ToolTip>
+                                <ToolTip x:Name="SettingsToolTip" x:Uid="LyricsPageSettingsButtonToolTip" />
+                            </ToolTipService.ToolTip>
+                        </Button>
+
+                    </StackPanel>
+                </Grid>
+
+                <Slider
+                    x:Name="TimelineSlider"
+                    Margin="0,-32,0,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Top"
+                    Maximum="{x:Bind ViewModel.SongDurationSeconds, Mode=OneWay}"
+                    Minimum="0"
+                    Style="{StaticResource GhostSliderStyle}"
+                    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>
+
+        <!--  Bottom command flyout trigger  -->
+        <Grid
+            x:Name="BottomCommandFlyoutTrigger"
+            Height="12"
+            VerticalAlignment="Bottom"
+            Background="Transparent"
+            CornerRadius="3,3,0,0"
+            Opacity="{x:Bind ViewModel.BottomCommandFlyoutTriggerOpacity, Mode=OneWay}"
+            PointerEntered="BottomCommandFlyoutTrigger_PointerEntered"
+            PointerExited="BottomCommandFlyoutTrigger_PointerExited"
+            Tapped="BottomCommandFlyoutTrigger_Tapped">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <Grid
+                x:Name="BottomCommandFlyoutTriggerHint"
+                Width="150"
+                Margin="4"
+                Background="{ThemeResource TextFillColorPrimaryBrush}"
+                CornerRadius="2"
+                Translation="0,0,0">
+                <Grid.TranslationTransition>
+                    <Vector3Transition />
+                </Grid.TranslationTransition>
+            </Grid>
+            <Grid.ContextFlyout>
+                <Flyout x:Name="BottomCommandFlyout" ShouldConstrainToRootBounds="False">
+                    <Flyout.FlyoutPresenterStyle>
+                        <Style TargetType="FlyoutPresenter">
+                            <Setter Property="MinWidth" Value="600" />
+                            <Setter Property="MinHeight" Value="100" />
+                            <Setter Property="CornerRadius" Value="12" />
+                        </Style>
+                    </Flyout.FlyoutPresenterStyle>
+                    <Grid x:Name="BottomCommandFlyoutContainer" VerticalAlignment="Bottom" />
+                </Flyout>
+            </Grid.ContextFlyout>
         </Grid>
 
         <TeachingTip
@@ -184,29 +403,64 @@
         <uc:SystemTray />
 
         <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="MusicPlayingStates">
-                <VisualState x:Name="MusicPlaying">
-                    <VisualState.StateTriggers>
-                        <ui:IsNotEqualStateTrigger Value="{x:Bind ViewModel.DisplayType, Converter={StaticResource EnumToIntConverter}, Mode=OneWay}" To="3" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="DisplayTypeSwitchButton.Visibility" Value="Visible" />
-                        <Setter Target="NoMusicPlayingGrid.Opacity" Value="0" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="NoMusicPlaying">
+            <!--<VisualStateGroup x:Name="VolumeState">
+                <VisualState x:Name="Volume0">
                     <VisualState.StateTriggers>
                         <ui:CompareStateTrigger
                             Comparison="Equal"
-                            Value="{x:Bind ViewModel.DisplayType, Converter={StaticResource EnumToIntConverter}, Mode=OneWay}"
-                            To="3" />
+                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                            To="0" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="DisplayTypeSwitchButton.Visibility" Value="Collapsed" />
-                        <Setter Target="NoMusicPlayingGrid.Opacity" Value="1" />
+                        <Setter Target="VolumeLevel0.Opacity" Value="1" />
+                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
                     </VisualState.Setters>
                 </VisualState>
-            </VisualStateGroup>
+                <VisualState x:Name="Volume1">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="LessThanOrEqual"
+                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                            To="32" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel1.Opacity" Value="1" />
+                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Volume2">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="LessThanOrEqual"
+                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                            To="65" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel2.Opacity" Value="1" />
+                        <Setter Target="VolumeLevel3.Opacity" Value="0" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Volume3">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="LessThanOrEqual"
+                            Value="{x:Bind ViewModel.Volume, Mode=OneWay}"
+                            To="100" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="VolumeLevel0.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel1.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel2.Opacity" Value="0" />
+                        <Setter Target="VolumeLevel3.Opacity" Value="1" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>-->
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>

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

@@ -1,10 +1,13 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Services;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using System.Diagnostics;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
@@ -12,15 +15,18 @@ namespace BetterLyrics.WinUI3.Views
 {
     public sealed partial class LyricsPage : Page
     {
+        private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        private readonly IPlaybackService _playbackService = Ioc.Default.GetRequiredService<IPlaybackService>();
+
+        public LyricsPageViewModel ViewModel => (LyricsPageViewModel)DataContext;
+
         public LyricsPage()
         {
             this.InitializeComponent();
 
-            DataContext = Ioc.Default.GetService<LyricsPageViewModel>();
+            DataContext = Ioc.Default.GetRequiredService<LyricsPageViewModel>();
         }
 
-        public LyricsPageViewModel ViewModel => (LyricsPageViewModel)DataContext;
-
         private void WelcomeTeachingTip_Closed(TeachingTip sender, TeachingTipClosedEventArgs args)
         {
             ViewModel.IsFirstRun = false;
@@ -28,17 +34,20 @@ namespace BetterLyrics.WinUI3.Views
 
         private void LyricsOnlyRadioButton_Click(object sender, RoutedEventArgs e)
         {
-            ViewModel.PreferredDisplayType = ViewModel.DisplayType = LyricsDisplayType.LyricsOnly;
+            ViewModel.DisplayType = LyricsDisplayType.LyricsOnly;
+            _settingsService.DisplayType = ViewModel.DisplayType;
         }
 
         private void AlbumArtOnlyRadioButton_Click(object sender, RoutedEventArgs e)
         {
-            ViewModel.PreferredDisplayType = ViewModel.DisplayType = LyricsDisplayType.AlbumArtOnly;
+            ViewModel.DisplayType = LyricsDisplayType.AlbumArtOnly;
+            _settingsService.DisplayType = ViewModel.DisplayType;
         }
 
         private void SplitViewRadioButton_Click(object sender, RoutedEventArgs e)
         {
-            ViewModel.PreferredDisplayType = ViewModel.DisplayType = LyricsDisplayType.SplitView;
+            ViewModel.DisplayType = LyricsDisplayType.SplitView;
+            _settingsService.DisplayType = ViewModel.DisplayType;
         }
 
         private void PositionOffsetResetButton_Click(object sender, RoutedEventArgs e)
@@ -48,12 +57,92 @@ namespace BetterLyrics.WinUI3.Views
 
         private void BottomCommandGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-            BottomCommandGrid.Opacity = 1;
+            if (ViewModel.IsImmersiveMode && BottomCommandGrid.Children.Count != 0)
+            {
+                ViewModel.BottomCommandGridOpacity = 1f;
+            }
+            e.Handled = true;
         }
 
         private void BottomCommandGrid_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-            BottomCommandGrid.Opacity = 0;
+            if (ViewModel.IsImmersiveMode && BottomCommandGrid.Children.Count != 0)
+            {
+                ViewModel.BottomCommandGridOpacity = 0f;
+            }
+            e.Handled = true;
+        }
+
+        private void DisplayTypeSwitchButton_Click(object sender, RoutedEventArgs e)
+        {
+            DisplayTypeSwitchFlyout.ShowAt(BottomRightCommandStackPanel);
+        }
+
+        private void TimelineOffsetButton_Click(object sender, RoutedEventArgs e)
+        {
+            TimelineOffsetFlyout.ShowAt(BottomLeftCommandStackPanel);
+        }
+
+        private void TranslationButton_Click(object sender, RoutedEventArgs e)
+        {
+            TranslationFlyout.ShowAt(BottomRightCommandStackPanel);
+        }
+
+        private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (e.NewSize.Width < 500 || e.NewSize.Height < 100)
+            {
+                if (BottomCommandGrid.Children.Count != 0)
+                {
+                    BottomCommandGrid.Children.Remove(BottomCommandContent);
+                    BottomCommandFlyoutContainer.Children.Add(BottomCommandContent);
+                }
+                BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 0, 0);
+            }
+            else
+            {
+                if (BottomCommandFlyoutContainer.Children.Count != 0)
+                {
+                    BottomCommandFlyout.Hide();
+                    BottomCommandFlyoutContainer.Children.Remove(BottomCommandContent);
+                    BottomCommandGrid.Children.Add(BottomCommandContent);
+                }
+                BottomCommandFlyoutTriggerHint.Translation = new Vector3(0, 12, 0);
+            }
+        }
+
+        //private void VolumeButton_Click(object sender, RoutedEventArgs e)
+        //{
+        //    VolumeFlyout.ShowAt(BottomRightCommandStackPanel);
+        //}
+
+        private void BottomCommandFlyoutTrigger_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            if (ViewModel.IsImmersiveMode && BottomCommandFlyoutContainer.Children.Count != 0)
+            {
+                ViewModel.BottomCommandFlyoutTriggerOpacity = 1f;
+            }
+        }
+
+        private void BottomCommandFlyoutTrigger_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+        {
+            if (ViewModel.IsImmersiveMode && BottomCommandFlyoutContainer.Children.Count != 0)
+            {
+                ViewModel.BottomCommandFlyoutTriggerOpacity = 0f;
+            }
+        }
+
+        private void BottomCommandFlyoutTrigger_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+        {
+            if (BottomCommandFlyoutContainer.Children.Count != 0)
+            {
+                BottomCommandFlyout.ShowAt(BottomCommandFlyoutTrigger);
+            }
+        }
+
+        private void TimelineSliderOverlay_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+        {
+            _playbackService.ChangePosition(TimelineSliderOverlay.Value);
         }
     }
 }

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

@@ -12,11 +12,13 @@
     xmlns:scontrols="using:ShadowViewer.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
-    <Window.SystemBackdrop>
-        <MicaBackdrop />
-    </Window.SystemBackdrop>
 
-    <Grid x:Name="RootGrid" RequestedTheme="{x:Bind ViewModel.ThemeType, Mode=OneWay}">
+    <Grid
+        x:Name="RootGrid"
+        PointerEntered="RootGrid_PointerEntered"
+        PointerExited="RootGrid_PointerExited"
+        RequestedTheme="{x:Bind ViewModel.ThemeType, Mode=OneWay}"
+        SizeChanged="RootGrid_SizeChanged">
 
         <local:LyricsPage />
 
@@ -25,128 +27,168 @@
             x:Name="TopCommandGrid"
             VerticalAlignment="Top"
             Background="Transparent"
-            Opacity="0"
+            Opacity="{x:Bind ViewModel.TopCommandGridOpacity, Mode=OneWay}"
             PointerEntered="TopCommandGrid_PointerEntered"
             PointerExited="TopCommandGrid_PointerExited">
             <Grid.OpacityTransition>
                 <ScalarTransition />
             </Grid.OpacityTransition>
 
-            <StackPanel
-                x:Name="TopLeftCommandStackPanel"
-                Margin="12"
-                HorizontalAlignment="Left"
-                Orientation="Horizontal"
-                Spacing="6">
-                <StackPanel.OpacityTransition>
-                    <ScalarTransition />
-                </StackPanel.OpacityTransition>
-            </StackPanel>
+            <Grid Padding="3" HorizontalAlignment="Left">
+                <StackPanel
+                    x:Name="TopLeftCommandStackPanel"
+                    HorizontalAlignment="Left"
+                    Orientation="Horizontal"
+                    Spacing="3">
+                    <StackPanel.OpacityTransition>
+                        <ScalarTransition />
+                    </StackPanel.OpacityTransition>
 
-            <StackPanel
-                x:Name="TopRightCommandStackPanel"
-                HorizontalAlignment="Right"
-                Orientation="Horizontal">
-                <StackPanel.OpacityTransition>
-                    <ScalarTransition />
-                </StackPanel.OpacityTransition>
+                    <!--  Music gallery  -->
+                    <Button
+                        Click="MusicGalleryButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}"
+                        Visibility="Collapsed">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize}"
+                            Glyph="&#xE8A9;" />
+                    </Button>
+                    <!--  Immersive mode  -->
+                    <ToggleButton
+                        x:Name="ImmersiveButton"
+                        Command="{x:Bind ViewModel.ImmersiveToggleButtonEnabledChangedCommand}"
+                        IsChecked="{x:Bind ViewModel.IsImmersiveMode, Mode=TwoWay}"
+                        Style="{StaticResource TitleBarToggleButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize}"
+                            Glyph="&#xED1A;" />
+                    </ToggleButton>
+                </StackPanel>
+            </Grid>
 
-                <!--  Look  -->
-                <Button
-                    x:Name="ClickThroughButton"
-                    Command="{x:Bind ViewModel.LockWindowCommand}"
-                    Style="{StaticResource TitleBarButtonStyle}">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                        Glyph="&#xE72E;" />
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Name="LockToolTip" x:Uid="HostWindowLockToolTip" />
-                    </ToolTipService.ToolTip>
-                </Button>
-                <!--  More  -->
-                <Button x:Name="MoreButton" Style="{StaticResource TitleBarButtonStyle}">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                        Glyph="&#xE712;" />
-                    <ToolTipService.ToolTip>
-                        <ToolTip x:Name="MoreButtonToolTip" x:Uid="HostWindowMoreButtonToolTip" />
-                    </ToolTipService.ToolTip>
-                    <Button.Flyout>
-                        <MenuFlyout>
-                            <ToggleMenuFlyoutItem
-                                x:Name="AOTFlyoutItem"
-                                x:Uid="BaseWindowAOTFlyoutItem"
-                                Click="AOTFlyoutItem_Click" />
-                            <ToggleMenuFlyoutItem
-                                x:Name="FullScreenFlyoutItem"
-                                x:Uid="BaseWindowFullScreenFlyoutItem"
-                                Click="FullScreenFlyoutItem_Click" />
-                            <ToggleMenuFlyoutItem
-                                x:Name="DockFlyoutItem"
-                                x:Uid="HostWindowDockFlyoutItem"
-                                Command="{x:Bind ViewModel.ToggleDockModeCommand}"
-                                IsChecked="{x:Bind ViewModel.IsDockMode, Mode=OneWay}" />
-                            <ToggleMenuFlyoutItem
-                                x:Name="DesktopFlyoutItem"
-                                x:Uid="HostWindowDesktopFlyoutItem"
-                                Command="{x:Bind ViewModel.ToggleDesktopModeCommand}"
-                                IsChecked="{x:Bind ViewModel.IsDesktopMode, Mode=OneWay}" />
-                            <ToggleMenuFlyoutItem
-                                x:Name="MiniFlyoutItem"
-                                x:Uid="BaseWindowMiniFlyoutItem"
-                                Click="MiniFlyoutItem_Click" />
-                            <MenuFlyoutItem
-                                x:Name="SettingsFlyoutItem"
-                                x:Uid="HostWindowSettingsFlyoutItem"
-                                Click="SettingsMenuFlyoutItem_Click" />
-                        </MenuFlyout>
-                    </Button.Flyout>
-                </Button>
+            <Grid Padding="3" HorizontalAlignment="Right">
+                <StackPanel
+                    x:Name="TopRightCommandStackPanel"
+                    Orientation="Horizontal"
+                    Spacing="3">
+                    <StackPanel.OpacityTransition>
+                        <ScalarTransition />
+                    </StackPanel.OpacityTransition>
 
-                <!--  Window Minimise  -->
-                <Button
-                    x:Name="MinimiseButton"
-                    Click="MinimiseButton_Click"
-                    Style="{StaticResource TitleBarButtonStyle}">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                        Glyph="&#xE654;" />
-                </Button>
-                <!--  Window Maximise  -->
-                <Button
-                    x:Name="MaximiseButton"
-                    Click="MaximiseButton_Click"
-                    Style="{StaticResource TitleBarButtonStyle}">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                        Glyph="&#xE655;" />
-                </Button>
-                <!--  Window Restore  -->
-                <Button
-                    x:Name="RestoreButton"
-                    Click="RestoreButton_Click"
-                    Style="{StaticResource TitleBarButtonStyle}"
-                    Visibility="Collapsed">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                        Glyph="&#xE656;" />
-                </Button>
-                <!--  Window Close  -->
-                <Button
-                    x:Name="CloseButton"
-                    Click="CloseButton_Click"
-                    Style="{StaticResource TitleBarButtonStyle}">
-                    <FontIcon
-                        FontFamily="{StaticResource IconFontFamily}"
-                        FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
-                        Glyph="&#xE653;" />
-                </Button>
-            </StackPanel>
+                    <!--  Look  -->
+                    <Button
+                        x:Name="ClickThroughButton"
+                        Command="{x:Bind ViewModel.ToggleLockWindowCommand}"
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE72E;" />
+                        <ToolTipService.ToolTip>
+                            <ToolTip x:Name="LockToolTip">
+                                <ToolTip.Content>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="HostWindowLockToolTip" />
+                                        <TextBlock
+                                            Margin="6,0"
+                                            VerticalAlignment="Center"
+                                            Opacity="0.7"
+                                            Text="Ctrl + Alt + " />
+                                        <TextBlock
+                                            VerticalAlignment="Center"
+                                            Opacity="0.7"
+                                            Text="{x:Bind ViewModel.LockHotKey, Mode=OneWay}" />
+                                    </StackPanel>
+                                </ToolTip.Content>
+                            </ToolTip>
+                        </ToolTipService.ToolTip>
+                    </Button>
+                    <!--  More  -->
+                    <Button x:Name="MoreButton" Style="{StaticResource TitleBarButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE700;" />
+                        <ToolTipService.ToolTip>
+                            <ToolTip x:Name="MoreButtonToolTip" x:Uid="HostWindowMoreButtonToolTip" />
+                        </ToolTipService.ToolTip>
+                        <Button.Flyout>
+                            <MenuFlyout>
+                                <ToggleMenuFlyoutItem
+                                    x:Name="AOTFlyoutItem"
+                                    x:Uid="BaseWindowAOTFlyoutItem"
+                                    Click="AOTFlyoutItem_Click" />
+                                <ToggleMenuFlyoutItem
+                                    x:Name="FullScreenFlyoutItem"
+                                    x:Uid="BaseWindowFullScreenFlyoutItem"
+                                    Click="FullScreenFlyoutItem_Click" />
+                                <ToggleMenuFlyoutItem
+                                    x:Name="DockFlyoutItem"
+                                    x:Uid="HostWindowDockFlyoutItem"
+                                    Command="{x:Bind ViewModel.ToggleDockModeCommand}"
+                                    IsChecked="{x:Bind ViewModel.IsDockMode, Mode=OneWay}" />
+                                <ToggleMenuFlyoutItem
+                                    x:Name="DesktopFlyoutItem"
+                                    x:Uid="HostWindowDesktopFlyoutItem"
+                                    Command="{x:Bind ViewModel.ToggleDesktopModeCommand}"
+                                    IsChecked="{x:Bind ViewModel.IsDesktopMode, Mode=OneWay}" />
+                                <ToggleMenuFlyoutItem
+                                    x:Name="MiniFlyoutItem"
+                                    x:Uid="BaseWindowMiniFlyoutItem"
+                                    Click="MiniFlyoutItem_Click" />
+                                <MenuFlyoutItem
+                                    x:Name="SettingsFlyoutItem"
+                                    x:Uid="HostWindowSettingsFlyoutItem"
+                                    Click="SettingsMenuFlyoutItem_Click" />
+                            </MenuFlyout>
+                        </Button.Flyout>
+                    </Button>
+
+                    <!--  Window Minimise  -->
+                    <Button
+                        x:Name="MinimiseButton"
+                        Click="MinimiseButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE654;" />
+                    </Button>
+                    <!--  Window Maximise  -->
+                    <Button
+                        x:Name="MaximiseButton"
+                        Click="MaximiseButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE655;" />
+                    </Button>
+                    <!--  Window Restore  -->
+                    <Button
+                        x:Name="RestoreButton"
+                        Click="RestoreButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}"
+                        Visibility="Collapsed">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE656;" />
+                    </Button>
+                    <!--  Window Close  -->
+                    <Button
+                        x:Name="CloseButton"
+                        Click="CloseButton_Click"
+                        Style="{StaticResource TitleBarButtonStyle}">
+                        <FontIcon
+                            FontFamily="{StaticResource IconFontFamily}"
+                            FontSize="{x:Bind ViewModel.TitleBarFontSize, Mode=OneWay}"
+                            Glyph="&#xE653;" />
+                    </Button>
+                </StackPanel>
+            </Grid>
 
         </Grid>
 

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

@@ -10,13 +10,19 @@ using CommunityToolkit.Mvvm.Messaging.Messages;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
+using System.Drawing;
 using System.Threading.Tasks;
+using System.Windows.Forms;
+using Vanara.PInvoke;
+using Windows.System;
+using WinUIEx.Messaging;
 
 namespace BetterLyrics.WinUI3.Views
 {
     public sealed partial class LyricsWindow : Window
     {
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+        private readonly WindowMessageMonitor _wmm;
 
         public LyricsWindow()
         {
@@ -27,7 +33,32 @@ namespace BetterLyrics.WinUI3.Views
             ExtendsContentIntoTitleBar = true;
             AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
             Title = App.ResourceLoader!.GetString("LyricsPageTitle");
-            SetTitleBar(TopCommandGrid);
+
+            UpdateTitleBarArea();
+
+            _wmm = new WindowMessageMonitor(this);
+            _wmm.WindowMessageReceived += Wmm_WindowMessageReceived;
+        }
+
+        public void UpdateTitleBarArea()
+        {
+            if (_settingsService.IsDragEverywhereEnabled)
+            {
+                SetTitleBar(RootGrid);
+            }
+            else
+            {
+                SetTitleBar(TopCommandGrid);
+            }
+        }
+
+        private void Wmm_WindowMessageReceived(object? sender, WindowMessageEventArgs e)
+        {
+            if (e.Message.MessageId == (uint)User32.WindowMessage.WM_HOTKEY)
+            {
+                int id = (int)e.Message.WParam;
+                GlobalHotKeyHelper.TryInvokeAction(id);
+            }
         }
 
         public LyricsWindowViewModel ViewModel { get; private set; } = Ioc.Default.GetRequiredService<LyricsWindowViewModel>();
@@ -38,6 +69,14 @@ namespace BetterLyrics.WinUI3.Views
             switch (type!)
             {
                 case AutoStartWindowType.StandardMode:
+                    if (_settingsService.StandardWindowLeft < 0 || _settingsService.StandardWindowTop < 0 ||
+                        _settingsService.StandardWindowWidth <= 0 || _settingsService.StandardWindowHeight <= 0)
+                    {
+                        _settingsService.StandardWindowLeft = 200;
+                        _settingsService.StandardWindowTop = 200;
+                        _settingsService.StandardWindowWidth = 1600;
+                        _settingsService.StandardWindowHeight = 800;
+                    }
                     AppWindow.MoveAndResize(new Windows.Graphics.RectInt32(
                         _settingsService.StandardWindowLeft,
                         _settingsService.StandardWindowTop,
@@ -54,7 +93,7 @@ namespace BetterLyrics.WinUI3.Views
                     ViewModel.ToggleDesktopModeCommand.Execute(null);
                     if (autoLook == null && _settingsService.AutoLockOnDesktopMode)
                     {
-                        ViewModel.LockWindowCommand.Execute(null);
+                        ViewModel.ToggleLockWindowCommand.Execute(null);
                     }
                     break;
                 default:
@@ -78,25 +117,27 @@ namespace BetterLyrics.WinUI3.Views
                 var rect = AppWindow.Position;
                 var size = AppWindow.Size;
 
-                if (ViewModel.IsDesktopMode)
-                {
-                    _settingsService.DesktopWindowLeft = rect.X;
-                    _settingsService.DesktopWindowTop = rect.Y;
-                    _settingsService.DesktopWindowWidth = size.Width;
-                    _settingsService.DesktopWindowHeight = size.Height;
-                }
-                else if (ViewModel.IsDockMode)
+                if (rect.X >= 0 && rect.Y >= 0 && size.Width > 0 && size.Height > 0)
                 {
+                    if (ViewModel.IsDesktopMode)
+                    {
+                        _settingsService.DesktopWindowLeft = rect.X;
+                        _settingsService.DesktopWindowTop = rect.Y;
+                        _settingsService.DesktopWindowWidth = size.Width;
+                        _settingsService.DesktopWindowHeight = size.Height;
+                    }
+                    else if (ViewModel.IsDockMode)
+                    {
 
+                    }
+                    else
+                    {
+                        _settingsService.StandardWindowLeft = rect.X;
+                        _settingsService.StandardWindowTop = rect.Y;
+                        _settingsService.StandardWindowWidth = size.Width;
+                        _settingsService.StandardWindowHeight = size.Height;
+                    }
                 }
-                else
-                {
-                    _settingsService.StandardWindowLeft = rect.X;
-                    _settingsService.StandardWindowTop = rect.Y;
-                    _settingsService.StandardWindowWidth = size.Width;
-                    _settingsService.StandardWindowHeight = size.Height;
-                }
-
             }
         }
 
@@ -133,7 +174,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void SettingsMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
-            WindowHelper.OpenOrShowWindow<SettingsWindow>();
+            WindowHelper.OpenWindow<SettingsWindow>();
         }
 
         private void UpdateTitleBarWindowButtonsVisibility()
@@ -147,6 +188,7 @@ namespace BetterLyrics.WinUI3.Views
                     AOTFlyoutItem.Visibility = DesktopFlyoutItem.Visibility = FullScreenFlyoutItem.Visibility = DockFlyoutItem.Visibility =
                     ClickThroughButton.Visibility = Visibility.Collapsed;
 
+                    ViewModel.IsImmersiveMode = true;
                     break;
                 case AppWindowPresenterKind.FullScreen:
                     MinimiseButton.Visibility = MaximiseButton.Visibility = RestoreButton.Visibility =
@@ -157,7 +199,6 @@ namespace BetterLyrics.WinUI3.Views
                     DockFlyoutItem.Visibility =
                         Visibility.Collapsed;
                     FullScreenFlyoutItem.IsChecked = true;
-
                     break;
                 case AppWindowPresenterKind.Overlapped:
                     DockFlyoutItem.Visibility = Visibility.Visible;
@@ -175,6 +216,7 @@ namespace BetterLyrics.WinUI3.Views
                         MiniFlyoutItem.Visibility =
                             Visibility.Collapsed;
 
+                        ViewModel.IsImmersiveMode = true;
                     }
                     else if (DesktopFlyoutItem.IsChecked)
                     {
@@ -189,7 +231,6 @@ namespace BetterLyrics.WinUI3.Views
                             Visibility.Collapsed;
 
                         ClickThroughButton.Visibility = Visibility.Visible;
-
                     }
                     else
                     {
@@ -217,6 +258,8 @@ namespace BetterLyrics.WinUI3.Views
                             MaximiseButton.Visibility = Visibility.Visible;
                             RestoreButton.Visibility = Visibility.Collapsed;
                         }
+
+                        ViewModel.IsImmersiveMode = _settingsService.IsImmersiveMode;
                     }
                     break;
                 default:
@@ -226,7 +269,8 @@ namespace BetterLyrics.WinUI3.Views
 
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
-            WindowHelper.ExitAllWindows();
+            DockModeHelper.Disable(this);
+            Application.Current.Exit();
         }
 
         private void MaximiseButton_Click(object sender, RoutedEventArgs e)
@@ -255,17 +299,44 @@ namespace BetterLyrics.WinUI3.Views
 
         private void TopCommandGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
         {
-            TopCommandGrid.Opacity = 1;
+            if (ViewModel.IsImmersiveMode)
+            {
+                ViewModel.TopCommandGridOpacity = 1f;
+            }
         }
 
         private void TopCommandGrid_PointerExited(object sender, PointerRoutedEventArgs e)
         {
-            TopCommandGrid.Opacity = 0;
+            if (ViewModel.IsImmersiveMode)
+            {
+                ViewModel.TopCommandGridOpacity = 0f;
+            }
         }
 
         private void TipContainerCenter_Loaded(object sender, RoutedEventArgs e)
         {
             App.Current.LyricsWindowNotificationPanel = TipContainerCenter;
         }
+
+        private void RootGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
+        {
+            ViewModel.IsMouseWithinWindow = true;
+            e.Handled = true;
+        }
+
+        private void RootGrid_PointerExited(object sender, PointerRoutedEventArgs e)
+        {
+            ViewModel.IsMouseWithinWindow = false;
+            e.Handled = true;
+        }
+
+        private void RootGrid_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+        }
+
+        private void MusicGalleryButton_Click(object sender, RoutedEventArgs e)
+        {
+            WindowHelper.OpenWindow<MusicGalleryWindow>();
+        }
     }
 }

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

@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="BetterLyrics.WinUI3.Views.MusicGalleryPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atl="using:ATL"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:labs="using:CommunityToolkit.Labs.WinUI"
+    xmlns:local="using:BetterLyrics.WinUI3.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:media="using:CommunityToolkit.WinUI.Media"
+    xmlns:models="using:BetterLyrics.WinUI3.Models"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    Loaded="Page_Loaded"
+    mc:Ignorable="d">
+    <Page.Resources>
+        <CollectionViewSource
+            x:Name="TracksByTitleCVS"
+            IsSourceGrouped="True"
+            Source="{x:Bind ViewModel.TracksByTitle, Mode=OneWay}" />
+    </Page.Resources>
+
+    <Grid>
+        <Grid Margin="0,12,0,0">
+            <AutoSuggestBox
+                x:Name="SongSearchBox"
+                Margin="36,0"
+                VerticalAlignment="Top"
+                PlaceholderText="搜索歌曲"
+                QueryIcon="Find"
+                QuerySubmitted="SongSearchBox_QuerySubmitted"
+                SuggestionChosen="SongSearchBox_SuggestionChosen"
+                TextChanged="SongSearchBox_TextChanged" />
+
+            <controls:Segmented
+                x:Name="Segmented"
+                Margin="36,48,36,0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Top"
+                SelectedIndex="0"
+                SelectionMode="Single">
+                <interactivity:Interaction.Behaviors>
+                    <interactivity:DataTriggerBehavior
+                        Binding="{Binding ElementName=Segmented, Path=SelectedIndex, Mode=OneWay}"
+                        ComparisonCondition="Equal"
+                        Value="0">
+                        <interactivity:ChangePropertyAction PropertyName="Tag" Value="Song" />
+                    </interactivity:DataTriggerBehavior>
+                    <interactivity:DataTriggerBehavior
+                        Binding="{Binding ElementName=Segmented, Path=SelectedIndex, Mode=OneWay}"
+                        ComparisonCondition="Equal"
+                        Value="1">
+                        <interactivity:ChangePropertyAction PropertyName="Tag" Value="Album" />
+                    </interactivity:DataTriggerBehavior>
+                    <interactivity:DataTriggerBehavior
+                        Binding="{Binding ElementName=Segmented, Path=SelectedIndex, Mode=OneWay}"
+                        ComparisonCondition="Equal"
+                        Value="2">
+                        <interactivity:ChangePropertyAction PropertyName="Tag" Value="Artist" />
+                    </interactivity:DataTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+                <controls:SegmentedItem Content="歌曲" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC4F;}" />
+                <controls:SegmentedItem Content="专辑" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE93C;}" />
+                <controls:SegmentedItem Content="艺术家" Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEFA9;}" />
+            </controls:Segmented>
+
+            <controls:SwitchPresenter Margin="0,96,0,0" Value="{Binding ElementName=Segmented, Path=Tag, Mode=OneWay}">
+                <controls:SwitchPresenter.ContentTransitions>
+                    <TransitionCollection>
+                        <PopupThemeTransition />
+                    </TransitionCollection>
+                </controls:SwitchPresenter.ContentTransitions>
+
+                <controls:Case Value="Song">
+                    <SemanticZoom>
+                        <SemanticZoom.ZoomedInView>
+                            <GridView
+                                ItemsSource="{x:Bind TracksByTitleCVS.View, Mode=OneWay}"
+                                ScrollViewer.IsHorizontalScrollChainingEnabled="False"
+                                SelectionMode="None">
+                                <GridView.GroupStyle>
+                                    <GroupStyle />
+                                </GridView.GroupStyle>
+                            </GridView>
+                        </SemanticZoom.ZoomedInView>
+
+                        <SemanticZoom.ZoomedOutView>
+                            <ListView ItemsSource="{x:Bind TracksByTitleCVS.View.CollectionGroups, Mode=OneWay}" SelectionChanged="SongListView_SelectionChanged">
+                                <ListView.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <ItemsStackPanel AreStickyGroupHeadersEnabled="True" />
+                                    </ItemsPanelTemplate>
+                                </ListView.ItemsPanel>
+                                <ListView.GroupStyle>
+                                    <GroupStyle>
+                                        <GroupStyle.HeaderTemplate>
+                                            <DataTemplate x:DataType="models:GroupInfoList">
+                                                <Border AutomationProperties.AccessibilityView="Raw">
+                                                    <TextBlock
+                                                        AutomationProperties.AccessibilityView="Raw"
+                                                        Style="{ThemeResource TitleTextBlockStyle}"
+                                                        Text="{x:Bind Key}" />
+                                                </Border>
+                                            </DataTemplate>
+                                        </GroupStyle.HeaderTemplate>
+                                    </GroupStyle>
+                                </ListView.GroupStyle>
+                                <ListView.ItemContainerStyle>
+                                    <Style TargetType="ListViewItem">
+                                        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                        <Setter Property="Margin" Value="0" />
+                                        <Setter Property="Padding" Value="36,0" />
+                                    </Style>
+                                </ListView.ItemContainerStyle>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate x:DataType="atl:Track">
+                                        <Grid Padding="12">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="2*" />
+                                                <!--  歌曲名  -->
+                                                <ColumnDefinition Width="1.5*" />
+                                                <!--  歌手名  -->
+                                                <ColumnDefinition Width="1.5*" />
+                                                <!--  专辑名  -->
+                                                <ColumnDefinition Width="1*" />
+                                                <!--  年份  -->
+                                                <ColumnDefinition Width="1.2*" />
+                                                <!--  流派  -->
+                                                <ColumnDefinition Width="1*" />
+                                                <!--  歌曲时长  -->
+                                            </Grid.ColumnDefinitions>
+
+                                            <!--  歌曲名  -->
+                                            <TextBlock
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Text="{Binding Title}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  歌手名  -->
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Artist}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  专辑名  -->
+                                            <TextBlock
+                                                Grid.Column="2"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Album}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  年份  -->
+                                            <TextBlock
+                                                Grid.Column="3"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Year}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  流派  -->
+                                            <TextBlock
+                                                Grid.Column="4"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Genre}"
+                                                TextWrapping="Wrap" />
+
+                                            <!--  歌曲时长  -->
+                                            <TextBlock
+                                                Grid.Column="5"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{Binding Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
+                                                TextAlignment="Right"
+                                                TextWrapping="Wrap" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </SemanticZoom.ZoomedOutView>
+                    </SemanticZoom>
+                </controls:Case>
+
+                <controls:Case Value="Album">
+                    <ListView />
+                </controls:Case>
+
+                <controls:Case Value="Artist">
+                    <ListView />
+                </controls:Case>
+
+            </controls:SwitchPresenter>
+        </Grid>
+
+        <Grid Background="{ThemeResource SolidBackgroundFillColorBaseBrush}" Visibility="{x:Bind ViewModel.IsDataLoading, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+            <Grid Margin="12">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="48" />
+                    <RowDefinition Height="12" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="12" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="12" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <labs:Shimmer Grid.Row="0" CornerRadius="12" />
+                <labs:Shimmer Grid.Row="2" CornerRadius="12" />
+                <labs:Shimmer Grid.Row="4" CornerRadius="12" />
+                <labs:Shimmer Grid.Row="6" CornerRadius="12" />
+            </Grid>
+            <ProgressRing IsActive="{x:Bind ViewModel.IsDataLoading, Mode=OneWay}" />
+        </Grid>
+    </Grid>
+</Page>

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

@@ -0,0 +1,60 @@
+using BetterLyrics.WinUI3.ViewModels;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Views
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MusicGalleryPage : Page
+    {
+        public MusicGalleryViewModel ViewModel => (MusicGalleryViewModel)DataContext;
+        public MusicGalleryPage()
+        {
+            InitializeComponent();
+            DataContext = Ioc.Default.GetRequiredService<MusicGalleryViewModel>();
+        }
+
+        private void SongListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ViewModel.PlaySongAt((sender as ListView)?.SelectedIndex);
+        }
+
+        private void Page_Loaded(object sender, RoutedEventArgs e)
+        {
+            ViewModel.RefreshSongs();
+        }
+
+        private void SongSearchBox_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
+        {
+
+        }
+
+        private void SongSearchBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+        {
+
+        }
+
+        private void SongSearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+        {
+
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Window
+    x:Class="BetterLyrics.WinUI3.Views.MusicGalleryWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="MusicGalleryWindow"
+    mc:Ignorable="d">
+
+    <Window.SystemBackdrop>
+        <MicaBackdrop />
+    </Window.SystemBackdrop>
+
+    <local:MusicGalleryPage />
+
+</Window>

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

@@ -0,0 +1,36 @@
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using WinUIEx;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Views
+{
+    /// <summary>
+    /// An empty window that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class MusicGalleryWindow : Window
+    {
+        public MusicGalleryWindow()
+        {
+            InitializeComponent();
+            Title = App.ResourceLoader!.GetString("MusicGalleryPageTitle");
+            AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
+            this.SetIcon(@"Assets/Logo.ico");
+        }
+    }
+}

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

@@ -37,8 +37,18 @@
                 <NavigationViewItem
                     x:Uid="SettingsPageMediaLib"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                       Glyph=&#xEA69;}"
+                                       Glyph=&#xE8B7;}"
                     Tag="MediaLib" />
+                <NavigationViewItem
+                    x:Uid="SettingsPageAlbumLib"
+                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                       Glyph=&#xE7FA;}"
+                    Tag="AlbumArtLib" />
+                <NavigationViewItem
+                    x:Uid="SettingsPagePlaybackLib"
+                    Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                       Glyph=&#xEA69;}"
+                    Tag="PlaybackLib" />
                 <NavigationViewItem
                     x:Uid="SettingsPageLyricsLib"
                     Icon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -124,12 +134,91 @@
                                     </ComboBox>
                                 </controls:SettingsCard>
 
+                                <controls:SettingsCard x:Uid="SettingsPageIgnoreFullscreenWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE967;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IgnoreFullscreenWindow, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageHideWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED1A;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.HideWindowWhenNotPlaying, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageGlobalDrag" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7C2;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsDragEverywhereEnabled, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
+                                <!--  Desktop mode  -->
+
+                                <TextBlock x:Uid="SettingsPageAppDesktop" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
                                 <controls:SettingsCard x:Uid="SettingsPageAutoLock" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE755;}">
                                     <ToggleSwitch IsOn="{x:Bind ViewModel.AutoLockOnDesktopMode, Mode=TwoWay}" />
                                 </controls:SettingsCard>
 
-                                <controls:SettingsCard x:Uid="SettingsPageIgnoreFullscreenWindow" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE66C;}">
-                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IgnoreFullscreenWindow, Mode=TwoWay}" />
+                                <controls:SettingsCard x:Uid="SettingsPageLockHotKey" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEDA7;}">
+                                    <StackPanel Orientation="Horizontal" Spacing="6">
+                                        <TextBlock
+                                            Margin="0,0,0,2"
+                                            VerticalAlignment="Center"
+                                            Text="Ctrl + Alt + " />
+                                        <ComboBox SelectedIndex="{x:Bind ViewModel.LockHotKeyIndex, Mode=TwoWay}">
+                                            <ComboBoxItem Content="A" />
+                                            <ComboBoxItem Content="B" />
+                                            <ComboBoxItem Content="C" />
+                                            <ComboBoxItem Content="D" />
+                                            <ComboBoxItem Content="E" />
+                                            <ComboBoxItem Content="F" />
+                                            <ComboBoxItem Content="G" />
+                                            <ComboBoxItem Content="H" />
+                                            <ComboBoxItem Content="I" />
+                                            <ComboBoxItem Content="J" />
+                                            <ComboBoxItem Content="K" />
+                                            <ComboBoxItem Content="L" />
+                                            <ComboBoxItem Content="M" />
+                                            <ComboBoxItem Content="N" />
+                                            <ComboBoxItem Content="O" />
+                                            <ComboBoxItem Content="P" />
+                                            <ComboBoxItem Content="Q" />
+                                            <ComboBoxItem Content="R" />
+                                            <ComboBoxItem Content="S" />
+                                            <ComboBoxItem Content="T" />
+                                            <ComboBoxItem Content="U" />
+                                            <ComboBoxItem Content="V" />
+                                            <ComboBoxItem Content="W" />
+                                            <ComboBoxItem Content="X" />
+                                            <ComboBoxItem Content="Y" />
+                                            <ComboBoxItem Content="Z" />
+                                        </ComboBox>
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageDockWindowHeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED5E;}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.DockWindowHeight, Mode=OneWay}" />
+                                        <TextBlock
+                                            Margin="0,0,14,0"
+                                            VerticalAlignment="Center"
+                                            Text=" px" />
+                                        <Slider
+                                            Maximum="200"
+                                            Minimum="64"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="1"
+                                            TickFrequency="1"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.DockWindowHeight, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <!--  Dock mode  -->
+
+                                <TextBlock x:Uid="SettingsPageAppDock" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                                <controls:SettingsCard x:Uid="SettingsPageDockPlacement" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8E3;}">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.DockPlacement, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <ComboBoxItem x:Uid="SettingsPageDockPlacementTop" />
+                                        <ComboBoxItem x:Uid="SettingsPageDockPlacementBottom" />
+                                    </ComboBox>
                                 </controls:SettingsCard>
 
                             </StackPanel>
@@ -178,8 +267,8 @@
                                             VerticalAlignment="Center"
                                             Text="{x:Bind ViewModel.CoverOverlayBlurAmount, Mode=OneWay}" />
                                         <Slider
-                                            Maximum="200"
-                                            Minimum="50"
+                                            Maximum="100"
+                                            Minimum="0"
                                             SnapsTo="Ticks"
                                             StepFrequency="10"
                                             TickFrequency="10"
@@ -229,10 +318,48 @@
                             </StackPanel>
                         </controls:Case>
 
-                        <!--  Media source lib  -->
-                        <controls:Case Value="MediaLib">
+                        <controls:Case Value="AlbumArtLib">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                                <controls:SettingsCard x:Uid="SettingsPageMediaSourceProvidersConfig" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xED35;}" />
+                                <controls:SettingsCard
+                                    x:Name="AlbumArtSearchProvidersSettingsExpander"
+                                    x:Uid="SettingsPageAlbumArtSearchProvidersConfig"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xE7FA;}" />
+
+                                <ListView
+                                    x:Name="AlbumArtSearchProvidersListView"
+                                    Margin="0,-4,0,0"
+                                    AllowDrop="True"
+                                    CanDragItems="True"
+                                    CanReorderItems="True"
+                                    DragItemsCompleted="AlbumArtSearchProvidersListView_DragItemsCompleted"
+                                    ItemsSource="{x:Bind ViewModel.AlbumArtSearchProvidersInfo, Mode=OneWay}"
+                                    SelectionMode="None">
+                                    <ListView.OpacityTransition>
+                                        <ScalarTransition />
+                                    </ListView.OpacityTransition>
+                                    <ListView.ItemContainerStyle>
+                                        <Style TargetType="ListViewItem">
+                                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                            <Setter Property="Margin" Value="0" />
+                                            <Setter Property="Padding" Value="0" />
+                                        </Style>
+                                    </ListView.ItemContainerStyle>
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate x:DataType="models:AlbumArtSearchProviderInfo">
+                                            <controls:SettingsCard Padding="60,0,48,0" Header="{Binding Provider, Converter={StaticResource AlbumArtSearchProviderToDisplayNameConverter}, Mode=OneWay}">
+                                                <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" Toggled="AlbumArtSearchProviderToggleSwitch_Toggled" />
+                                            </controls:SettingsCard>
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
+                                </ListView>
+                            </StackPanel>
+                        </controls:Case>
+
+                        <!--  Playback source  -->
+                        <controls:Case Value="PlaybackLib">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                                <controls:SettingsCard x:Uid="SettingsPageMediaSourceProvidersConfig" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEA69;}" />
                                 <ListView
                                     x:Name="MediaSourceProvidersListView"
                                     Margin="0,-4,0,0"
@@ -256,15 +383,15 @@
                             </StackPanel>
                         </controls:Case>
 
-                        <!--  Lyrics lib  -->
-                        <controls:Case Value="LyricsLib">
+                        <!--  Media lib  -->
+                        <controls:Case Value="MediaLib">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
                                 <controls:SettingsExpander
                                     x:Uid="SettingsPageMusicLib"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                              Glyph=&#xE8B7;}"
                                     IsExpanded="True"
-                                    ItemsSource="{x:Bind ViewModel.LocalLyricsFolders, Mode=OneWay}">
+                                    ItemsSource="{x:Bind ViewModel.LocalMediaFolders, Mode=OneWay}">
                                     <controls:SettingsExpander.ItemTemplate>
                                         <DataTemplate>
                                             <controls:SettingsCard>
@@ -299,13 +426,13 @@
                                             <interactivity:Interaction.Behaviors>
 
                                                 <interactivity:DataTriggerBehavior
-                                                    Binding="{x:Bind ViewModel.LocalLyricsFolders.Count, Mode=OneWay}"
+                                                    Binding="{x:Bind ViewModel.LocalMediaFolders.Count, Mode=OneWay}"
                                                     ComparisonCondition="Equal"
                                                     Value="0">
                                                     <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Collapsed" />
                                                 </interactivity:DataTriggerBehavior>
                                                 <interactivity:DataTriggerBehavior
-                                                    Binding="{x:Bind ViewModel.LocalLyricsFolders.Count, Mode=OneWay}"
+                                                    Binding="{x:Bind ViewModel.LocalMediaFolders.Count, Mode=OneWay}"
                                                     ComparisonCondition="NotEqual"
                                                     Value="0">
                                                     <interactivity:ChangePropertyAction PropertyName="Visibility" Value="Visible" />
@@ -324,12 +451,18 @@
                                         </controls:SettingsCard>
                                     </controls:SettingsExpander.ItemsFooter>
                                 </controls:SettingsExpander>
+                            </StackPanel>
+                        </controls:Case>
+
+                        <!--  Lyrics source  -->
+                        <controls:Case Value="LyricsLib">
+                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
                                 <controls:SettingsCard
                                     x:Name="LyricsSearchProvidersSettingsExpander"
                                     x:Uid="SettingsPageLyricsSearchProvidersConfig"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
-                                                             Glyph=&#xF6FA;}" />
+                                                             Glyph=&#xE8F1;}" />
 
                                 <ListView
                                     x:Name="LyricsSearchProvidersListView"
@@ -378,6 +511,16 @@
                                     </ComboBox>
                                 </controls:SettingsCard>
 
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsFontFamily" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8D2;}">
+                                    <ComboBox ItemsSource="{x:Bind ViewModel.SystemFontNames, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedFontFamilyIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <TextBlock Text="{Binding}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+                                </controls:SettingsCard>
+
                                 <controls:SettingsCard x:Uid="SettingsPageLyricsFontWeight" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8DD;}">
                                     <ComboBox SelectedIndex="{x:Bind ViewModel.LyricsFontWeight, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                                         <ComboBoxItem x:Uid="SettingsPageLyricsThin" />
@@ -394,6 +537,25 @@
                                     </ComboBox>
                                 </controls:SettingsCard>
 
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsBgFontOpacity" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE799;}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.LyricsBgFontOpacity, Mode=OneWay}" />
+                                        <TextBlock
+                                            Margin="0,0,14,0"
+                                            VerticalAlignment="Center"
+                                            Text=" %" />
+                                        <Slider
+                                            Maximum="100"
+                                            Minimum="0"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="1"
+                                            TickFrequency="1"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.LyricsBgFontOpacity, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
                                 <controls:SettingsCard x:Uid="SettingsPageLyricsFontStrokeWidth" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEC12;}">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
@@ -599,6 +761,14 @@
                                     </StackPanel>
                                 </controls:SettingsCard>
 
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsHighlightScope" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE7E6;}">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LyricsHighlightScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
+                                        <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
+                                        <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
+                                    </ComboBox>
+                                </controls:SettingsCard>
+
                                 <controls:SettingsExpander
                                     x:Uid="SettingsPageLyricsGlowEffect"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -606,25 +776,108 @@
                                     IsExpanded="{x:Bind ViewModel.IsLyricsGlowEffectEnabled, Mode=OneWay}">
                                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />
                                     <controls:SettingsExpander.Items>
-                                        <controls:SettingsCard x:Uid="SettingsPageLyricsGlowEffectScope" IsEnabled="{x:Bind ViewModel.IsLyricsGlowEffectEnabled, Mode=OneWay}">
+                                        <controls:SettingsCard x:Uid="SettingsPageScope" IsEnabled="{x:Bind ViewModel.IsLyricsGlowEffectEnabled, Mode=OneWay}">
                                             <ComboBox SelectedIndex="{x:Bind ViewModel.LyricsGlowEffectScope, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
-                                                <ComboBoxItem x:Uid="SettingsPageLyricsGlowEffectScopeCurrentLine" />
-                                                <ComboBoxItem x:Uid="SettingsPageLyricsGlowEffectScopeCurrentChar" />
+                                                <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentChar" />
+                                                <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeLineStartToCurrentChar" />
+                                                <ComboBoxItem x:Uid="SettingsPageLyricsRendingScopeCurrentLine" />
                                             </ComboBox>
                                         </controls:SettingsCard>
                                     </controls:SettingsExpander.Items>
                                 </controls:SettingsExpander>
 
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsFloatAnimation" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8C5;}">
+                                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsLyricsFloatAnimationEnabled, Mode=TwoWay}" />
+                                </controls:SettingsCard>
+
                                 <controls:SettingsCard x:Uid="SettingsPageFan" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xEBC5;}">
                                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsFanLyricsEnabled, Mode=TwoWay}" />
                                 </controls:SettingsCard>
 
+                                <controls:SettingsExpander
+                                    x:Uid="SettingsPageScrollEasing"
+                                    HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                             Glyph=&#xECE7;}"
+                                    IsExpanded="True">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.LyricsScrollEasingType, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeLinear" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeSmoothStep" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutSine" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuad" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutCubic" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuart" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutQuint" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutExpo" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutCirc" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutBack" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutElastic" />
+                                        <ComboBoxItem x:Uid="SettingsPageEasingTypeEaseInOutBounce" />
+                                    </ComboBox>
+                                    <controls:SettingsExpander.Items>
+                                        <controls:SettingsCard x:Uid="SettingsPageScrollDuration">
+                                            <StackPanel Orientation="Horizontal">
+                                                <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                                <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.LyricsScrollDuration, Mode=OneWay}" />
+                                                <TextBlock
+                                                    Margin="0,0,14,0"
+                                                    VerticalAlignment="Center"
+                                                    Text=" ms" />
+                                                <Slider
+                                                    Maximum="1000"
+                                                    Minimum="100"
+                                                    SnapsTo="Ticks"
+                                                    StepFrequency="100"
+                                                    TickFrequency="100"
+                                                    TickPlacement="Outside"
+                                                    Value="{x:Bind ViewModel.LyricsScrollDuration, Mode=TwoWay}" />
+                                            </StackPanel>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+
                             </StackPanel>
                         </controls:Case>
 
                         <!--  Lyrics translation  -->
                         <controls:Case Value="Translation">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+                                <controls:SettingsCard x:Uid="SettingsPageTargetLanguage" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF2B7;}">
+                                    <ComboBox SelectedIndex="{x:Bind ViewModel.SelectedTargetLanguageIndex, Mode=TwoWay}">
+                                        <ComboBoxItem Content="العربية" Tag="ar" />
+                                        <ComboBoxItem Content="Azərbaycan dili" Tag="az" />
+                                        <ComboBoxItem Content="简体中文" Tag="zh-Hans" />
+                                        <ComboBoxItem Content="繁體中文" Tag="zh-Hant" />
+                                        <ComboBoxItem Content="Čeština" Tag="cs" />
+                                        <ComboBoxItem Content="Dansk" Tag="da" />
+                                        <ComboBoxItem Content="Nederlands" Tag="nl" />
+                                        <ComboBoxItem Content="English" Tag="en" />
+                                        <ComboBoxItem Content="Esperanto" Tag="eo" />
+                                        <ComboBoxItem Content="Suomi" Tag="fi" />
+                                        <ComboBoxItem Content="Français" Tag="fr" />
+                                        <ComboBoxItem Content="Deutsch" Tag="de" />
+                                        <ComboBoxItem Content="Ελληνικά" Tag="el" />
+                                        <ComboBoxItem Content="עברית" Tag="he" />
+                                        <ComboBoxItem Content="हिन्दी" Tag="hi" />
+                                        <ComboBoxItem Content="Magyar" Tag="hu" />
+                                        <ComboBoxItem Content="Bahasa Indonesia" Tag="id" />
+                                        <ComboBoxItem Content="Gaeilge" Tag="ga" />
+                                        <ComboBoxItem Content="Italiano" Tag="it" />
+                                        <ComboBoxItem Content="日本語" Tag="ja" />
+                                        <ComboBoxItem Content="한국어" Tag="ko" />
+                                        <ComboBoxItem Content="فارسی" Tag="fa" />
+                                        <ComboBoxItem Content="Polski" Tag="pl" />
+                                        <ComboBoxItem Content="Português" Tag="pt" />
+                                        <ComboBoxItem Content="Русский" Tag="ru" />
+                                        <ComboBoxItem Content="Slovenčina" Tag="sk" />
+                                        <ComboBoxItem Content="Español" Tag="es" />
+                                        <ComboBoxItem Content="Svenska" Tag="sv" />
+                                        <ComboBoxItem Content="Türkçe" Tag="tr" />
+                                        <ComboBoxItem Content="Українська" Tag="uk" />
+                                        <ComboBoxItem Content="Tiếng Việt" Tag="vi" />
+                                    </ComboBox>
+                                </controls:SettingsCard>
+
                                 <controls:SettingsExpander
                                     x:Uid="SettingsPageTranslationConfig"
                                     HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -644,40 +897,6 @@
                                                     IsEnabled="{x:Bind ViewModel.IsLibreTranslateServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
                                             </StackPanel>
                                         </controls:SettingsCard>
-                                        <controls:SettingsCard x:Uid="SettingsPageTargetLanguage">
-                                            <ComboBox SelectedIndex="{x:Bind ViewModel.SelectedTargetLanguageIndex, Mode=TwoWay}">
-                                                <ComboBoxItem Content="العربية" Tag="ar" />
-                                                <ComboBoxItem Content="Azərbaycan dili" Tag="az" />
-                                                <ComboBoxItem Content="中文" Tag="zh" />
-                                                <ComboBoxItem Content="Čeština" Tag="cs" />
-                                                <ComboBoxItem Content="Dansk" Tag="da" />
-                                                <ComboBoxItem Content="Nederlands" Tag="nl" />
-                                                <ComboBoxItem Content="English" Tag="en" />
-                                                <ComboBoxItem Content="Esperanto" Tag="eo" />
-                                                <ComboBoxItem Content="Suomi" Tag="fi" />
-                                                <ComboBoxItem Content="Français" Tag="fr" />
-                                                <ComboBoxItem Content="Deutsch" Tag="de" />
-                                                <ComboBoxItem Content="Ελληνικά" Tag="el" />
-                                                <ComboBoxItem Content="עברית" Tag="he" />
-                                                <ComboBoxItem Content="हिन्दी" Tag="hi" />
-                                                <ComboBoxItem Content="Magyar" Tag="hu" />
-                                                <ComboBoxItem Content="Bahasa Indonesia" Tag="id" />
-                                                <ComboBoxItem Content="Gaeilge" Tag="ga" />
-                                                <ComboBoxItem Content="Italiano" Tag="it" />
-                                                <ComboBoxItem Content="日本語" Tag="ja" />
-                                                <ComboBoxItem Content="한국어" Tag="ko" />
-                                                <ComboBoxItem Content="فارسی" Tag="fa" />
-                                                <ComboBoxItem Content="Polski" Tag="pl" />
-                                                <ComboBoxItem Content="Português" Tag="pt" />
-                                                <ComboBoxItem Content="Русский" Tag="ru" />
-                                                <ComboBoxItem Content="Slovenčina" Tag="sk" />
-                                                <ComboBoxItem Content="Español" Tag="es" />
-                                                <ComboBoxItem Content="Svenska" Tag="sv" />
-                                                <ComboBoxItem Content="Türkçe" Tag="tr" />
-                                                <ComboBoxItem Content="Українська" Tag="uk" />
-                                                <ComboBoxItem Content="Tiếng Việt" Tag="vi" />
-                                            </ComboBox>
-                                        </controls:SettingsCard>
                                         <controls:SettingsCard x:Uid="SettingsPageTranslationInfo">
                                             <controls:SettingsCard.Description>
                                                 <HyperlinkButton Margin="0,6,0,0" NavigateUri="https://github.com/LibreTranslate/LibreTranslate">
@@ -696,6 +915,7 @@
                         <!--  About  -->
                         <controls:Case Value="About">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
                                 <controls:SettingsCard Header="BetterLyrics" HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/Logo.png}">
                                     <controls:SettingsCard.Description>
                                         <RichTextBlock>
@@ -717,24 +937,70 @@
                                                              Glyph=&#xE943;}"
                                     IsClickEnabled="True" />
 
+                                <controls:SettingsCard x:Uid="SettingsPageFAQ" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE897;}">
+                                    <HyperlinkButton Content="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md" NavigateUri="https://github.com/jayfunc/BetterLyrics/blob/dev/FAQ/FAQ.md" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageQQGroup" HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/QQ.png}">
+                                    <Button x:Uid="SettingsPageJoinNowButton" Click="QQGroupButton_Click" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageDiscord" HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/Discord.png}">
+                                    <Button x:Uid="SettingsPageJoinNowButton" Click="DiscodGroupButton_Click" />
+                                </controls:SettingsCard>
+
                             </StackPanel>
                         </controls:Case>
 
                         <!--  Dev  -->
                         <controls:Case Value="Dev">
                             <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
                                 <controls:SettingsCard x:Uid="SettingsPageMockMusicPlaying">
-                                    <HyperlinkButton
-                                        x:Uid="SettingsPagePlayingMockMusicButton"
-                                        Command="{x:Bind ViewModel.PlayTestingMusicTaskCommand}"
-                                        NavigateUri="https://soundcloud.com/carlyraejepsen/cut-to-the-feeling" />
+                                    <HyperlinkButton x:Uid="SettingsPagePlayingMockMusicButton" NavigateUri="https://soundcloud.com/carlyraejepsen/cut-to-the-feeling" />
                                 </controls:SettingsCard>
+
                                 <controls:SettingsCard x:Uid="SettingsPageCache">
                                     <Button x:Uid="SettingsPageOpenLogFolderButton" Command="{x:Bind ViewModel.OpenCacheFolderCommand}" />
                                 </controls:SettingsCard>
+
                                 <controls:SettingsCard x:Uid="SettingsPageDebugOverlay">
                                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsDebugOverlayEnabled, Mode=TwoWay}" />
                                 </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageLyricsTimelineThreshold">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock x:Uid="SettingsPageSliderPrefix" VerticalAlignment="Center" />
+                                        <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.TimelineSyncThreshold, Mode=OneWay}" />
+                                        <TextBlock
+                                            Margin="0,0,14,0"
+                                            VerticalAlignment="Center"
+                                            Text=" ms" />
+                                        <Slider
+                                            Maximum="1000"
+                                            Minimum="0"
+                                            SnapsTo="Ticks"
+                                            StepFrequency="100"
+                                            TickFrequency="100"
+                                            TickPlacement="Outside"
+                                            Value="{x:Bind ViewModel.TimelineSyncThreshold, Mode=TwoWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard x:Uid="SettingsPageLXMusicServer">
+                                    <StackPanel Orientation="Horizontal" Spacing="12">
+                                        <TextBox
+                                            IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
+                                            PlaceholderText="http://127.0.0.1:23330"
+                                            Text="{x:Bind ViewModel.LXMusicServer, Mode=TwoWay}" />
+                                        <Button
+                                            x:Uid="SettingsPageServerTestButton"
+                                            Command="{x:Bind ViewModel.LXMusicServerTestCommand}"
+                                            IsEnabled="{x:Bind ViewModel.IsLXMusicServerTesting, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+
+
                             </StackPanel>
                         </controls:Case>
 

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

@@ -1,19 +1,19 @@
 // 2025/6/23 by Zhe Fang
 
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.ViewModels;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Windows.Forms;
 using Windows.System;
 
 namespace BetterLyrics.WinUI3.Views
 {
     public sealed partial class SettingsPage : Page
     {
-        private bool _isUserToggle;
-
         public SettingsPage()
         {
             this.InitializeComponent();
@@ -26,7 +26,7 @@ namespace BetterLyrics.WinUI3.Views
         {
             if (sender is ToggleSwitch toggleSwitch)
             {
-                if (toggleSwitch.DataContext is LocalLyricsFolder localLyricsFolder)
+                if (toggleSwitch.DataContext is LocalMediaFolder localLyricsFolder)
                 {
                     ViewModel.ToggleLocalLyricsFolder(localLyricsFolder);
                 }
@@ -65,7 +65,7 @@ namespace BetterLyrics.WinUI3.Views
             Microsoft.UI.Xaml.RoutedEventArgs e
         )
         {
-            ViewModel.RemoveFolderAsync((LocalLyricsFolder)(sender as HyperlinkButton)!.Tag);
+            ViewModel.RemoveFolderAsync((LocalMediaFolder)(sender as HyperlinkButton)!.Tag);
         }
 
         private void MediaSourceProviderToggleSwitch_Toggled(object sender, RoutedEventArgs e)
@@ -105,5 +105,31 @@ namespace BetterLyrics.WinUI3.Views
         {
             ViewModel.ToggleAutoStartupAsync(AutoStartupToggleSwitch.IsOn);
         }
+
+        private void AlbumArtSearchProvidersListView_DragItemsCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+        {
+            ViewModel.OnAlbumArtSearchProvidersReordered();
+        }
+
+        private void AlbumArtSearchProviderToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (sender is ToggleSwitch toggleSwitch)
+            {
+                if (toggleSwitch.DataContext is AlbumArtSearchProviderInfo providerInfo)
+                {
+                    ViewModel.ToggleAlbumArtSearchProvider(providerInfo);
+                }
+            }
+        }
+
+        private void QQGroupButton_Click(object sender, RoutedEventArgs e)
+        {
+            Launcher.LaunchUriAsync(new Uri(MetadataHelper.QQGroupUrl));
+        }
+
+        private void DiscodGroupButton_Click(object sender, RoutedEventArgs e)
+        {
+            Launcher.LaunchUriAsync(new Uri(MetadataHelper.DiscordUrl));
+        }
     }
 }